Putted more order to tests (refs #178).

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9ec6cf4456fe0c3547e93e2b322d667caee6f6b4..9909253c172f4c8be17cd895bfe95c7a91a49c36 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,4 +20,5 @@ EXTRA_DIST = \
              mm.rptr \
              newline.rpt \
              db_test.db \
-             gnome-globe.png
+             gnome-globe.png \
+             rodents.png

diff --git a/tests/city.png b/tests/city.png
deleted file mode 100644 (file)
index 4a75a05..0000000
Binary files a/tests/city.png and /dev/null differ

diff --git a/tests/mm.rptr b/tests/mm.rptr
index cdf540de8f535d5d4dcfa4bcfac178b967e78aee..c7e7a8e172a7cfd9b27c63c3545745e7132a9fc8 100644 (file)
--- a/tests/mm.rptr
+++ b/tests/mm.rptr
@@ -6,7 +6,7 @@
        <page width="210" height="297">
                <text x="10" y="20" width="210" height="100" visible="y" border-top-width="2.83" border-bottom-width="2.83" font-size="12" font-color="#0F0" border-top="2.83" border-bottom="2.83">Text sample</text>
                <!--<line x="10" y="300" width="100" height="0" visible="y" stroke-color="#F00" />
-               <image x="250" y="180" width="300" height="200" visible="y" border-top-width="1.0" border-right-width="1.0" border-bottom-width="1.0" border-left-width="1.0" source="tests/city.png" />
+               <image x="250" y="180" width="300" height="200" visible="y" border-top-width="1.0" border-right-width="1.0" border-bottom-width="1.0" border-left-width="1.0" source="rodents.png" />
                <rect x="10" y="500" width="400" height="10" visible="y" fill-color="#00F" />
                <text x="10" y="400" width="100" height="50" visible="y" border-top-width="1.0" border-right-width="1.0" border-bottom-width="1.0" border-left-width="1.0" border-top-color="#FF0000" border-right-color="#FF0000" border-bottom-color="#FF0000" border-left-color="#FF0000" background-color="#000000" font-color="#FFFFFF">White on black</text>
        </page>

diff --git a/tests/report.rpt b/tests/report.rpt
index 708e4f24f898f29196c76c29d6d739c62a5a8834..65f8b7441576e53d6b50c926a96d49c94ca81dbf 100644 (file)
--- a/tests/report.rpt
+++ b/tests/report.rpt
@@ -23,7 +23,7 @@
                        <image name="image1" x="200" y="460" width="200" height="150" visible="y" 
                                border-top-width="1.0" border-right-width="1.0" border-bottom-width="1.0" border-left-width="1.0"
                                border-top-color="#FF0000" border-right-color="#FF0000" border-bottom-color="#FF0000" border-left-color="#FF0000"
-                               rotation="135" source="tests/city.png" />
+                               rotation="135" source="rodents.png" />
                </body>
        </report>
 </reptool>

diff --git a/tests/rodents.png b/tests/rodents.png
new file mode 100644 (file)
index 0000000..ca8cbb3
Binary files /dev/null and b/tests/rodents.png differ

diff --git a/tests/test_rptprint.rptr b/tests/test_rptprint.rptr
deleted file mode 100644 (file)
index 3f9e7f9..0000000
--- a/tests/test_rptprint.rptr
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" ?>
-<reptool_report>
-       <page width="595" height="842">
-               <text x="10" y="20" width="300" height="10" border-top-width="1.0" border-bottom-width="1.0" font-size="12" font-color="#0F0">Text sample</text>
-               <line x="10" y="300" width="100" height="0" stroke-color="#F00" />
-               <image x="250" y="180" width="300" height="200" border-top-width="1.0" border-right-width="1.0" border-bottom-width="1.0" border-left-width="1.0" source="tests/city.png" />
-               <rect x="10" y="500" width="400" height="10" fill-color="#00F" />
-               <text x="10" y="400" width="100" height="50" border-top-width="1.0" border-right-width="1.0" border-bottom-width="1.0" border-left-width="1.0" border-top-color="#FF0000" border-right-color="#FF0000" border-bottom-color="#FF0000" border-left-color="#FF0000" background-color="#000000" font-color="#FFFFFF">White on black</text>
-       </page>
-
-       <page width="595" height="842">
-               <text x="10" y="300" width="300" height="800" font-size="30" font-color="#FF0">Text sample on second page</text>
-               <line x="10" y="300" width="100" height="0" stroke-color="#0F0" />
-               <ellipse x="200" y="700" width="100" height="30" stroke-color="#FF0000" fill-color="#0000FF" />
-               <text x="350" y="20" width="200" height="100" font-underline="single">Underline single</text>
-               <text x="350" y="120" width="200" height="100" font-underline="double">Underline double</text>
-               <text x="350" y="220" width="200" height="100" font-underline="low">Underline low</text>
-               <text x="350" y="320" width="200" height="100" font-underline="error">Underline error</text>
-               <text x="350" y="420" width="200" height="100" font-bold="y" font-color="#FF0000" font-strike="y">Text striked and bold</text>
-               <text x="350" y="520" width="200" height="100" font-italic="y">Text italic</text>
-       </page>
-</reptool_report>