NullableTypes/src/Tests DBNullConvertTest.cs,1.2,1.3

[Damien G. <dam...@us...>]

Update of /cvsroot/nullabletypes/NullableTypes/src/Tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31041/src/Tests

Modified Files:
	DBNullConvertTest.cs 
Log Message:
Implement DBNullConvert.From for NullableGuid and add a unit test for it as per issue 1265825.

Index: DBNullConvertTest.cs
===================================================================
RCS file: /cvsroot/nullabletypes/NullableTypes/src/Tests/DBNullConvertTest.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DBNullConvertTest.cs	7 Oct 2003 20:32:21 -0000	1.2
--- DBNullConvertTest.cs	23 Sep 2005 09:47:21 -0000	1.3
***************
*** 9,12 ****
--- 9,13 ----
  //                                 NullableTypes.HelperFunctions as for DBNullConvert class
  // 06-Oct-2003  Luca    Upgrade    Code upgrade: Replaced tabs with spaces
+ // 05-Sep-2005  DamienG Upgrade    Added tests for NullableGuid conversion
  //
  
***************
*** 425,428 ****
--- 426,474 ----
  
          [nu.Test]
+         public void ToNullableGuid() 
+         {
+             _dbTable.Columns.Add("System.Guid", typeof(sys.Guid));
+ 
+             _dbTable.Rows.Add(new object[] {sys.Guid.Empty});
+             nua.AssertEquals(
+                 "TestA#101", 
+                 NullableGuid.Empty, 
+                 DBNullConvert.ToNullableGuid(_dbTable.Rows[_dbTable.Rows.Count-1][0]));
+             
+             System.Guid newGuid = System.Guid.NewGuid();
+             _dbTable.Rows.Add(new object[] { newGuid });
+             nua.AssertEquals(
+                 "TestA#102", 
+                 new NullableGuid(newGuid),
+                 DBNullConvert.ToNullableGuid(_dbTable.Rows[_dbTable.Rows.Count-1][0]));
+ 
+             _dbTable.Rows.Add(new object[] {sys.DBNull.Value});
+             nua.AssertEquals(
+                 "TestA#103", 
+                 NullableGuid.Null, 
+                 DBNullConvert.ToNullableGuid(_dbTable.Rows[_dbTable.Rows.Count-1][0]));
+ 
+             _dbTable.Rows.Add(new object[] {null});
+             nua.AssertEquals(
+                 "TestA#104", 
+                 NullableGuid.Null, 
+                 DBNullConvert.ToNullableGuid(_dbTable.Rows[_dbTable.Rows.Count-1][0]));
+         }
+ 
+ 
+         [nu.Test, nu.ExpectedException(typeof(sys.InvalidCastException))]
+         public void ToNullableGuidInvalidCastException() 
+         {
+             DBNullConvert.ToNullableGuid("gino");
+         }
+         
+ 
+         [nu.Test, nu.ExpectedException(typeof(sys.ArgumentNullException))]
+         public void ToNullableGuidArgumentNullException() 
+         {
+             DBNullConvert.ToNullableGuid(null);
+         }
+ 
+         [nu.Test]
          public void ToNullableString() {
              _dbTable.Columns.Add("System.String", typeof(string));
***************
*** 596,599 ****
--- 642,658 ----
          }        
  
+         [nu.Test]
+         public void FromNullableGuid() 
+         {
+             nua.AssertEquals("TestB#091", 
+                 sys.DBNull.Value, 
+                 DBNullConvert.From(NullableString.Null));
+             nua.AssertEquals("TestB#092", 
+                 System.Guid.Empty, 
+                 DBNullConvert.From(NullableGuid.Empty));
+             nua.AssertEquals("TestB#093", 
+                 "4D38949B-1749-4496-9FD6-B3DA1275708C", 
+                 DBNullConvert.From(new NullableString("4D38949B-1749-4496-9FD6-B3DA1275708C")));
+         }
  
          [nu.Test]