Moved tests to nodeunit. #210

Author: highsource

nodejs/scripts/tests/xsd.js

@@ -222,6 +222,46 @@ module.exports =
 		test.equal(-733, gd.timezone);
 		test.equal('---06-12:13', Jsonix.Schema.XSD.Calendar.INSTANCE.print(gd));
 
+		test.throws(
+			function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parse('nomatch'); },
+			/Value \[nomatch\] does not match xs:dateTime, xs:date, xs:time, xs:gYearMonth, xs:gYear, xs:gMonthDay, xs:gMonth or xs:gDay patterns\./);
+
+		test.throws(
+			function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseGYearMonth('201002'); },
+			/Value \[201002\] does not match the xs:gYearMonth pattern\./);
+
+		test.throws(
+			function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseGYear('10'); },
+			/Value \[10\] does not match the xs:gYear pattern\./);
+
+		test.throws(
+			function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseGMonthDay('02-10'); },
+			/Value \[02-10\] does not match the xs:gMonthDay pattern\./);
+
+		test.throws(
+			function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseGMonth('02'); },
+			/Value \[02\] does not match the xs:gMonth pattern\./);
+
+		test.throws(
+			function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseGDay('01'); },
+			/Value \[01\] does not match the xs:gDay pattern\./);
+
+		test.throws(
+			function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseDateTime('2010-02-01 12:23:0'); },
+			/Value \[2010-02-01 12:23:0\] does not match the xs:date pattern\./);
+
+		test.throws(
+			function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseDate('20100201'); },
+			/Value \[20100201\] does not match the xs:date pattern\./);
+
+		test.throws(
+			function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseTime('12:23:0'); },
+			/Value \[12:23:0\] does not match the xs:time pattern\./);
+
+		test.throws(
+			function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseTimezoneString('PDT'); },
+			/Value \[PDT\] does not match the timezone pattern\./);
+
 		test.done();
 	},
 

scripts/src/test/javascript/org/hisrc/jsonix/test/JsonixSchemaXSDTest.js

@@ -1,17 +1,3 @@
-function expectError(expectedError, fn) {
-	try {
-		fn();
-		fail('Expected error but none thrown');
-	} catch (e) {
-		// throw again the exception thorwned by 'fail' above
-		if (e instanceof JsUnitException) throw e;
-
-		// throwned class and message should be as expected
-		assertEquals(expectedError.name, e.name);
-		assertEquals(expectedError.message, e.message)
-	}
-}
-
 function testSchemaXSDString() {
 	var t = Jsonix.Schema.XSD.String.INSTANCE;
 	assertEquals('test', t.print('test'));
@@ -205,48 +191,6 @@ function testSchemaXSDCalendar() {
 
 }
 
-function testSchemaXSDCalendarError() {
-	expectError(
-		new Error('Value [nomatch] does not match xs:dateTime, xs:date, xs:time, xs:gYearMonth, xs:gYear, xs:gMonthDay, xs:gMonth or xs:gDay patterns.'),
-		function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parse('nomatch') });
-
-	expectError(
-		new Error('Value [201002] does not match the xs:gYearMonth pattern.'),
-		function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseGYearMonth('201002'); });
-
-	expectError(
-		new Error('Value [10] does not match the xs:gYear pattern.'),
-		function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseGYear('10'); });
-
-	expectError(
-		new Error('Value [02-10] does not match the xs:gMonthDay pattern.'),
-		function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseGMonthDay('02-10'); });
-
-	expectError(
-		new Error('Value [02] does not match the xs:gMonth pattern.'),
-		function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseGMonth('02'); });
-
-	expectError(
-		new Error('Value [01] does not match the xs:gDay pattern.'),
-		function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseGDay('01'); });
-
-	expectError(
-		new Error('Value [2010-02-01 12:23:0] does not match the xs:date pattern.'),
-		function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseDateTime('2010-02-01 12:23:0'); });
-
-	expectError(
-		new Error('Value [20100201] does not match the xs:date pattern.'),
-		function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseDate('20100201') });
-
-	expectError(
-		new Error('Value [12:23:0] does not match the xs:time pattern.'),
-		function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseTime('12:23:0'); });
-
-	expectError(
-		new Error('Value [PDT] does not match the timezone pattern.'),
-		function() { Jsonix.Schema.XSD.Calendar.INSTANCE.parseTimezoneString('PDT'); });
-}
-
 function testSchemaXSDTime() {
 	var t0 = Jsonix.Schema.XSD.TimeAsDate.INSTANCE.parse('10:00:00.5');
 	var time0 = new Date(1970, 0, 1, 10, 0, 0);