Imported Upstream version 3.6.0

Former-commit-id: da6be194a6b1221998fc28233f2503bd61dd9d14

mcs/class/System.Core/Test/System/ChangeLog

@@ -0,0 +1,29 @@
+2008-05-26  Stephane Delcroix  <sdelcroix@novell.com>
+
+	* Timezonetsnfo.cs: test for bnc #391011
+
+2008-01-24  Stephane Delcroix  <sdelcroix@novell.com>
+
+	* TimeZoneInfo.TransitionTimeTest.cs: tests adapted to check for whole
+	number of _milli_seconds.
+
+2008-01-23  Stephane Delcroix  <sdelcroix@novell.com>
+
+	* TimeZoneInfo.AdjustmentRuleTests.cs:
+	* TimeZoneInfo.TransitionTimeTests.cs: disable failing tests at runtime on
+	windows
+
+2008-01-22  Stephane Delcroix  <sdelcroix@novell.com>
+
+	* TimeZoneInfoTest.cs: disable failing tests at runtime on windows
+
+2008-01-21  Sebastien Pouliot  <sebastien@ximian.com>
+
+	* TimeZoneInfo.TransitionTimeTest.cs: Add test case for Equals to
+	validate Gendarme finding.
+
+2007-12-20  Stephane Delcroix  <sdelcroix@novell.com>
+
+	* TimeZoneInfoTest.cs:
+	* TimeZoneInfo.AdjustmentRule.cs:
+	* TimeZoneInfo.TransitionTime.cs: Finally adding the 60 tests.

mcs/class/System.Core/Test/System/TimeZoneInfo.AdjustmentRuleTest.cs

