Fixed Docbook Tool and updated its tests.

4 files changed, 16 insertions, 29 deletions

diff --git a/test/Docbook/rootname/htmlchunked/htmlchunked.py b/test/Docbook/rootname/htmlchunked/htmlchunked.py
index 65b50ef..cb2bb86 100644
--- a/test/Docbook/rootname/htmlchunked/htmlchunked.py
+++ b/test/Docbook/rootname/htmlchunked/htmlchunked.py
@@ -37,19 +37,15 @@ if not (sys.platform.startswith('linux') and
     test.skip_test('Wrong OS or no stylesheets installed, skipping test.\n')
 
 try:
-    import libxml2
-    import libxslt
+    import lxml
 except:
-    try:
-        import lxml
-    except:
-        test.skip_test('Cannot find installed Python binding for libxml2 or lxml, skipping test.\n')
+    test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n')
 
 test.dir_fixture('image')
 
 # Normal invocation
 test.run(stderr=None)
-test.must_exist(test.workpath('manual.html'))
+test.must_not_be_empty(test.workpath('manual.html'))
 
 # Cleanup
 test.run(arguments='-c')
diff --git a/test/Docbook/rootname/htmlhelp/htmlhelp.py b/test/Docbook/rootname/htmlhelp/htmlhelp.py
index 9d0b076..45f9d7a 100644
--- a/test/Docbook/rootname/htmlhelp/htmlhelp.py
+++ b/test/Docbook/rootname/htmlhelp/htmlhelp.py
@@ -37,21 +37,17 @@ if not (sys.platform.startswith('linux') and
     test.skip_test('Wrong OS or no stylesheets installed, skipping test.\n')
 
 try:
-    import libxml2
-    import libxslt
+    import lxml
 except:
-    try:
-        import lxml
-    except:
-        test.skip_test('Cannot find installed Python binding for libxml2 or lxml, skipping test.\n')
+    test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n')
 
 test.dir_fixture('image')
 
 # Normal invocation
 test.run(stderr=None)
-test.must_exist(test.workpath('manual.html'))
-test.must_exist(test.workpath('htmlhelp.hhp'))
-test.must_exist(test.workpath('toc.hhc'))
+test.must_not_be_empty(test.workpath('manual.html'))
+test.must_not_be_empty(test.workpath('htmlhelp.hhp'))
+test.must_not_be_empty(test.workpath('toc.hhc'))
 
 # Cleanup
 test.run(arguments='-c')
diff --git a/test/Docbook/rootname/slideshtml/image/virt.xml b/test/Docbook/rootname/slideshtml/image/virt.xml
index aec1fd7..9cdf778 100644
--- a/test/Docbook/rootname/slideshtml/image/virt.xml
+++ b/test/Docbook/rootname/slideshtml/image/virt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE slides PUBLIC "-//Norman Walsh//DTD Slides XML V3.3.1//EN"
-"file:///usr/share/xml/docbook/custom/slides/3.3.1/schema/dtd/slides.dtd">
+"http://docbook.sourceforge.net/release/slides/3.3.1/schema/dtd/slides.dtd">
 <slides>
   <slidesinfo>
     <title>Virtuelles Kopieren</title>
diff --git a/test/Docbook/rootname/slideshtml/slideshtml.py b/test/Docbook/rootname/slideshtml/slideshtml.py
index 399764b..3220522 100644
--- a/test/Docbook/rootname/slideshtml/slideshtml.py
+++ b/test/Docbook/rootname/slideshtml/slideshtml.py
@@ -33,27 +33,22 @@ import TestSCons
 test = TestSCons.TestSCons()
 
 if not (sys.platform.startswith('linux') and
-        os.path.isdir('/usr/share/xml/docbook/stylesheet/docbook-xsl/slides') and
-        os.path.isdir('/usr/share/xml/docbook/custom/slides/3.3.1')):
+        os.path.isdir('/usr/share/xml/docbook/stylesheet/docbook-xsl/slides')):
     test.skip_test('Wrong OS or no "slides" stylesheets installed, skipping test.\n')
 
 try:
-    import libxml2
-    import libxslt
+    import lxml
 except:
-    try:
-        import lxml
-    except:
-        test.skip_test('Cannot find installed Python binding for libxml2 or lxml, skipping test.\n')
+    test.skip_test('Cannot find installed Python binding for lxml, skipping test.\n')
 
 test.dir_fixture('image')
 
 # Normal invocation
 test.run(stderr=None)
-test.must_exist(test.workpath('manual.html'))
-test.must_exist(test.workpath('toc.html'))
-test.must_exist(test.workpath('foil01.html'))
-test.must_exist(test.workpath('foilgroup01.html'))
+test.must_not_be_empty(test.workpath('manual.html'))
+test.must_not_be_empty(test.workpath('toc.html'))
+test.must_not_be_empty(test.workpath('foil01.html'))
+test.must_not_be_empty(test.workpath('foilgroup01.html'))
 
 # Cleanup
 test.run(arguments='-c')