2002-10-28 Ville Palo <[email protected]>

	* makefile.gnu:
	* data_linux_test.args: Added new files for testing
	* System.Data.SqlTypes/AllTest.cs:
	* System.Data.SqlTypes/SqlDecimalTest.cs
	* System.Data.SqlTypes/SqlMoneyTest.cs: Bugfixes, Now all the
	SqlTypes test suites work.

svn path=/trunk/mcs/; revision=8623

mcs/class/System.Data/Test/System.Data.SqlTypes/AllTests.cs

@@ -20,7 +20,7 @@ namespace MonoTests.System.Data.SqlTypes
 			get {
 				TestSuite suite =  new TestSuite ();
 				suite.AddTest (new TestSuite (typeof (SqlBinaryTest)));
-				suite.AddTest (new TestSuite (typeof (SqlBooleanTest)));
+								suite.AddTest (new TestSuite (typeof (SqlBooleanTest)));
 				suite.AddTest (new TestSuite (typeof (SqlByteTest)));
 				suite.AddTest (new TestSuite (typeof (SqlDoubleTest)));
 				suite.AddTest (new TestSuite (typeof (SqlInt16Test)));
@@ -32,7 +32,7 @@ namespace MonoTests.System.Data.SqlTypes
 				suite.AddTest (new TestSuite (typeof (SqlGuidTest)));
 				suite.AddTest (new TestSuite (typeof (SqlDecimalTest)));
 				suite.AddTest (new TestSuite (typeof (SqlStringTest)));
-				return suite;
+			        return suite;
 			}
 		}
 	}

mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDecimalTest.cs

@@ -136,7 +136,7 @@ namespace MonoTests.System.Data.SqlTypes
                 {
 
 			// Abs
-			AssertEquals ("#D01", (SqlDecimal)6, SqlDecimal.Abs (Test4));
+			AssertEquals ("#D01", (SqlDecimal)6m, SqlDecimal.Abs (Test4));
                 	AssertEquals ("#D02", (SqlDecimal)6464.6464m, SqlDecimal.Abs (Test1));
                 	
                 	AssertEquals ("#D03", SqlDecimal.Null, SqlDecimal.Abs (SqlDecimal.Null));
@@ -151,7 +151,7 @@ namespace MonoTests.System.Data.SqlTypes
                                 AssertEquals ("#D06", typeof (OverflowException), e.GetType ());
                         }
                         
-			AssertEquals ("#D07", (SqlDecimal)6465, SqlDecimal.Ceiling(Test1));
+			AssertEquals ("#D07", (SqlDecimal)6465m, SqlDecimal.Ceiling(Test1));
                 	AssertEquals ("#D08", SqlDecimal.Null, SqlDecimal.Ceiling(SqlDecimal.Null));
                 	
                         // Divide()
@@ -165,7 +165,7 @@ namespace MonoTests.System.Data.SqlTypes
                                 AssertEquals ("#D12", typeof (DivideByZeroException), e.GetType ());
                         }
 
-			AssertEquals ("#D13", (SqlDecimal)6464, SqlDecimal.Floor (Test1));
+			AssertEquals ("#D13", (SqlDecimal)6464m, SqlDecimal.Floor (Test1));
                 	
                         // Multiply()
                         AssertEquals ("#D14", 64646464m, SqlDecimal.Multiply (Test1, Test2).Value);
@@ -413,7 +413,7 @@ namespace MonoTests.System.Data.SqlTypes
                         }
 
                         // "*"-operator
