You've already forked linux-packaging-mono
Imported Upstream version 5.2.0.175
Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
parent
4bdbaf4a88
commit
966bba02bb
@ -412,6 +412,7 @@ namespace MonoTests.System {
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("MobileNotWorking")]
|
||||
[ExpectedException (typeof (ArgumentNullException))]
|
||||
public void GetObject_UrlNull ()
|
||||
{
|
||||
|
@ -311,88 +311,47 @@ namespace MonoTests.System {
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Check_InvalidOperationException() {
|
||||
public void Check_NoInvalidOperationException ()
|
||||
{
|
||||
Array arr = new object[] {new SomeComparable (), new SomeIncomparable (), new SomeComparable ()};
|
||||
|
||||
Array.Sort (arr);
|
||||
|
||||
Array.Sort (arr, (Array)null);
|
||||
|
||||
Array.Sort (arr, (IComparer)null);
|
||||
|
||||
Array.Sort (arr, 0, 3);
|
||||
|
||||
Array.Sort (arr, null, null);
|
||||
|
||||
Array.Sort (arr, null, 0, 3);
|
||||
|
||||
Array.Sort (arr, 0, 3, null);
|
||||
|
||||
Array.Sort (arr, null, 0, 3, null);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Check_NoInvalidOperationException_Generic ()
|
||||
{
|
||||
object[] arr = new object[] {new SomeComparable (), new SomeIncomparable (), new SomeComparable ()};
|
||||
|
||||
try {
|
||||
Array.Sort (arr);
|
||||
Assert.Fail ("#1");
|
||||
} catch (InvalidOperationException) {}
|
||||
|
||||
Array.Sort<object> (arr);
|
||||
|
||||
try {
|
||||
Array.Sort (arr, (Array)null);
|
||||
Assert.Fail ("#2");
|
||||
} catch (InvalidOperationException) {}
|
||||
Array.Sort<object, object> (arr, null);
|
||||
|
||||
try {
|
||||
Array.Sort (arr, (IComparer)null);
|
||||
Assert.Fail ("#3");
|
||||
} catch (InvalidOperationException) {}
|
||||
Array.Sort<object> (arr, (IComparer<object>)null);
|
||||
|
||||
try {
|
||||
Array.Sort (arr, 0, 3);
|
||||
Assert.Fail ("#4");
|
||||
} catch (InvalidOperationException) {}
|
||||
Array.Sort<object, object> (arr, null, null);
|
||||
|
||||
try {
|
||||
Array.Sort (arr, null, null);
|
||||
Assert.Fail ("#5");
|
||||
} catch (InvalidOperationException) {}
|
||||
Array.Sort<object> (arr, 0, 3);
|
||||
|
||||
try {
|
||||
Array.Sort (arr, null, 0, 3);
|
||||
Assert.Fail ("#6");
|
||||
} catch (InvalidOperationException) {}
|
||||
Array.Sort<object, object> (arr, null, 0, 3);
|
||||
|
||||
try {
|
||||
Array.Sort (arr, 0, 3, null);
|
||||
Assert.Fail ("#7");
|
||||
} catch (InvalidOperationException) {}
|
||||
Array.Sort<object> (arr, 0, 3, null);
|
||||
|
||||
try {
|
||||
Array.Sort (arr, null, 0, 3, null);
|
||||
Assert.Fail ("#8");
|
||||
} catch (InvalidOperationException) {}
|
||||
|
||||
try {
|
||||
Array.Sort<object> (arr);
|
||||
Assert.Fail ("#9");
|
||||
} catch (InvalidOperationException) {}
|
||||
|
||||
try {
|
||||
Array.Sort<object, object> (arr, null);
|
||||
Assert.Fail ("#10");
|
||||
} catch (InvalidOperationException) {}
|
||||
|
||||
try {
|
||||
Array.Sort<object> (arr, (IComparer<object>)null);
|
||||
Assert.Fail ("#11");
|
||||
} catch (InvalidOperationException) {}
|
||||
|
||||
try {
|
||||
Array.Sort<object, object> (arr, null, null);
|
||||
Assert.Fail ("#12");
|
||||
} catch (InvalidOperationException) {}
|
||||
|
||||
try {
|
||||
Array.Sort<object> (arr, 0, 3);
|
||||
Assert.Fail ("#13");
|
||||
} catch (InvalidOperationException) {}
|
||||
|
||||
try {
|
||||
Array.Sort<object, object> (arr, null, 0, 3);
|
||||
Assert.Fail ("#14");
|
||||
} catch (InvalidOperationException) {}
|
||||
|
||||
try {
|
||||
Array.Sort<object> (arr, 0, 3, null);
|
||||
Assert.Fail ("#15");
|
||||
} catch (InvalidOperationException) {}
|
||||
|
||||
try {
|
||||
Array.Sort<object, object> (arr, null, 0, 3, null);
|
||||
Assert.Fail ("#16");
|
||||
} catch (InvalidOperationException) {}
|
||||
Array.Sort<object, object> (arr, null, 0, 3, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -779,6 +779,14 @@ public class ArrayTest
|
||||
Array.CreateInstance (typeof (Int32), (long[])null);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CreateInstanceVoid ()
|
||||
{
|
||||
Assert.Throws<NotSupportedException> (delegate () {
|
||||
Array.CreateInstance (typeof (void), 1);
|
||||
});
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestGetEnumerator() {
|
||||
String[] s1 = {"this", "is", "a", "test"};
|
||||
@ -995,7 +1003,6 @@ public class ArrayTest
|
||||
int[] myBoundArray = new int[1] { Int32.MinValue };
|
||||
Array myExtremeArray=Array.CreateInstance ( typeof(String), myLengthArray, myBoundArray );
|
||||
Assert.AreEqual (Int32.MaxValue, ((IList)myExtremeArray).IndexOf (42), "AD04");
|
||||
|
||||
}
|
||||
|
||||
[Test]
|
||||
@ -2575,6 +2582,26 @@ public class ArrayTest
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestSortComparableMixed()
|
||||
{
|
||||
var m = new TestSortComparableMixed_Comparer ();
|
||||
var arr = new object [] { 1, 2, m, 4, 5, 6, 7, 8, 9, 10 };
|
||||
|
||||
Array.Sort (arr);
|
||||
|
||||
var expected = new object [] { m, 1, 2, 4, 5, 6, 7, 8, 9, 10 };
|
||||
Assert.AreEqual (expected, arr);
|
||||
}
|
||||
|
||||
class TestSortComparableMixed_Comparer : IComparable
|
||||
{
|
||||
public int CompareTo (object other)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestInitializeEmpty()
|
||||
{
|
||||
|
@ -467,10 +467,14 @@ public class Int32Test
|
||||
int hundred = 100;
|
||||
int neghund = -100;
|
||||
|
||||
Assert.IsTrue ( hundred.ToString ("#;#") == "100", "#TS1");
|
||||
Assert.IsTrue ( hundred.ToString ("-#;#") == "-100", "#TS2");
|
||||
Assert.IsTrue ( neghund.ToString ("#;#") == "100", "#TS3");
|
||||
Assert.IsTrue ( neghund.ToString ("#;-#") == "-100", "#TS3");
|
||||
Assert.AreEqual ("100", hundred.ToString ("#;#"), "#TS1");
|
||||
Assert.AreEqual ("-100", hundred.ToString ("-#;#"), "#TS2");
|
||||
Assert.AreEqual ("100", neghund.ToString ("#;#"), "#TS3");
|
||||
Assert.AreEqual ("-100", neghund.ToString ("#;-#"), "#TS4");
|
||||
Assert.AreEqual ("3", 0.ToString ("3;;"), "#TS5");
|
||||
Assert.AreEqual ("3", 0.ToString ("3;2;"), "#TS6");
|
||||
Assert.AreEqual ("3", 0.ToString ("3;"), "#TS7");
|
||||
Assert.AreEqual ("3", 0.ToString ("3;;;;;;;"), "#TS8");
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
@ -300,7 +300,7 @@ namespace MonoTests.System
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DSTTransisions ()
|
||||
public void DSTTransitions ()
|
||||
{
|
||||
DateTime beforeDST = new DateTime (2007, 03, 25, 0, 59, 59, DateTimeKind.Unspecified);
|
||||
DateTime startDST = new DateTime (2007, 03, 25, 2, 0, 0, DateTimeKind.Unspecified);
|
||||
@ -308,12 +308,12 @@ namespace MonoTests.System
|
||||
DateTime afterDST = new DateTime (2007, 10, 28, 2, 0, 0, DateTimeKind.Unspecified);
|
||||
Assert.IsFalse (london.IsDaylightSavingTime (beforeDST), "Just before DST");
|
||||
Assert.IsTrue (london.IsDaylightSavingTime (startDST), "the first seconds of DST");
|
||||
Assert.IsFalse (london.IsDaylightSavingTime (endDST), "The last seconds of DST");
|
||||
Assert.IsTrue (london.IsDaylightSavingTime (endDST), "The last seconds of DST");
|
||||
Assert.IsFalse (london.IsDaylightSavingTime (afterDST), "Just after DST");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DSTTransisionsUTC ()
|
||||
public void DSTTransitionsUTC ()
|
||||
{
|
||||
DateTime beforeDST = new DateTime (2007, 03, 25, 0, 59, 59, DateTimeKind.Utc);
|
||||
DateTime startDST = new DateTime (2007, 03, 25, 1, 0, 0, DateTimeKind.Utc);
|
||||
@ -867,9 +867,12 @@ namespace MonoTests.System
|
||||
[Test]
|
||||
public void WindowsRegistryTimezoneWithParentheses ()
|
||||
{
|
||||
var method = (MethodInfo) typeof (TimeZoneInfo).GetMember ("TrimSpecial", MemberTypes.Method, BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)[0];
|
||||
var memberInfos = typeof (TimeZoneInfo).GetMember ("TrimSpecial", MemberTypes.Method, BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
|
||||
|
||||
var name = method.Invoke (null, new object [] { " <---> Central Standard Time (Mexico) ||<<>>" });
|
||||
if (memberInfos.Length == 0)
|
||||
Assert.Ignore ("TrimSpecial method not found");
|
||||
|
||||
var name = ((MethodInfo)memberInfos[0]).Invoke (null, new object [] { " <---> Central Standard Time (Mexico) ||<<>>" });
|
||||
Assert.AreEqual (name, "Central Standard Time (Mexico)", "#1");
|
||||
}
|
||||
#endif
|
||||
@ -1179,8 +1182,8 @@ namespace MonoTests.System
|
||||
|
||||
d = dst1End.Add (-dstOffset);
|
||||
Assert.AreEqual(dstUtcOffset, cairo.GetUtcOffset (d.Add (new TimeSpan(0,0,0,-1))));
|
||||
Assert.AreEqual(baseUtcOffset, cairo.GetUtcOffset (d));
|
||||
Assert.AreEqual(baseUtcOffset, cairo.GetUtcOffset (d.Add (new TimeSpan(0,0,0, 1))));
|
||||
Assert.AreEqual(dstUtcOffset, cairo.GetUtcOffset (d));
|
||||
Assert.AreEqual(baseUtcOffset, cairo.GetUtcOffset (d.Add (new TimeSpan(0,1,0, 1))));
|
||||
|
||||
d = dst2Start.Add (dstOffset);
|
||||
Assert.AreEqual(baseUtcOffset, cairo.GetUtcOffset (d.Add (new TimeSpan(0,0,0,-1))));
|
||||
@ -1189,8 +1192,8 @@ namespace MonoTests.System
|
||||
|
||||
d = dst2End.Add (-dstOffset);
|
||||
Assert.AreEqual(dstUtcOffset, cairo.GetUtcOffset (d.Add (new TimeSpan(0,0,0,-1))));
|
||||
Assert.AreEqual(baseUtcOffset, cairo.GetUtcOffset (d));
|
||||
Assert.AreEqual(baseUtcOffset, cairo.GetUtcOffset (d.Add (new TimeSpan(0,0,0, 1))));
|
||||
Assert.AreEqual(dstUtcOffset, cairo.GetUtcOffset (d));
|
||||
Assert.AreEqual(baseUtcOffset, cairo.GetUtcOffset (d.Add (new TimeSpan(0,1,0, 1))));
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
@ -14,6 +14,7 @@ using System;
|
||||
using System.IO;
|
||||
using System.Threading;
|
||||
using System.Globalization;
|
||||
using System.Reflection;
|
||||
using System.Runtime.Serialization.Formatters.Binary;
|
||||
|
||||
namespace MonoTests.System {
|
||||
@ -270,6 +271,47 @@ public class TimeZoneTest {
|
||||
Assert.IsTrue (tz.ToLocalTime (dst_start_utc.Add (new TimeSpan (1, 0, 0))) < tz.ToLocalTime (dst_start_utc.Add (new TimeSpan (1, 1, 0))), "0:4:00 < 0:4:01");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void GetUTCNowAtDSTBoundaries ()
|
||||
{
|
||||
TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 2, 0, 0), 3, 5, DayOfWeek.Sunday);
|
||||
|
||||
TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 10, 5, DayOfWeek.Sunday);
|
||||
|
||||
TimeSpan delta = TimeSpan.FromMinutes(60.0);
|
||||
TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1970, 1, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
|
||||
TimeZoneInfo.TransitionTime startTrans = adjustment.DaylightTransitionStart;
|
||||
TimeZoneInfo.TransitionTime endTrans = adjustment.DaylightTransitionEnd;
|
||||
TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
|
||||
|
||||
TimeZoneInfo tzInfo = TimeZoneInfo.CreateCustomTimeZone("MY Standard Time", TimeSpan.Zero, "MST", "MST", "MDT", adjustments);
|
||||
|
||||
// There is no .NET API to set timezone. Use reflection to assign time zone to the TimeZoneInfo.local field.
|
||||
FieldInfo localTimeZone = typeof(TimeZoneInfo).GetField("local", BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance);
|
||||
localTimeZone.SetValue(null, tzInfo);
|
||||
|
||||
DateTime st = new DateTime(2016, 3, 27, 1, 0, 0, DateTimeKind.Local);
|
||||
Assert.IsTrue (!tzInfo.IsDaylightSavingTime(st));
|
||||
Assert.IsTrue (!tzInfo.IsAmbiguousTime(st));
|
||||
Assert.IsTrue ((TimeZoneInfo.ConvertTimeToUtc(st).Hour == 1));
|
||||
st = new DateTime(2016, 3, 27, 3, 0, 0, DateTimeKind.Local);
|
||||
Assert.IsTrue (tzInfo.IsDaylightSavingTime(st));
|
||||
Assert.IsTrue (!tzInfo.IsAmbiguousTime(st));
|
||||
Assert.IsTrue ((TimeZoneInfo.ConvertTimeToUtc(st).Hour == 2));
|
||||
st = new DateTime(2016, 10, 30, 2, 0, 0, DateTimeKind.Local);
|
||||
Assert.IsTrue (tzInfo.IsDaylightSavingTime(st));
|
||||
Assert.IsTrue (!tzInfo.IsAmbiguousTime(st));
|
||||
Assert.IsTrue ((TimeZoneInfo.ConvertTimeToUtc(st).Hour == 1));
|
||||
st = new DateTime(2016, 10, 30, 3, 0, 0, DateTimeKind.Local);
|
||||
Assert.IsTrue (!tzInfo.IsDaylightSavingTime(st));
|
||||
Assert.IsTrue (tzInfo.IsAmbiguousTime(st));
|
||||
Assert.IsTrue ((TimeZoneInfo.ConvertTimeToUtc(st).Hour == 3));
|
||||
st = new DateTime(2016, 10, 30, 4, 0, 0, DateTimeKind.Local);
|
||||
Assert.IsTrue (!tzInfo.IsDaylightSavingTime(st));
|
||||
Assert.IsTrue (!tzInfo.IsAmbiguousTime(st));
|
||||
Assert.IsTrue ((TimeZoneInfo.ConvertTimeToUtc(st).Hour == 4));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void GetUtcOffsetAtDSTBoundary ()
|
||||
{
|
||||
@ -302,11 +344,12 @@ public class TimeZoneTest {
|
||||
Assert.Ignore (tz.StandardName + " did not observe daylight saving time during " + year + ".");
|
||||
|
||||
var standardOffset = tz.GetUtcOffset(daylightChanges.Start.AddMinutes(-1));
|
||||
var dstOffset = tz.GetUtcOffset(daylightChanges.Start.AddMinutes(61));
|
||||
|
||||
Assert.AreEqual(standardOffset, tz.GetUtcOffset (dst_end));
|
||||
Assert.AreEqual(standardOffset, tz.GetUtcOffset (dst_end.Add (daylightChanges.Delta.Negate ().Add (TimeSpan.FromSeconds(1)))));
|
||||
Assert.AreEqual(standardOffset, tz.GetUtcOffset (dst_end.Add(daylightChanges.Delta.Negate ())));
|
||||
Assert.AreNotEqual(standardOffset, tz.GetUtcOffset (dst_end.Add(daylightChanges.Delta.Negate ().Add (TimeSpan.FromSeconds(-1)))));
|
||||
Assert.AreEqual(dstOffset, tz.GetUtcOffset (dst_end.Add (daylightChanges.Delta.Negate ().Add (TimeSpan.FromSeconds(1)))));
|
||||
Assert.AreEqual(dstOffset, tz.GetUtcOffset (dst_end.Add(daylightChanges.Delta.Negate ())));
|
||||
Assert.AreEqual(dstOffset, tz.GetUtcOffset (dst_end.Add(daylightChanges.Delta.Negate ().Add (TimeSpan.FromSeconds(-1)))));
|
||||
}
|
||||
|
||||
|
||||
|
@ -1 +1 @@
|
||||
100f1c362742134360fd3562f632b1192f0d50c3
|
||||
9cc8ca79a413f707d27ad210899583c3fdb03456
|
Reference in New Issue
Block a user