NullableTypes/src/Tests NullConvertTest.cs,1.10,1.11

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

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

Modified Files:
	NullConvertTest.cs 
Log Message:
Added test for NullableTimeSpan.
Added test for NullableGuid to formatted string.

Index: NullConvertTest.cs
===================================================================
RCS file: /cvsroot/nullabletypes/NullableTypes/src/Tests/NullConvertTest.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** NullConvertTest.cs	11 Oct 2005 09:58:40 -0000	1.10
--- NullConvertTest.cs	25 Oct 2005 11:53:22 -0000	1.11
***************
*** 10,13 ****
--- 10,16 ----
  //                                 from user regional settings
  // 06-Oct-2003  Luca    Upgrade    Code upgrade: Replaced tabs with spaces
+ // 28-Jan-2005  DamienG Upgrade    Added tests for NullableGuid.
+ // 25-Oct-2005  DamienG Upgrade    Added test for NullableTimeSpan.
+ //                                 Added test for NullableGuid to formatted string.
  //
  
***************
*** 441,444 ****
--- 444,448 ----
          }
  
+ 
          [nu.Test, nu.ExpectedException(typeof(sys.OverflowException))]
          public void ToNullableDateTimeFromStringOverflowException() {            
***************
*** 446,449 ****
--- 450,454 ----
          }
  
+ 
          [nu.Test]
          public void ToNullableGuid() {
***************
*** 451,456 ****
              nua.AssertEquals("TestA#210", NullableGuid.Null, NullConvert.ToNullableGuid(conventionalNullGuid, conventionalNullGuid));
  
!             sys.Guid conventionalGuid = sys.Guid.NewGuid();
!             nua.AssertEquals("TestA#211", new NullableGuid(conventionalGuid).Value, NullConvert.ToNullableGuid(conventionalGuid, conventionalNullGuid));
          }
          
--- 456,471 ----
              nua.AssertEquals("TestA#210", NullableGuid.Null, NullConvert.ToNullableGuid(conventionalNullGuid, conventionalNullGuid));
  
!             sys.Guid normalGuid = sys.Guid.NewGuid();
!             nua.AssertEquals("TestA#211", new NullableGuid(normalGuid), NullConvert.ToNullableGuid(normalGuid, conventionalNullGuid));
!         }
! 
! 
!         [nu.Test]
!         public void ToNullableTimeSpan() {
!             sys.TimeSpan conventionalNullTimeSpan = new sys.TimeSpan(0,1,0,9,0);
!             nua.AssertEquals("TestA#220", NullableTimeSpan.Null, NullConvert.ToNullableTimeSpan(conventionalNullTimeSpan, conventionalNullTimeSpan));
! 
!             sys.TimeSpan normalTimeSpan = new sys.TimeSpan(9,1,5,3,6);
!             nua.AssertEquals("TestA#221", new NullableTimeSpan(normalTimeSpan), NullConvert.ToNullableTimeSpan(normalTimeSpan, conventionalNullTimeSpan));
          }
          
***************
*** 602,605 ****
--- 617,635 ----
          }
  
+         [nu.Test]
+         public void FromNullableTimeSpan() {
+             sys.TimeSpan zero = new sys.TimeSpan(0);
+ 
+             nua.AssertEquals("TestB#099", sys.TimeSpan.MinValue, NullConvert.From(NullableTimeSpan.Null, sys.TimeSpan.MinValue));
+             nua.AssertEquals("TestB#100", zero, NullConvert.From(NullableTimeSpan.Null, zero));
+             nua.AssertEquals("TestB#101", sys.TimeSpan.MaxValue, NullConvert.From(NullableTimeSpan.Null, sys.TimeSpan.MaxValue));
+ 
+             sys.TimeSpan one = new sys.TimeSpan(1111, 11, 11, 11, 11);
+             nua.AssertEquals("TestB#102", sys.TimeSpan.MinValue, NullConvert.From(NullableTimeSpan.MinValue, one));
+             nua.AssertEquals("TestB#103", zero, NullConvert.From(zero, one));
+             nua.AssertEquals("TestB#104", sys.TimeSpan.MaxValue, NullConvert.From(NullableTimeSpan.MaxValue, one));
+ 
+         }
+ 
          #endregion // NullableTypes to non nullable built-in types
  
***************
*** 905,908 ****
--- 935,969 ----
              NullConvert.From(_zero, "null", " ");
          }
+ 
+ 
+         [nu.Test]
+         public void FromNullableGuidToString() {
+             nua.AssertEquals("TestC#181", null, NullConvert.From(NullableGuid.Null, null, null));
+             nua.AssertEquals("TestC#182", string.Empty, NullConvert.From(NullableGuid.Null, string.Empty, null));
+             nua.AssertEquals("TestC#183", "unknown", NullConvert.From(NullableGuid.Null, "unknown", null));
+ 
+             sys.Guid testGuid = sys.Guid.NewGuid();
+             NullableGuid testNullableGuid = new NullableGuid(testGuid);
+ 
+             sysGlb.CultureInfo currCult = sys.Threading.Thread.CurrentThread.CurrentCulture;
+             try {
+                 sysThr.Thread.CurrentThread.CurrentCulture = sysGlb.CultureInfo.InvariantCulture;
+ 
+                 nua.AssertEquals("TestC#184", testGuid.ToString("N"), NullConvert.From(testNullableGuid, string.Empty, "N"));
+                 nua.AssertEquals("TestC#185", testGuid.ToString("D"), NullConvert.From(testNullableGuid, string.Empty, "D"));
+                 nua.AssertEquals("TestC#186", testGuid.ToString("B"), NullConvert.From(testNullableGuid, string.Empty, "B"));
+                 nua.AssertEquals("TestC#187", testGuid.ToString("P"), NullConvert.From(testNullableGuid, string.Empty, "P"));
+             }
+             finally {
+                 sysThr.Thread.CurrentThread.CurrentCulture = currCult;
+             }
+         }
+ 
+ 
+         [nu.Test, nu.ExpectedException(typeof(System.FormatException))]
+         public void FromNullableGuidToStringFormatException() {
+             NullConvert.From(new NullableGuid(sys.Guid.NewGuid()), "null", " ");
+         }
+ 
          #endregion // NullableTypes to string representation - C#
      }