Dartest CL - Please review

client/tests/client/samples/total/total_tests.dart

Index: client/tests/client/samples/total/total_tests.dart
===================================================================
--- client/tests/client/samples/total/total_tests.dart	(revision 2358)
+++ client/tests/client/samples/total/total_tests.dart	(working copy)
@@ -10,8 +10,12 @@
 #import('../../../../testing/unittest/unittest.dart');
 #import('../../../../view/view.dart');
 #source('../../../../../samples/total/src/SYLKProducer.dart');
+#source('total_test_lib.dart');
 
 main() {
+<<<<<<< .mine

[Bob Nystrom, 2011/12/14 00:15:30]

Merge conflict marker. Fix.

[shauvik, 2011/12/16 07:19:27]

Done.

+  totalTests();
+=======
   test('DateUtils', () {
     _isDate('1/1');
     _isDate('12/1');
@@ -432,24 +436,5 @@
     spreadsheet.setCellFromContentString(new RowCol(6, 1), "=HLOOKUP(5.3,A1:E2,2)");
     Expect.equals(3.0, spreadsheet.getDoubleValue(new RowCol(6, 1)));
   });
+>>>>>>> .r2354
 }
-
-_checkDate(String date, num value) {
-  Expect.equals(value.toString(), DateUtils.parseDate(date).toString());
-}
-
-_isDate(String date) {
-  Expect.isTrue(DateUtils.isDate(date), "DateUtils.isDate(${date})");
-}
-
-_isNotDate(String date) {
-  Expect.isFalse(DateUtils.isDate(date), "DateUtils.isDate(${date})");
-}
-
-_assertNumeric(String s) {
-  Expect.isTrue(StringUtils.isNumeric(s), 'StringUtils.isNumeric("{$s}")');
-}
-
-_assertNonNumeric(String s) {
-  Expect.isFalse(StringUtils.isNumeric(s), '!StringUtils.isNumeric("${s}")');
-}