Html5 writer: Correctly sort docinfo and subtitle into "parts" dict.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8217 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 23 insertions, 22 deletions

diff --git a/docutils/test/DocutilsTestSupport.py b/docutils/test/DocutilsTestSupport.py
index da3968ae8..4724f5e4c 100644
--- a/docutils/test/DocutilsTestSupport.py
+++ b/docutils/test/DocutilsTestSupport.py
@@ -757,28 +757,6 @@ class PublishTestSuite(CustomTestSuite):
                       writer_name=self.writer_name)
 
 
-class HtmlPublishPartsTestSuite(CustomTestSuite):
-
-    def generateTests(self, dict, dictname='totest'):
-        for name, (settings_overrides, cases) in dict.items():
-            settings = self.suite_settings.copy()
-            settings.update(settings_overrides)
-            for casenum in range(len(cases)):
-                case = cases[casenum]
-                run_in_debugger = False
-                if len(case)==3:
-                    if case[2]:
-                        run_in_debugger = True
-                    else:
-                        continue
-                self.addTestCase(
-                      HtmlWriterPublishPartsTestCase, 'test_publish',
-                      input=case[0], expected=case[1],
-                      id='%s[%r][%s]' % (dictname, name, casenum),
-                      run_in_debugger=run_in_debugger,
-                      suite_settings=settings)
-
-
 class HtmlWriterPublishPartsTestCase(WriterPublishTestCase):
 
     """
@@ -855,6 +833,29 @@ class HtmlWriterPublishPartsTestCase(WriterPublishTestCase):
         return '{' + ',\n '.join(output) + '}\n'
 
 
+class HtmlPublishPartsTestSuite(CustomTestSuite):
+
+    testcase_class = HtmlWriterPublishPartsTestCase
+    
+    def generateTests(self, dict, dictname='totest'):
+        for name, (settings_overrides, cases) in dict.items():
+            settings = self.suite_settings.copy()
+            settings.update(settings_overrides)
+            for casenum in range(len(cases)):
+                case = cases[casenum]
+                run_in_debugger = False
+                if len(case)==3:
+                    if case[2]:
+                        run_in_debugger = True
+                    else:
+                        continue
+                self.addTestCase(self.testcase_class, 'test_publish',
+                                 input=case[0], expected=case[1],
+                                 id='%s[%r][%s]' % (dictname, name, casenum),
+                                 run_in_debugger=run_in_debugger,
+                                 suite_settings=settings)
+
+
 def exception_data(func, *args, **kwds):
     """
     Execute `func(*args, **kwds)` and return the resulting exception, the