From c969e138ffd2f0e574db196c6d0d77abc6e40e64 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Wed, 2 Nov 2011 18:09:04 +0100
Subject: [PATCH] Putted more order to tests (refs #178).

---
 .gitignore                                    | 11 ++++---
 tests/Makefile.am                             | 20 ++++++------
 .../{test_rptreport_creation.c => creation.c} |  0
 tests/{test_report_db.rpt => db.rpt}          |  0
 ...{rptreport_gtktreeview.c => gtktreeview.c} |  0
 ...test_rptreport_liststore.c => liststore.c} |  0
 tests/{test_rptprint_mm.rptr => mm.rptr}      |  0
 .../{test_report_newline.rpt => newline.rpt}  |  0
 tests/report.rpt                              | 29 +++++++++++++++++
 tests/{test_rptprint.c => rptprint.c}         |  0
 tests/{test_rptreport.c => rptreport.c}       |  2 +-
 tests/test_report.rpt                         | 31 -------------------
 12 files changed, 47 insertions(+), 46 deletions(-)
 rename tests/{test_rptreport_creation.c => creation.c} (100%)
 rename tests/{test_report_db.rpt => db.rpt} (100%)
 rename tests/{rptreport_gtktreeview.c => gtktreeview.c} (100%)
 rename tests/{test_rptreport_liststore.c => liststore.c} (100%)
 rename tests/{test_rptprint_mm.rptr => mm.rptr} (100%)
 rename tests/{test_report_newline.rpt => newline.rpt} (100%)
 create mode 100644 tests/report.rpt
 rename tests/{test_rptprint.c => rptprint.c} (100%)
 rename tests/{test_rptreport.c => rptreport.c} (99%)
 delete mode 100644 tests/test_report.rpt