@@ -0,0 +1,118 @@
+using System;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+using NUnit.Framework;
+
+#if NET_2_0
+namespace MonoTests.System
+{
+	public class TimeZoneInfo_AdjustmentRuleTest
+	{	
+		[TestFixture]
+		public class CreateAdjustmentRuleException
+		{
+			[Test]
+			[ExpectedException (typeof (ArgumentException))]
+			public void DateTimeKindNotUnspecified ()
+			{
+				DateTime dateStart = new DateTime (2007,01,01, 0,0,0,DateTimeKind.Utc);
+				DateTime dateEnd = new DateTime (2008,01,01);
+				TimeZoneInfo.TransitionTime daylightTransitionStart = TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1,1,1,2,0,0), 03, 11);
+				TimeZoneInfo.TransitionTime daylightTransitionEnd = TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1,1,1,2,0,0), 10, 11);
+				TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule (dateStart, dateEnd, new TimeSpan (1,0,0), daylightTransitionStart, daylightTransitionEnd);
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentException))]
+			public void TransitionEndEqualStart ()
+			{
+				DateTime dateStart = new DateTime (2007,01,01);
+				DateTime dateEnd = new DateTime (2008,01,01);
+				TimeZoneInfo.TransitionTime daylightTransition = TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1,1,1,2,0,0), 03, 11);
+				TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule (dateStart, dateEnd, new TimeSpan (1,0,0), daylightTransition, daylightTransition);
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentException))]
+			public void DateIncludesTimeOfDay ()
+			{
+				DateTime dateStart = new DateTime (2007,01,01, 0,1,0);
+				DateTime dateEnd = new DateTime (2008,01,01);
+				TimeZoneInfo.TransitionTime daylightTransitionStart = TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1,1,1,2,0,0), 03, 11);
+				TimeZoneInfo.TransitionTime daylightTransitionEnd = TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1,1,1,2,0,0), 10, 11);
+				TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule (dateStart, dateEnd, new TimeSpan (1,0,0), daylightTransitionStart, daylightTransitionEnd);
+			}
+		
+			[Test]
+			public void DatesMaxMinValid ()
+			{
+				try {
+					TimeZoneInfo.TransitionTime daylightTransitionStart = TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1,1,1,2,0,0), 03, 11);
+					TimeZoneInfo.TransitionTime daylightTransitionEnd = TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1,1,1,2,0,0), 10, 11);
+					TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule (DateTime.MinValue.Date, DateTime.MaxValue.Date, new TimeSpan (1,0,0), daylightTransitionStart, daylightTransitionEnd);
+				} catch {
+					Assert.Fail ("DateTime.MinValue and MaxValue are not valid...");
+				}
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentOutOfRangeException))]
+			public void EndBeforeStart ()
+			{
+				if (Environment.OSVersion.Platform != PlatformID.Unix)
+					throw new ArgumentOutOfRangeException ();;
+				DateTime dateStart = new DateTime (2007,01,01);
+				DateTime dateEnd = new DateTime (2006,01,01);
+				TimeZoneInfo.TransitionTime daylightTransitionStart = TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1,1,1,2,0,0), 03, 11);
+				TimeZoneInfo.TransitionTime daylightTransitionEnd = TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1,1,1,2,0,0), 10, 11);
+				TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule (dateStart, dateEnd, new TimeSpan (1,0,0), daylightTransitionStart, daylightTransitionEnd);
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentOutOfRangeException))]
+			public void DeltaOutOfRange ()
+			{
+				DateTime dateStart = new DateTime (2007,01,01);
+				DateTime dateEnd = new DateTime (2008,01,01);
+				TimeZoneInfo.TransitionTime daylightTransitionStart = TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1,1,1,2,0,0), 03, 11);
+				TimeZoneInfo.TransitionTime daylightTransitionEnd = TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1,1,1,2,0,0), 10, 11);
+				TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule (dateStart, dateEnd, new TimeSpan (14,1,0), daylightTransitionStart, daylightTransitionEnd);
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentOutOfRangeException))]
+			public void DeltaNotInSeconds ()
+			{
+				if (Environment.OSVersion.Platform != PlatformID.Unix)
+					throw new ArgumentOutOfRangeException ();;
+				DateTime dateStart = new DateTime (2007,01,01);
+				DateTime dateEnd = new DateTime (2008,01,01);
+				TimeZoneInfo.TransitionTime daylightTransitionStart = TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1,1,1,2,0,0), 03, 11);
+				TimeZoneInfo.TransitionTime daylightTransitionEnd = TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1,1,1,2,0,0), 10, 11);
+				TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule (dateStart, dateEnd, new TimeSpan (55), daylightTransitionStart, daylightTransitionEnd);
+			}
+		}
+	
+		[TestFixture]
+		public class NonExceptional
+		{
+			[Test]
+			public void Serialization_Deserialization ()
+			{
+				TimeZoneInfo.TransitionTime start = TimeZoneInfo.TransitionTime.CreateFloatingDateRule (new DateTime (1,1,1,1,0,0), 3, 5, DayOfWeek.Sunday);
+				TimeZoneInfo.TransitionTime end = TimeZoneInfo.TransitionTime.CreateFloatingDateRule (new DateTime (1,1,1,2,0,0), 10, 5, DayOfWeek.Sunday);
+				TimeZoneInfo.AdjustmentRule rule = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule (DateTime.MinValue.Date, DateTime.MaxValue.Date, new TimeSpan (1,0,0), start, end);
+				MemoryStream stream = new MemoryStream ();
+				BinaryFormatter formatter = new BinaryFormatter ();
+				formatter.Serialize (stream, rule);
+				stream.Position = 0;
+				TimeZoneInfo.AdjustmentRule deserialized = (TimeZoneInfo.AdjustmentRule) formatter.Deserialize (stream);
+				stream.Close ();
+				stream.Dispose ();
+
+				Assert.IsTrue (rule.Equals (deserialized));
+			}
+		}
+	}	
+}
+#endif

mcs/class/System.Core/Test/System/TimeZoneInfo.TransitionTimeTest.cs

