From 4ed219d64921e14b9809fd3a535f94fbe2c01d26 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 16 Oct 2009 09:48:20 +0200
Subject: Make the tests more uniform

---
 tests/cxx/hybrid/default/makefile     |  4 ++--
 tests/cxx/hybrid/default/output       |  1 -
 tests/cxx/hybrid/default/test-000.std |  1 +
 tests/cxx/hybrid/default/test-000.xml | 16 ++++++++++++++++
 tests/cxx/hybrid/default/test.xml     | 16 ----------------
 5 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 tests/cxx/hybrid/default/output
 create mode 100644 tests/cxx/hybrid/default/test-000.std
 create mode 100644 tests/cxx/hybrid/default/test-000.xml
 delete mode 100644 tests/cxx/hybrid/default/test.xml

(limited to 'tests/cxx/hybrid/default')

diff --git a/tests/cxx/hybrid/default/makefile b/tests/cxx/hybrid/default/makefile
index 5e0e55e..5dd5d04 100644
--- a/tests/cxx/hybrid/default/makefile
+++ b/tests/cxx/hybrid/default/makefile
@@ -55,8 +55,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/hybrid/default/output b/tests/cxx/hybrid/default/output
deleted file mode 100644
index 8d41894..0000000
--- a/tests/cxx/hybrid/default/output
+++ /dev/null
@@ -1 +0,0 @@
-<t:root xmlns:t="test" any="" bool1="true" bool2="true" bool3="false" bool4="false" byte="-99" decimal1="1.12345" decimal2="-0.456" double1="1.12345" double2="1123.45" double3="-0.00012345" double4="NaN" double5="-INF" fix1="123" fix2="123" fix3="abc" fix4="abc" fix5="aaa bbb ccc" fix6="aaa bbb ccc" float1="1.123" float2="1123" float3="-0.000123" float4="NaN" float5="-INF" id="this" idref="this" idrefs="this" int="-99999" integer="-99999" language="en-us" long="-99999" ncname="abcd" ninteger="-99999" nmtoken="ab:cd" nmtokens1="a:b efg aaa" nmtokens2="abc" nninteger="99999" npinteger="-99999" nstring=" a  b " pinteger="99999" qname1="foo" qname2="t:bar" short="-999" string1="" string2=" a  b " token="a b" ubyte="99" uint="99999" ulong="99999" uri="http://example.com" ushort="999"><union a="abc"></union><list a="123 345 678" b="ab cd ef" c="abc" d="abc def"></list><simple a="123" b="abc" c="123" d="abc" e="abc" f="abc 123"></simple><date a="2009-03-31" b="2009-03-31Z" c="2009-03-31Z" d="2009-03-31Z" e="2009-03-31+12:30" f="2009-03-31-12:30" g="2002009-03-31-12:30"></date><time a="12:03:45" b="12:03:45.123Z" c="12:03:05.123Z" d="12:03:45.123Z" e="12:03:45.123+12:30" f="12:03:45-12:30"></time><date-time a="2009-03-31T12:03:45" b="2009-03-31T12:03:45.123Z" c="2002009-03-31T12:03:05.123-12:30"></date-time><duration a="P100Y" b="P100M" c="P100D" d="PT12H" e="PT12M" f="PT12.123S" g="-P100Y10M20DT12H12M1.123S"></duration><day a="---02" b="---22Z" c="---22-12:30"></day><month a="--02" b="--12Z" c="--12+12:30"></month><year a="2009" b="-2002009Z" c="2009-12:30"></year><month-day a="--02-02" b="--12-22Z" c="--12-22+12:30"></month-day><year-month a="2009-02" b="-2002009-12Z" c="2009-12-12:30"></year-month></t:root>
\ No newline at end of file
diff --git a/tests/cxx/hybrid/default/test-000.std b/tests/cxx/hybrid/default/test-000.std
new file mode 100644
index 0000000..8d41894
--- /dev/null
+++ b/tests/cxx/hybrid/default/test-000.std
@@ -0,0 +1 @@
+<t:root xmlns:t="test" any="" bool1="true" bool2="true" bool3="false" bool4="false" byte="-99" decimal1="1.12345" decimal2="-0.456" double1="1.12345" double2="1123.45" double3="-0.00012345" double4="NaN" double5="-INF" fix1="123" fix2="123" fix3="abc" fix4="abc" fix5="aaa bbb ccc" fix6="aaa bbb ccc" float1="1.123" float2="1123" float3="-0.000123" float4="NaN" float5="-INF" id="this" idref="this" idrefs="this" int="-99999" integer="-99999" language="en-us" long="-99999" ncname="abcd" ninteger="-99999" nmtoken="ab:cd" nmtokens1="a:b efg aaa" nmtokens2="abc" nninteger="99999" npinteger="-99999" nstring=" a  b " pinteger="99999" qname1="foo" qname2="t:bar" short="-999" string1="" string2=" a  b " token="a b" ubyte="99" uint="99999" ulong="99999" uri="http://example.com" ushort="999"><union a="abc"></union><list a="123 345 678" b="ab cd ef" c="abc" d="abc def"></list><simple a="123" b="abc" c="123" d="abc" e="abc" f="abc 123"></simple><date a="2009-03-31" b="2009-03-31Z" c="2009-03-31Z" d="2009-03-31Z" e="2009-03-31+12:30" f="2009-03-31-12:30" g="2002009-03-31-12:30"></date><time a="12:03:45" b="12:03:45.123Z" c="12:03:05.123Z" d="12:03:45.123Z" e="12:03:45.123+12:30" f="12:03:45-12:30"></time><date-time a="2009-03-31T12:03:45" b="2009-03-31T12:03:45.123Z" c="2002009-03-31T12:03:05.123-12:30"></date-time><duration a="P100Y" b="P100M" c="P100D" d="PT12H" e="PT12M" f="PT12.123S" g="-P100Y10M20DT12H12M1.123S"></duration><day a="---02" b="---22Z" c="---22-12:30"></day><month a="--02" b="--12Z" c="--12+12:30"></month><year a="2009" b="-2002009Z" c="2009-12:30"></year><month-day a="--02-02" b="--12-22Z" c="--12-22+12:30"></month-day><year-month a="2009-02" b="-2002009-12Z" c="2009-12-12:30"></year-month></t:root>
\ No newline at end of file
diff --git a/tests/cxx/hybrid/default/test-000.xml b/tests/cxx/hybrid/default/test-000.xml
new file mode 100644
index 0000000..11bd0a7
--- /dev/null
+++ b/tests/cxx/hybrid/default/test-000.xml
@@ -0,0 +1,16 @@
+<t:root xmlns:t="test" id="this" fix2="123" fix4="abc" fix6="aaa bbb ccc">
+
+  <union/>
+  <list/>
+  <simple/>
+  <date/>
+  <time/>
+  <date-time/>
+  <duration/>
+  <day/>
+  <month/>
+  <year/>
+  <month-day/>
+  <year-month/>
+
+</t:root>
diff --git a/tests/cxx/hybrid/default/test.xml b/tests/cxx/hybrid/default/test.xml
deleted file mode 100644
index 11bd0a7..0000000
--- a/tests/cxx/hybrid/default/test.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<t:root xmlns:t="test" id="this" fix2="123" fix4="abc" fix6="aaa bbb ccc">
-
-  <union/>
-  <list/>
-  <simple/>
-  <date/>
-  <time/>
-  <date-time/>
-  <duration/>
-  <day/>
-  <month/>
-  <year/>
-  <month-day/>
-  <year-month/>
-
-</t:root>
-- 
cgit v1.1