-                        AssertEquals ("#P07", (SqlDecimal)64646464, Test1 * Test2);
+                        AssertEquals ("#P07", (SqlDecimal)64646464m, Test1 * Test2);
 
                         try {
                                 SqlDecimal test = SqlDecimal.MaxValue * Test1;

mcs/class/System.Data/Test/System.Data.SqlTypes/SqlMoneyTest.cs

@@ -97,9 +97,9 @@ namespace MonoTests.System.Data.SqlTypes
 			SqlMoney TestMoney2 = new SqlMoney (2);
 
 			// Add
-                        AssertEquals ("#D01", (SqlMoney)96464.6464, SqlMoney.Add (Test1, Test2));
-                        AssertEquals ("#D02", (SqlMoney)180000, SqlMoney.Add (Test2, Test2));
-                        AssertEquals ("#D03", (SqlMoney)45000, SqlMoney.Add (Test2, Test4));
+                        AssertEquals ("#D01", (SqlMoney)96464.6464m, SqlMoney.Add (Test1, Test2));
+                        AssertEquals ("#D02", (SqlMoney)180000m, SqlMoney.Add (Test2, Test2));
+                        AssertEquals ("#D03", (SqlMoney)45000m, SqlMoney.Add (Test2, Test4));
 			
 			try {
 				SqlMoney test = SqlMoney.Add(SqlMoney.MaxValue, Test2);
@@ -109,7 +109,7 @@ namespace MonoTests.System.Data.SqlTypes
 			}
 
 			// Divide
-                        AssertEquals ("#D06", (SqlMoney)45000, SqlMoney.Divide (Test2, TestMoney2));
+                        AssertEquals ("#D06", (SqlMoney)45000m, SqlMoney.Divide (Test2, TestMoney2));
 			try {
 				SqlMoney test = SqlMoney.Divide (Test2, SqlMoney.Zero);
 				Fail ("#D07");
@@ -119,8 +119,8 @@ namespace MonoTests.System.Data.SqlTypes
 			}
 				     			
 			// Multiply
-                        AssertEquals ("#D09", (SqlMoney)581818176, SqlMoney.Multiply (Test1, Test2));
-                        AssertEquals ("#D10", (SqlMoney)(-4050000000), SqlMoney.Multiply (Test3, Test4));
+                        AssertEquals ("#D09", (SqlMoney)581818176m, SqlMoney.Multiply (Test1, Test2));
+                        AssertEquals ("#D10", (SqlMoney)(-4050000000m), SqlMoney.Multiply (Test3, Test4));
 
 			try {
 				SqlMoney test = SqlMoney.Multiply (SqlMoney.MaxValue, Test2);
@@ -130,8 +130,8 @@ namespace MonoTests.System.Data.SqlTypes
 			}
 				      
 			// Subtract
-                        AssertEquals ("#D13", (SqlMoney)0, SqlMoney.Subtract (Test2, Test3));
-                        AssertEquals ("#D14", (SqlMoney)83535.3536, SqlMoney.Subtract (Test2, Test1));
+                        AssertEquals ("#D13", (SqlMoney)0m, SqlMoney.Subtract (Test2, Test3));
+                        AssertEquals ("#D14", (SqlMoney)83535.3536m, SqlMoney.Subtract (Test2, Test1));
 			
 			try {
 				SqlMoney test = SqlMoney.Subtract (SqlMoney.MinValue, Test2);
@@ -314,7 +314,7 @@ namespace MonoTests.System.Data.SqlTypes
                 public void TestArithmeticOperators()
                 {
                         // "+"-operator
-                        AssertEquals ("#N01", (SqlMoney)96464.6464, Test1 + Test2);
+                        AssertEquals ("#N01", (SqlMoney)96464.6464m, Test1 + Test2);
      
                         try {
                                 SqlMoney test = SqlMoney.MaxValue + SqlMoney.MaxValue;
@@ -324,7 +324,7 @@ namespace MonoTests.System.Data.SqlTypes
                         }
 
                         // "/"-operator
-                        AssertEquals ("#N04", (SqlMoney)13.9219, Test2 / Test1);
+                        AssertEquals ("#N04", (SqlMoney)13.9219m, Test2 / Test1);
 
                         try {
                                 SqlMoney test = Test3 / SqlMoney.Zero;
@@ -334,7 +334,7 @@ namespace MonoTests.System.Data.SqlTypes
                         }
 
                         // "*"-operator
-                        AssertEquals ("#N07", (SqlMoney)581818176, Test1 * Test2);
+                        AssertEquals ("#N07", (SqlMoney)581818176m, Test1 * Test2);
 
                         try {
                                 SqlMoney test = SqlMoney.MaxValue * Test1;
@@ -344,7 +344,7 @@ namespace MonoTests.System.Data.SqlTypes
                         }
 
                         // "-"-operator
-                        AssertEquals ("#N10", (SqlMoney)83535.3536, Test2 - Test1);
+                        AssertEquals ("#N10", (SqlMoney)83535.3536m, Test2 - Test1);
 
                         try {
                                 SqlMoney test = SqlMoney.MinValue - SqlMoney.MaxValue;

mcs/class/System.Data/Test/data_linux_test.args

@@ -0,0 +1,21 @@
+--target library
+-o data_linux_test.dll
+--noconfig
+-r ../../lib/System.Data.dll
+-r ../../lib/System.dll
+-r ../../../nunit/NUnitCore_mono.dll
+System.Data.SqlTypes/AllTests.cs
+System.Data.SqlTypes/SqlBinaryTest.cs
+System.Data.SqlTypes/SqlBooleanTest.cs
+System.Data.SqlTypes/SqlByteTest.cs
+System.Data.SqlTypes/SqlDoubleTest.cs
+System.Data.SqlTypes/SqlInt16Test.cs
+System.Data.SqlTypes/SqlInt32Test.cs
+System.Data.SqlTypes/SqlInt64Test.cs
+System.Data.SqlTypes/SqlSingleTest.cs
+System.Data.SqlTypes/SqlMoneyTest.cs
+System.Data.SqlTypes/SqlDateTimeTest.cs
+System.Data.SqlTypes/SqlGuidTest.cs
+System.Data.SqlTypes/SqlDecimalTest.cs
+System.Data.SqlTypes/SqlStringTest.cs
+AllTests.cs

mcs/class/System.Data/Test/makefile.gnu

@@ -0,0 +1,28 @@
+topdir = ../../..
+
+LIBRARY = data_linux_test.dll
+
+LIB_LIST = data_linux_test.args
+LIB_FLAGS =	\
+	-r $(topdir)/class/lib/corlib.dll \
+	-r $(topdir)/class/lib/System.Data.dll \
+	-r $(topdir)/class/lib/System.dll \
+	-r $(topdir)/class/lib/NUnitCore_mono.dll
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=_DUMMY_
+
+include $(topdir)/class/library.make
+
+MCS_FLAGS = --target library --noconfig
+
+TEST_SUITE_PREFIX = MonoTests.
+TEST_SUITE = AllTests
+NUNITCONSOLE=$(topdir)/class/lib/NUnitConsole_mono.exe 
+
+test: $(LIBRARY) run_test
+
+.PHONY: run_test
+
+run_test:
+	MONO_PATH=$(NUNIT_MONO_PATH) mono $(NUNITCONSOLE) $(TEST_SUITE_PREFIX)$(TEST_SUITE),data_linux_test.dll