From 891ad972b35ef24276244d6cce92de8d47fbd9e7 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Fri, 12 Oct 2018 15:48:56 -0400 Subject: [PATCH 1/2] [tests][mmp] Convert old mmp calendar regression tests to unit tests --- tests/linker/mac/link all/LinkAllTest.cs | 14 ++- tests/linker/mac/link sdk/LinkSdkTest.cs | 14 ++- tests/linker/mac/link sdk/link sdk-mac.csproj | 1 + tests/mmptest/regression/Makefile | 2 - .../link-preserve-calendar-1/Info.plist | 22 ----- .../LinkPreserveCalendar1.cs | 36 ------- .../link-preserve-calendar-1.csproj | 90 ----------------- .../link-preserve-calendar-2/Info.plist | 22 ----- .../LinkPreserveCalendar2.cs | 36 ------- .../link-preserve-calendar-2.csproj | 98 ------------------- 10 files changed, 27 insertions(+), 308 deletions(-) delete mode 100644 tests/mmptest/regression/link-preserve-calendar-1/Info.plist delete mode 100644 tests/mmptest/regression/link-preserve-calendar-1/LinkPreserveCalendar1.cs delete mode 100644 tests/mmptest/regression/link-preserve-calendar-1/link-preserve-calendar-1.csproj delete mode 100644 tests/mmptest/regression/link-preserve-calendar-2/Info.plist delete mode 100644 tests/mmptest/regression/link-preserve-calendar-2/LinkPreserveCalendar2.cs delete mode 100644 tests/mmptest/regression/link-preserve-calendar-2/link-preserve-calendar-2.csproj diff --git a/tests/linker/mac/link all/LinkAllTest.cs b/tests/linker/mac/link all/LinkAllTest.cs index afe2f2f0cf66..a03274603ce5 100644 --- 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 index ad3c9f88e4cd..5271220b008c 100644 --- 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 index 988cae08dbe2..87cb7acc9f32 100644 --- a/tests/linker/mac/link sdk/link sdk-mac.csproj +++ b/tests/linker/mac/link sdk/link sdk-mac.csproj @@ -31,6 +31,7 @@ SdkOnly None + mideast,other diff --git a/tests/mmptest/regression/Makefile b/tests/mmptest/regression/Makefile index ab63b6b7661d..3aef59634eca 100644 --- 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 deleted file mode 100644 index bf8e024a7d11..000000000000 --- a/tests/mmptest/regression/link-preserve-calendar-1/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDisplayName - link-preserve-calendar-1 - CFBundleIdentifier - com.your-company.linkpreservecalendar1 - CFBundleName - link-preserve-calendar-1 - CFBundleVersion - 1 - LSMinimumSystemVersion - 10.7 - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - LSUIElement - 1 - - diff --git a/tests/mmptest/regression/link-preserve-calendar-1/LinkPreserveCalendar1.cs b/tests/mmptest/regression/link-preserve-calendar-1/LinkPreserveCalendar1.cs deleted file mode 100644 index fe494ace02ac..000000000000 --- a/tests/mmptest/regression/link-preserve-calendar-1/LinkPreserveCalendar1.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using MonoMac.AppKit; - -// Test -// * application .exe does not *directly* use any Calendar -// * only the default GregorianCalendar is linked in -// -// Requirement -// * Link SDK or Link All must be enabled - -namespace Xamarin.Mac.Linker.Test { - - class PreserveCalendar { - - static void Check (string calendarName, bool present) - { - var type = Type.GetType ("System.Globalization." + calendarName); - bool success = present == (type != null); - Test.Log.WriteLine ("[{0}]\t{1} {2}", success ? "PASS" : "FAIL", calendarName, present ? "present" : "absent"); - } - - static void Main (string[] args) - { - NSApplication.Init (); - - Test.EnsureLinker (true); - - Check ("GregorianCalendar", true); - Check ("UmAlQuraCalendar", false); - Check ("HijriCalendar", false); - Check ("ThaiBuddhistCalendar", false); - - Test.Terminate (); - } - } -} \ No newline at end of file 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 deleted file mode 100644 index b04d624ee705..000000000000 --- a/tests/mmptest/regression/link-preserve-calendar-1/link-preserve-calendar-1.csproj +++ /dev/null @@ -1,90 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {910B8B76-46C3-4550-AB5C-BD813F053A98} - {42C0BBD9-55CE-4FC1-8D90-A7348ABAFB23};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - linkpreservecalendar1 - Resources - link-preserve-calendar-1 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - false - false - true - false - Mac Developer - false - false - Developer ID Installer - - - Full - false - - - full - true - bin\Release - prompt - 4 - false - Full - false - true - false - Developer ID Application - true - true - false - - - full - true - bin\AppStore - prompt - 4 - false - Full - false - true - 3rd Party Mac Developer Installer - true - 3rd Party Mac Developer Application - true - true - false - - - - - - - - - - - - - - Test.cs - - - - - - MainMenu.xib - - - \ No newline at end of file diff --git a/tests/mmptest/regression/link-preserve-calendar-2/Info.plist b/tests/mmptest/regression/link-preserve-calendar-2/Info.plist deleted file mode 100644 index 3db685c6895b..000000000000 --- a/tests/mmptest/regression/link-preserve-calendar-2/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDisplayName - link-preserve-calendar-2 - CFBundleIdentifier - com.your-company.linkpreservecalendar2 - CFBundleName - link-preserve-calendar-2 - CFBundleVersion - 1 - LSMinimumSystemVersion - 10.7 - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - LSUIElement - 1 - - diff --git a/tests/mmptest/regression/link-preserve-calendar-2/LinkPreserveCalendar2.cs b/tests/mmptest/regression/link-preserve-calendar-2/LinkPreserveCalendar2.cs deleted file mode 100644 index e4cb7c4d15bc..000000000000 --- a/tests/mmptest/regression/link-preserve-calendar-2/LinkPreserveCalendar2.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using MonoMac.AppKit; - -// Test -// * application .exe does not *directly* use any Calendar -// * -i18n option is used to keep MidEast and Other so their calendars are also preserved -// -// Requirement -// * Link SDK or Link All must be enabled - -namespace Xamarin.Mac.Linker.Test { - - class PreserveCalendar { - - static void Check (string calendarName, bool present) - { - var type = Type.GetType ("System.Globalization." + calendarName); - bool success = present == (type != null); - Test.Log.WriteLine ("[{0}]\t{1} {2}", success ? "PASS" : "FAIL", calendarName, present ? "present" : "absent"); - } - - static void Main (string[] args) - { - NSApplication.Init (); - - Test.EnsureLinker (true); - - Check ("GregorianCalendar", true); - Check ("UmAlQuraCalendar", true); - Check ("HijriCalendar", true); - Check ("ThaiBuddhistCalendar", true); - - Test.Terminate (); - } - } -} \ No newline at end of file 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 deleted file mode 100644 index d56f9596a718..000000000000 --- a/tests/mmptest/regression/link-preserve-calendar-2/link-preserve-calendar-2.csproj +++ /dev/null @@ -1,98 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {88BD48BB-BF1C-40B2-90C0-3C2C644E3037} - {42C0BBD9-55CE-4FC1-8D90-A7348ABAFB23};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - linkpreservecalendar2 - Resources - link-preserve-calendar-2 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - false - false - true - false - Mac Developer - false - false - Developer ID Installer - mideast,other - Full - false - - - full - true - bin\Release - prompt - 4 - false - Full - false - true - false - Developer ID Application - true - true - Developer ID Installer - mideast,other - false - - - full - true - bin\AppStore - prompt - 4 - false - Full - false - true - 3rd Party Mac Developer Installer - true - 3rd Party Mac Developer Application - true - true - - - false - - - - - - - - - - - - - - - - - - - Test.cs - - - - - - MainMenu.xib - - - \ No newline at end of file From e3f34655e6f4df3c2fd5a058926d240733faba8e Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Mon, 15 Oct 2018 08:49:29 -0400 Subject: [PATCH 2/2] [tests] All extra i18n options to XM Link SDK tests in release configuration --- tests/linker/mac/link sdk/link sdk-mac.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/linker/mac/link sdk/link sdk-mac.csproj b/tests/linker/mac/link sdk/link sdk-mac.csproj index 87cb7acc9f32..fe14153b13f1 100644 --- a/tests/linker/mac/link sdk/link sdk-mac.csproj +++ b/tests/linker/mac/link sdk/link sdk-mac.csproj @@ -50,6 +50,7 @@ None + mideast,other Mac Developer 3rd Party Mac Developer Installer