[tests] Fix failing composerhtml tests, by forcing test html to use a…

… set font size in pixels.
qgis · Dec 28, 2013 · bf407db · bf407db
1 parent 6aed6fe
commit bf407db
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/tests/src/python/test_qgscomposerhtml.py b/tests/src/python/test_qgscomposerhtml.py
@@ -62,6 +62,9 @@ def testTable(self):
         myTestResult, myMessage = checker.testComposition()
 
         qDebug(myMessage)
+        self.mComposition.removeMultiFrame( composerHtml )
+        composerHtml = None
+
         assert myTestResult, myMessage
 
     def testTableMultiFrame(self):
@@ -91,6 +94,10 @@ def testTableMultiFrame(self):
         myPage = 2
         checker3 = QgsCompositionChecker('composerhtml_multiframe3', self.mComposition)
         myTestResult, myMessage = checker3.testComposition( myPage )
+
+        self.mComposition.removeMultiFrame( composerHtml )
+        composerHtml = None
+
         assert myTestResult, myMessage
 
     def testComposerHtmlAccessor(self):

diff --git a/..._images/expected_composerhtml_multiframe1/expected_composerhtml_multiframe1.png b/..._images/expected_composerhtml_multiframe1/expected_composerhtml_multiframe1.png
diff --git a/..._images/expected_composerhtml_multiframe2/expected_composerhtml_multiframe2.png b/..._images/expected_composerhtml_multiframe2/expected_composerhtml_multiframe2.png
diff --git a/...data/control_images/expected_composerhtml_table/expected_composerhtml_table.png b/...data/control_images/expected_composerhtml_table/expected_composerhtml_table.png
diff --git a/tests/testdata/html_table.html b/tests/testdata/html_table.html
@@ -1,6 +1,12 @@
 <html>
   <head>
     <link href="bootstrap.css" media="all" rel="stylesheet" type="text/css" />
+    <style>
+      .table td {
+        font-size: 20px;
+        line-height: 30px;
+      }
+    </style>
   </head>
   <body>
     <table class="table table-striped table-bordered condensed">