Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -133,12 +133,10 @@ public class CalendarTest {
private TaiwanCalendar tacal;
private KoreanCalendar kcal;
private ThaiBuddhistCalendar tbcal;
#if NET_2_0
private ChineseLunisolarCalendar clcal;
private TaiwanLunisolarCalendar tlcal;
private JapaneseLunisolarCalendar jlcal;
private KoreanLunisolarCalendar klcal;
#endif
[SetUp]
protected void SetUp() {
@@ -153,12 +151,10 @@ public class CalendarTest {
acal = new Calendar[] {
gcal, jucal, hical, hecal, jacal,
tacal, kcal, tbcal};
#if NET_2_0
clcal = new ChineseLunisolarCalendar ();
tlcal = new TaiwanLunisolarCalendar ();
jlcal = new JapaneseLunisolarCalendar ();
klcal = new KoreanLunisolarCalendar ();
#endif
}
private void RowCheck(params Date[] adate) {
@@ -468,11 +464,9 @@ public class CalendarTest {
Assert.AreEqual(1, KoreanCalendar.KoreanEra, "B05 KoreanEra");
Assert.AreEqual(1, ThaiBuddhistCalendar.ThaiBuddhistEra, "B06 ThaiBuddhistEra");
#if NET_2_0
Assert.AreEqual(1, ChineseLunisolarCalendar.ChineseEra, "CNLunisor");
Assert.AreEqual(1, JapaneseLunisolarCalendar.JapaneseEra, "JPLunisor");
Assert.AreEqual(1, KoreanLunisolarCalendar.GregorianEra, "KRLunisor");
#endif
}
[Test]
@@ -508,8 +502,6 @@ public class CalendarTest {
}
}
#if NET_2_0
[Category ("NotWorking")]
[Test]
public void TestErasProperty2() {
Assert.AreEqual(1, clcal.Eras.Length, "cn");
@@ -520,7 +512,6 @@ public class CalendarTest {
Assert.AreEqual(4, jlcal.Eras [0], "jp.1");
Assert.AreEqual(3, jlcal.Eras [1], "jp.2");
}
#endif
[Test]
public void TestTwoDigitYearMax() {
@@ -548,7 +539,8 @@ public class CalendarTest {
catch (ArgumentOutOfRangeException) {
exception = true;
}
Assert.IsTrue(exception,
Assert.IsFalse(exception,
String.Format("E09 {0}.TwoDigitYearMax 99 " +
" out of range exception", cal));
@@ -606,9 +598,7 @@ public class CalendarTest {
Assert.AreEqual (2, next.Month, "next");
}
#if NET_2_0
[Test]
[Category ("NotWorking")]
public void GetLeapMonth ()
{
GregorianCalendar gc = new GregorianCalendar ();
@@ -699,7 +689,6 @@ public class CalendarTest {
Assert.AreEqual (52, gc.GetWeekOfYear (new DateTime (2000, 1, 1), CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Sunday), "#5");
Assert.AreEqual (52, gc.GetWeekOfYear (new DateTime (2000, 1, 1), CalendarWeekRule.FirstFullWeek, DayOfWeek.Sunday), "#6");
}
#endif
[Test]
public void TestToFourDigitYear() {