diff --git a/.gitignore b/.gitignore
index 237bf03..cdc3c50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,12 +46,13 @@ stamp-h1
 src/parser.tab.[ch]
 tests/test*.png
 tests/*.pdf
-tests/rptreport_gtktreeview
+tests/gtktreeview
+tests/test_report.rpt
 tests/test_report.rptr
-tests/test_rptprint
-tests/test_rptreport
-tests/test_rptreport_creation
-tests/test_rptreport_liststore
+tests/rptprint
+tests/rptreport
+tests/creation
+tests/liststore
 tests/test_report_created*
 POTFILES
 mkinstalldirs
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1dc2951..9ec6cf4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,16 +6,18 @@ AM_CPPFLAGS = $(REPTOOL_CFLAGS) \
 libreptool = $(top_builddir)/src/libreptool.la
 
 noinst_PROGRAMS = \
-                  test_rptreport \
-                  test_rptprint \
-                  test_rptreport_creation \
-                  test_rptreport_liststore \
-                  rptreport_gtktreeview
+                  rptreport \
+                  rptprint \
+                  creation \
+                  liststore \
+                  gtktreeview
 
 LDADD = $(libreptool)
 
 EXTRA_DIST = \
-             test_report.rpt \
-             test_report_db.rpt \
-             test_rptprint.rptr \
-             db_test.db
+             report.rpt \
+             db.rpt \
+             mm.rptr \
+             newline.rpt \
+             db_test.db \
+             gnome-globe.png
diff --git a/tests/test_rptreport_creation.c b/tests/creation.c
similarity index 100%
rename from tests/test_rptreport_creation.c
rename to tests/creation.c
diff --git a/tests/test_report_db.rpt b/tests/db.rpt
similarity index 100%
rename from tests/test_report_db.rpt
rename to tests/db.rpt
diff --git a/tests/rptreport_gtktreeview.c b/tests/gtktreeview.c
similarity index 100%
rename from tests/rptreport_gtktreeview.c
rename to tests/gtktreeview.c
diff --git a/tests/test_rptreport_liststore.c b/tests/liststore.c
similarity index 100%
rename from tests/test_rptreport_liststore.c
rename to tests/liststore.c
diff --git a/tests/test_rptprint_mm.rptr b/tests/mm.rptr
similarity index 100%
rename from tests/test_rptprint_mm.rptr
rename to tests/mm.rptr
diff --git a/tests/test_report_newline.rpt b/tests/newline.rpt
similarity index 100%
rename from tests/test_report_newline.rpt
rename to tests/newline.rpt
diff --git a/tests/report.rpt b/tests/report.rpt
new file mode 100644
index 0000000..708e4f2
--- /dev/null
+++ b/tests/report.rpt
@@ -0,0 +1,29 @@
+<?xml version="1.0" ?>
+<reptool>
+	<page width="595" height="842" margin-top="50" margin-left="100" margin-right="10" />
+
+	<report>
+		<body height="800">
+			<text name="text4" x="-50" y="10" width="500" height="150" visible="y" source="&quot;text outside from left&quot;" />
+			<text name="text1" x="100" y="50" width="500" height="150" visible="y" source="&quot;the text's content&quot;" />
+			<text name="date" x="100" y="150" width="500" height="150" visible="y" source="@Date" />
+			<text name="time" x="100" y="250" width="500" height="150" visible="y" source="@Time" />
+			<text name="text2" x="100" y="350" width="200" height="100" visible="y" 
+				border-top-width="1.0" border-right-width="1.0" border-bottom-width="1.0" border-left-width="1.0"
+				padding-top="20" padding-right="20" padding-bottom="20" padding-left="10"
+				source="&quot;text very very long to try padding and border&quot;" />
+			<text name="text3" x="400" y="350" width="200" height="50" visible="y" source="&quot;another long text to test page margins&quot;" />
+			<text name="text5" x="50" y="460" width="200" height="50" visible="y" source="[field_to_request]" />
+			<text name="text6" x="50" y="600" width="200" 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-bottom-style="10"
+				rotation="45" source="&quot;Rotated text&quot;" />
+			<line name="line1" x="350" y="50" width="200" height="0" visible="y" rotation="-45" />
+			<rect name="rect1" x="350" y="250" width="200" height="50" visible="y" fill-color="#FFFF00" rotation="45" stroke-style="10" />
+			<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" />
+		</body>
+	</report>
+</reptool>
diff --git a/tests/test_rptprint.c b/tests/rptprint.c
similarity index 100%
rename from tests/test_rptprint.c
rename to tests/rptprint.c
diff --git a/tests/test_rptreport.c b/tests/rptreport.c
similarity index 99%
rename from tests/test_rptreport.c
rename to tests/rptreport.c
index 2cb7c79..bc0dfde 100644
--- a/tests/test_rptreport.c
+++ b/tests/rptreport.c
@@ -104,7 +104,7 @@ main (int argc, char **argv)
 				}
 
 			xmlDoc *rptprint = rpt_report_get_xml_rptprint (rptr);
-			if (xml_rptr_file_name)
+			if (xml_rptr_file_name != NULL)
 				{
 					xmlSaveFormatFileEnc (xml_rptr_file_name, rptprint, "UTF-8", 2);
 				}
diff --git a/tests/test_report.rpt b/tests/test_report.rpt
deleted file mode 100644
index 10c269d..0000000
--- a/tests/test_report.rpt
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<reptool>
-  <properties>
-    <unit-length>mm</unit-length>
-    <output-type>pdf</output-type>
-    <output-filename>rptreport.pdf</output-filename>
-    <copies>1</copies>
-  </properties>
-  <database>
-    <provider/>
-    <connection-string/>
-    <sql/>
-  </database>
-  <page width="297,000000" height="210,000000" margin-top="10,000000" margin-right="10,000000" margin-bottom="10,000000" margin-left="10,000000"/>
-  <report>
-    <page-header first-page="y" last-page="y" height="27,000000">
-      <text name="title" x="0,000000" y="0,000000" width="277,000000" height="10,000000" visible="y" font-name="Droid Sans" font-size="11,000000" font-bold="y" font-color="#000000FF" source="&quot;Report's Title&quot;"/>
-      <text name="title_0" x="0,000000" y="15,000000" width="50,000000" height="10,000000" visible="y" font-name="Droid Sans" font-size="9,000000" font-bold="y" font-color="#000000FF" source="&quot;Book's title&quot;"/>
-      <text name="title_1" x="55,000000" y="15,000000" width="76,000000" height="10,000000" visible="y" font-name="Droid Sans" font-size="9,000000" font-bold="y" font-color="#000000FF" source="&quot;Author&quot;"/>
-      <line name="line1" x="0,000000" y="25,000000" width="277,000000" height="0,000000" visible="y"/>
-    </page-header>
-    <body height="15,000000">
-      <text name="field_0" x="0,000000" y="0,000000" width="50,000000" height="10,000000" visible="y" font-name="Droid Sans" font-size="9,000000" font-color="#000000FF" source="[field_0]"/>
-      <text name="field_1" x="55,000000" y="0,000000" width="76,000000" height="10,000000" visible="y" font-name="Droid Sans" font-size="9,000000" font-color="#000000FF" source="[field_1]"/>
-    </body>
-    <page-footer first-page="y" last-page="y" height="12,000000">
-      <line name="line2" x="0,000000" y="0,000000" width="277,000000" height="0,000000" visible="y"/>
-      <text name="pages" x="0,000000" y="2,000000" width="277,000000" height="10,000000" visible="y" font-name="Droid Sans" font-size="8,000000" font-color="#000000FF" horizontal-align="right" source="&quot;Page &quot; &amp; @Page &amp; &quot; of &quot; &amp; @Pages"/>
-    </page-footer>
-  </report>
-</reptool>
-- 
2.49.0