@@ -0,0 +1,142 @@
+
+using System;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+using NUnit.Framework;
+
+#if NET_2_0
+namespace MonoTests.System
+{
+	public class TimeZoneInfo_TransitionTimeTest
+	{	
+		[TestFixture]
+		public class CreateFixedDateRuleExceptions
+		{
+			[Test]
+			[ExpectedException (typeof (ArgumentException))]
+			public void DateHasNonDefaultComponent ()
+			{
+				TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1, 1, 10, 2, 0, 0), 3, 15);
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentException))]
+			public void KindNotUnspecified()
+			{
+				TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1, 1, 1, 2, 0, 0, DateTimeKind.Utc), 3, 15);
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentException))]
+			public void DateNotInMilliSeconds ()
+			{
+				TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (50), 3, 15);
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentOutOfRangeException))]
+			public void MonthOutOfRange ()
+			{
+				TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1, 1, 1, 2, 0, 0), 13, 15);
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentOutOfRangeException))]
+			public void DayOutOfRange ()
+			{
+				TimeZoneInfo.TransitionTime.CreateFixedDateRule (new DateTime (1, 1, 1, 2, 0, 0), 3, -2);
+			}
+		}
+		
+		[TestFixture]
+		public class CreateFloatingDateRuleExceptions
+		{
+			[Test]
+			[ExpectedException (typeof (ArgumentException))]
+			public void DateHasNonDefaultComponent ()
+			{
+				TimeZoneInfo.TransitionTime.CreateFloatingDateRule (new DateTime (1, 1, 10, 2, 0, 0), 3, 4, DayOfWeek.Sunday);
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentException))]
+			public void KindNotUnspecified()
+			{
+				TimeZoneInfo.TransitionTime.CreateFloatingDateRule (new DateTime (1, 1, 1, 2, 0, 0, DateTimeKind.Utc), 3, 4, DayOfWeek.Sunday);
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentException))]
+			public void DateNotInSeconds ()
+			{
+				TimeZoneInfo.TransitionTime.CreateFloatingDateRule (new DateTime (50), 3, 4, DayOfWeek.Sunday);
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentOutOfRangeException))]
+			public void MonthOutOfRange ()
+			{
+				TimeZoneInfo.TransitionTime.CreateFloatingDateRule (new DateTime (1, 1, 1, 2, 0, 0), 13, 4, DayOfWeek.Sunday);
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentOutOfRangeException))]
+			public void WeekOutOfRange ()
+			{
+				TimeZoneInfo.TransitionTime.CreateFloatingDateRule (new DateTime (1, 1, 1, 2, 0, 0), 3, -2, DayOfWeek.Sunday);
+			}
+		
+			[Test]
+			[ExpectedException (typeof (ArgumentOutOfRangeException))]
+			public void DayOfWeekOutOfRange ()
+			{
+				TimeZoneInfo.TransitionTime.CreateFloatingDateRule (new DateTime (1, 1, 1, 2, 0, 0), 3, 4, (DayOfWeek)12);
+			}
+		}
+
+		[TestFixture]
+		public class NonExceptional {
+
+			[Test]
+			public void EqualsObject ()
+			{
+				DateTime dt = new DateTime (1, 1, 1, 2, 0, 0, DateTimeKind.Unspecified);
+				TimeZoneInfo.TransitionTime tt1 = TimeZoneInfo.TransitionTime.CreateFixedDateRule (dt, 1, 21);
+				Assert.IsFalse (tt1.Equals (null), "null"); // found using Gendarme :)
+				Assert.IsTrue (tt1.Equals (tt1), "self");
+				TimeZoneInfo.TransitionTime tt2 = TimeZoneInfo.TransitionTime.CreateFixedDateRule (dt, 2, 12);
+				Assert.IsFalse (tt2.Equals (tt1), "1!=2");
+				Assert.IsFalse (tt1.Equals (tt2), "2!=1");
+			}
+			
+			[Test]
+			public void Serialize_Deserialize_FloatingDateRule ()
+			{
+				TimeZoneInfo.TransitionTime floatingDateRule = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 1, 0, 0), 3, 5, DayOfWeek.Sunday);
+				MemoryStream stream = new MemoryStream ();
+				BinaryFormatter formatter = new BinaryFormatter ();
+				formatter.Serialize (stream, floatingDateRule);
+				stream.Position = 0;
+				TimeZoneInfo.TransitionTime deserialized = (TimeZoneInfo.TransitionTime) formatter.Deserialize (stream);
+				stream.Close ();
+				stream.Dispose ();
+				Assert.AreEqual (floatingDateRule, deserialized);
+			}
+
+			[Test]
+			public void Serialize_Deserialize_FixedDateRule ()
+			{
+				TimeZoneInfo.TransitionTime fixedDateRule = TimeZoneInfo.TransitionTime.CreateFixedDateRule(new DateTime(1, 1, 1, 1, 0, 0), 3, 12);
+				MemoryStream stream = new MemoryStream ();
+				BinaryFormatter formatter = new BinaryFormatter ();
+				formatter.Serialize (stream, fixedDateRule);
+				stream.Position = 0;
+				TimeZoneInfo.TransitionTime deserialized = (TimeZoneInfo.TransitionTime) formatter.Deserialize (stream);
+				stream.Close ();
+				stream.Dispose ();
+				Assert.AreEqual (fixedDateRule, deserialized);
+			}
+		}
+	}
+}
+#endif