[tests][mmp] Convert old mmp calendar regression tests to unit tests (#…

…4983)
xamarin · Oct 15, 2018 · e8b87b7 · e8b87b7 · xamarin-release-manager · Oct 15, 2018
1 parent 250fd97
commit e8b87b7
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 308 deletions.
diff --git a/tests/linker/mac/link all/LinkAllTest.cs b/tests/linker/mac/link all/LinkAllTest.cs
@@ -9,9 +9,21 @@ namespace LinkAllTests
 	[Preserve (AllMembers = true)]
 	public class LinkAllTest
 	{
+
+		static void Check (string calendarName, bool present)
+		{
+			var type = Type.GetType ("System.Globalization." + calendarName);
+			bool success = present == (type != null);
+			Assert.AreEqual (present, type != null, calendarName);
+		}
+
 		[Test]
-		public void Existence ()
+		public void Calendars ()
 		{
+			Check ("GregorianCalendar", true);
+			Check ("UmAlQuraCalendar", false);
+			Check ("HijriCalendar", false);
+			Check ("ThaiBuddhistCalendar", false);
 		}
 	}
 }
diff --git a/tests/linker/mac/link sdk/LinkSdkTest.cs b/tests/linker/mac/link sdk/LinkSdkTest.cs
@@ -9,9 +9,21 @@ namespace LinkSdkTests
 	[Preserve (AllMembers = true)]
 	public class LinkSdkTest
 	{
+		static void Check (string calendarName, bool present)
+		{
+			var type = Type.GetType ("System.Globalization." + calendarName);
+			bool success = present == (type != null);
+			Assert.AreEqual (present, type != null, calendarName);
+		}
+
 		[Test]
-		public void Existence ()
+		public void Calendars ()
 		{
+			Check ("GregorianCalendar", true);
+			// because project options enabled them
+			Check ("UmAlQuraCalendar", true);
+			Check ("HijriCalendar", true);
+			Check ("ThaiBuddhistCalendar", true);
 		}
 	}
 }
diff --git a/tests/linker/mac/link sdk/link sdk-mac.csproj b/tests/linker/mac/link sdk/link sdk-mac.csproj
@@ -31,6 +31,7 @@
     <LinkMode>SdkOnly</LinkMode>
     <XamMacArch></XamMacArch>
     <AOTMode>None</AOTMode>
+    <I18n>mideast,other</I18n>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType></DebugType>
@@ -49,6 +50,7 @@
     <HttpClientHandler></HttpClientHandler>
     <XamMacArch></XamMacArch>
     <AOTMode>None</AOTMode>
+    <I18n>mideast,other</I18n>
     <CodeSigningKey>Mac Developer</CodeSigningKey>
     <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
   </PropertyGroup>

diff --git a/tests/mmptest/regression/Makefile b/tests/mmptest/regression/Makefile
@@ -24,8 +24,6 @@ TESTS_4_0 = \
 	link-frameworks-1 \
 	link-aes-1 \
 	link-blocks-1 \
-	link-preserve-calendar-1 \
-	link-preserve-calendar-2 \
 	link-typedescriptor-1 \
 	link-typedescriptor-2 \
 	embedded-mono \

diff --git a/tests/mmptest/regression/link-preserve-calendar-1/Info.plist b/tests/mmptest/regression/link-preserve-calendar-1/Info.plist
diff --git a/tests/mmptest/regression/link-preserve-calendar-1/LinkPreserveCalendar1.cs b/tests/mmptest/regression/link-preserve-calendar-1/LinkPreserveCalendar1.cs
diff --git a/tests/mmptest/regression/link-preserve-calendar-1/link-preserve-calendar-1.csproj b/tests/mmptest/regression/link-preserve-calendar-1/link-preserve-calendar-1.csproj
diff --git a/tests/mmptest/regression/link-preserve-calendar-2/Info.plist b/tests/mmptest/regression/link-preserve-calendar-2/Info.plist
diff --git a/tests/mmptest/regression/link-preserve-calendar-2/LinkPreserveCalendar2.cs b/tests/mmptest/regression/link-preserve-calendar-2/LinkPreserveCalendar2.cs
diff --git a/tests/mmptest/regression/link-preserve-calendar-2/link-preserve-calendar-2.csproj b/tests/mmptest/regression/link-preserve-calendar-2/link-preserve-calendar-2.csproj