fixed testing framework to actually use the extensions passed in and a few other minor cleanup things.

6 files changed, 44 insertions, 43 deletions

diff --git a/test-markdown.py b/test-markdown.py
index 94fdda4..48dd40b 100644
--- a/test-markdown.py
+++ b/test-markdown.py
@@ -197,7 +197,7 @@ def testDirectory(dir, measure_time = False) :
 
     mem = memory()
     t = time.clock()
-    md = markdown.Markdown()
+    md = markdown.Markdown(extensions=extensions)
     construction_time = time.clock() - t
     construction_mem = memory(mem)
 
@@ -232,7 +232,7 @@ def testDirectory(dir, measure_time = False) :
 
         actual_output = ""
         actual_lines = []
-        #md.source = ""
+        md.source = ""
         gc.collect()
         mem = memory()
         t = time.clock()
@@ -351,5 +351,6 @@ markdown = __import__(MARKDOWN_FILE)
 testDirectory("tests/markdown-test", measure_time=True)
 
 testDirectory("tests/misc", measure_time=True)
-#testDirectory("tests/extensions-x-footnotes-toc")
+#testDirectory("tests/extensions-x-footnotes")
+# testDirectory("tests/extensions-x-ext1-ext2")
     
diff --git a/tests/extensions-x-footnotes/footnote.html b/tests/extensions-x-footnotes/footnote.html
new file mode 100644
index 0000000..de0070d
--- /dev/null
+++ b/tests/extensions-x-footnotes/footnote.html
@@ -0,0 +1,40 @@
+<p>This is the body with a footnote<sup id="fnr1-5771256"><a href="#fn1-5771256">1</a></sup> or two<sup id="fnr2-5771256"><a href="#fn2-5771256">2</a></sup> or more<sup id="fnr3-5771256"><a href="#fn3-5771256">3</a></sup> <sup id="fnr4-5771256"><a href="#fn4-5771256">4</a></sup>.
+</p>
+
+<div class="footnote"><hr/><ol>
+ <li id="fn1-5771256"><p>Footnote that ends with a list:
+</p>
+<ul>
+ <li>
+     item 1
+ </li>
+
+ <li>
+     item 2
+ </li>
+</ul>
+<p><a href="#fnr1-5771256" class="footnoteBackLink" title="Jump back to footnote 1 in the text">&#8617;</a>
+</p>
+
+ </li>
+
+ <li id="fn2-5771256"><blockquote><p>This footnote is a blockquote.
+</p>
+</blockquote><p><a href="#fnr2-5771256" class="footnoteBackLink" title="Jump back to footnote 2 in the text">&#8617;</a>
+</p>
+
+ </li>
+
+ <li id="fn3-5771256"><p>A simple oneliner.<a href="#fnr3-5771256" class="footnoteBackLink" title="Jump back to footnote 3 in the text">&#8617;</a>
+</p>
+
+ </li>
+
+ <li id="fn4-5771256"><p>A footnote with multiple paragraphs.
+</p>
+<p>Paragraph two.<a href="#fnr4-5771256" class="footnoteBackLink" title="Jump back to footnote 4 in the text">&#8617;</a>
+</p>
+
+ </li>
+</ol>
+</div>
\ No newline at end of file
diff --git a/tests/footnote.txt b/tests/extensions-x-footnotes/footnote.txt
index 07188d0..07188d0 100644
--- a/tests/footnote.txt
+++ b/tests/extensions-x-footnotes/footnote.txt
diff --git a/tests/footnote.html b/tests/footnote.html
deleted file mode 100644
index 6114176..0000000
--- a/tests/footnote.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<p>This is the body with a footnote<sup id="fnr1-429656941"><a href="#fn1-429656941">1</a></sup> or two<sup id="fnr2-429656941"><a href="#fn2-429656941">2</a></sup> or more<sup id="fnr3-429656941"><a href="#fn3-429656941">3</a></sup> <sup id="fnr4-429656941"><a href="#fn4-429656941">4</a></sup>.
-</p>
-
-<div class="footnote"><hr/><ol>
- <li id="fn1-429656941"><p>Footnote that ends with a list:
-</p>
-<ul>
- <li>
-     item 1
- </li>
-
- <li>
-     item 2
- </li>
-</ul>
-<p><a href="#fnr1-429656941" class="footnoteBackLink" title="Jump back to footnote 1 in the text">&#8617;</a>
-</p>
-
- </li>
-
- <li id="fn2-429656941"><blockquote><p>This footnote is a blockquote.
-</p>
-</blockquote><p><a href="#fnr2-429656941" class="footnoteBackLink" title="Jump back to footnote 1 in the text">&#8617;</a>
-</p>
-
- </li>
-
- <li id="fn3-429656941"><p>A simple oneliner.<a href="#fnr3-429656941" class="footnoteBackLink" title="Jump back to footnote 1 in the text">&#8617;</a>
-</p>
-
- </li>
-
- <li id="fn4-429656941"><p>A footnote with multiple paragraphs.
-</p>
-<p>Paragraph two.<a href="#fnr4-429656941" class="footnoteBackLink" title="Jump back to footnote 1 in the text">&#8617;</a>
-</p>
-
- </li>
-</ol>
-</div>
\ No newline at end of file
diff --git a/tests/misc/blank.html b/tests/misc/blank.html
deleted file mode 100644
index e69de29..0000000
--- a/tests/misc/blank.html
+++ /dev/null
diff --git a/tests/misc/blank.txt b/tests/misc/blank.txt
deleted file mode 100644
index e69de29..0000000
--- a/tests/misc/blank.txt
+++ /dev/null