[XHarness] Clean the bcl-tests directory. (#6165)
The change is a pre step to fix https://github.com/xamarin/xamarin-macios/issues/6162 We are removing the not longer child directory bcl-test/BCLTests since there is not longer any reason for it to exist. The changes make sure that the tests work as expected in the new directory. Next step, move all the test apps to their own directory.
Manuel de la Pena
GitHub
|
|
@ -1,66 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
#if XAMCORE_2_0
|
||||
using Foundation;
|
||||
using UIKit;
|
||||
#else
|
||||
using MonoTouch.Foundation;
|
||||
using MonoTouch.UIKit;
|
||||
#endif
|
||||
using MonoTouch.NUnit.UI;
|
||||
using NUnit.Framework.Internal.Filters;
|
||||
|
||||
#if !__WATCHOS__
|
||||
|
||||
public static partial class TestLoader
|
||||
{
|
||||
static partial void AddTestAssembliesImpl (BaseTouchRunner runner);
|
||||
|
||||
public static void AddTestAssemblies (BaseTouchRunner runner)
|
||||
{
|
||||
AddTestAssembliesImpl (runner);
|
||||
}
|
||||
}
|
||||
|
||||
namespace BCL.Tests
|
||||
{
|
||||
// The UIApplicationDelegate for the application. This class is responsible for launching the
|
||||
// User Interface of the application, as well as listening (and optionally responding) to
|
||||
// application events from iOS.
|
||||
[Register ("AppDelegate")]
|
||||
public partial class AppDelegate : UIApplicationDelegate
|
||||
{
|
||||
// class-level declarations
|
||||
UIWindow window;
|
||||
TouchRunner runner;
|
||||
|
||||
//
|
||||
// This method is invoked when the application has loaded and is ready to run. In this
|
||||
// method you should instantiate the window, load the UI into it and then make the window
|
||||
// visible.
|
||||
//
|
||||
// You have 17 seconds to return from this method, or iOS will terminate your application.
|
||||
//
|
||||
public override bool FinishedLaunching (UIApplication app, NSDictionary options)
|
||||
{
|
||||
// create a new window instance based on the screen size
|
||||
window = new UIWindow (UIScreen.MainScreen.Bounds);
|
||||
runner = new TouchRunner (window);
|
||||
runner.Filter = new NotFilter (new CategoryExpression ("MobileNotWorking,NotOnMac,NotWorking,ValueAdd,CAS,InetAccess,NotWorkingLinqInterpreter").Filter);
|
||||
|
||||
// register every tests included in the main application/assembly
|
||||
runner.Add (System.Reflection.Assembly.GetExecutingAssembly ());
|
||||
TestLoader.AddTestAssemblies (runner);
|
||||
|
||||
window.RootViewController = new UINavigationController (runner.GetViewController ());
|
||||
|
||||
// make the window visible
|
||||
window.MakeKeyAndVisible ();
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif // !__WATCHOS__
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleName</key>
|
||||
<string>BCLTests</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.xamarin.BCLTests</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0</string>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
<true/>
|
||||
<key>MinimumOSVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>UIDeviceFamily</key>
|
||||
<array>
|
||||
<integer>1</integer>
|
||||
<integer>2</integer>
|
||||
</array>
|
||||
<key>UIRequiredDeviceCapabilities</key>
|
||||
<array>
|
||||
<string>arm64</string>
|
||||
</array>
|
||||
<key>UISupportedInterfaceOrientations</key>
|
||||
<array>
|
||||
<string>UIInterfaceOrientationPortrait</string>
|
||||
<string>UIInterfaceOrientationPortraitUpsideDown</string>
|
||||
<string>UIInterfaceOrientationLandscapeLeft</string>
|
||||
<string>UIInterfaceOrientationLandscapeRight</string>
|
||||
</array>
|
||||
<key>XSAppIconAssets</key>
|
||||
<string>Assets.xcassets/AppIcon.appiconset</string>
|
||||
<key>NSAppTransportSecurity</key>
|
||||
<dict>
|
||||
<key>NSAllowsArbitraryLoads</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
@ -2,15 +2,27 @@
|
|||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>BclTest</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>BCLTests</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.xamarin.bcl-test</string>
|
||||
<string>com.xamarin.BCLTests</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0</string>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
<true/>
|
||||
<key>MinimumOSVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>UIDeviceFamily</key>
|
||||
<array>
|
||||
<integer>1</integer>
|
||||
<integer>2</integer>
|
||||
</array>
|
||||
<key>UIRequiredDeviceCapabilities</key>
|
||||
<array>
|
||||
<string>arm64</string>
|
||||
</array>
|
||||
<key>UISupportedInterfaceOrientations</key>
|
||||
<array>
|
||||
<string>UIInterfaceOrientationPortrait</string>
|
||||
|
|
@ -18,14 +30,12 @@
|
|||
<string>UIInterfaceOrientationLandscapeLeft</string>
|
||||
<string>UIInterfaceOrientationLandscapeRight</string>
|
||||
</array>
|
||||
<key>UISupportedInterfaceOrientations~ipad</key>
|
||||
<array>
|
||||
<string>UIInterfaceOrientationPortrait</string>
|
||||
<string>UIInterfaceOrientationPortraitUpsideDown</string>
|
||||
<string>UIInterfaceOrientationLandscapeLeft</string>
|
||||
<string>UIInterfaceOrientationLandscapeRight</string>
|
||||
</array>
|
||||
<key>MinimumOSVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>XSAppIconAssets</key>
|
||||
<string>Assets.xcassets/AppIcon.appiconset</string>
|
||||
<key>NSAppTransportSecurity</key>
|
||||
<dict>
|
||||
<key>NSAllowsArbitraryLoads</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
|
|||
|
|
@ -1,88 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
#if XAMCORE_2_0
|
||||
using Foundation;
|
||||
using UIKit;
|
||||
using ObjCRuntime;
|
||||
#else
|
||||
using MonoTouch.Foundation;
|
||||
using MonoTouch.UIKit;
|
||||
using MonoTouch.ObjCRuntime;
|
||||
#endif
|
||||
|
||||
namespace BCL.Tests
|
||||
{
|
||||
#if !__WATCHOS__
|
||||
public class Application
|
||||
{
|
||||
// This is the main entry point of the application.
|
||||
static void Main (string[] args)
|
||||
{
|
||||
// if you want to use a different Application Delegate class from "AppDelegate"
|
||||
// you can specify it here.
|
||||
UIApplication.Main (args, null, "AppDelegate");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
public class TestRuntime
|
||||
{
|
||||
[DllImport ("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]
|
||||
static extern IntPtr IntPtr_objc_msgSend (IntPtr receiver, IntPtr selector);
|
||||
|
||||
[DllImport ("/usr/lib/system/libdyld.dylib")]
|
||||
static extern int dyld_get_program_sdk_version ();
|
||||
|
||||
public const string BuildVersion_iOS7_DP3 = "11D5134c";
|
||||
public const string BuildVersion_iOS8_Beta1 = "12A4265u";
|
||||
|
||||
public static string GetiOSBuildVersion ()
|
||||
{
|
||||
#if __WATCHOS__
|
||||
throw new Exception ("Can't get iOS build version on watchOS");
|
||||
#else
|
||||
return NSString.FromHandle (IntPtr_objc_msgSend (UIDevice.CurrentDevice.Handle, Selector.GetHandle ("buildVersion")));
|
||||
#endif
|
||||
}
|
||||
|
||||
public static Version GetSDKVersion ()
|
||||
{
|
||||
var v = dyld_get_program_sdk_version ();
|
||||
var major = v >> 16;
|
||||
var minor = (v >> 8) & 0xFF;
|
||||
var build = v & 0xFF;
|
||||
return new Version (major, minor, build);
|
||||
}
|
||||
|
||||
public static bool CheckSystemVersion (int major, int minor)
|
||||
{
|
||||
#if __WATCHOS__
|
||||
throw new Exception ("Can't get iOS System/SDK version on watchOS");
|
||||
#else
|
||||
return UIDevice.CurrentDevice.CheckSystemVersion (major, minor);
|
||||
#endif
|
||||
}
|
||||
|
||||
public static bool CheckSDKVersion (int major, int minor)
|
||||
{
|
||||
#if __WATCHOS__
|
||||
throw new Exception ("Can't get iOS SDK version on watchOS");
|
||||
#else
|
||||
if (Runtime.Arch == Arch.SIMULATOR || !CheckSystemVersion (6, 0)) {
|
||||
// dyld_get_program_sdk_version was introduced with iOS 6.0, so don't do the SDK check on older deviecs.
|
||||
return true; // dyld_get_program_sdk_version doesn't return what we're looking for on the mac.
|
||||
}
|
||||
|
||||
var sdk = GetSDKVersion ();
|
||||
if (sdk.Major > major)
|
||||
return true;
|
||||
if (sdk.Major == major && sdk.Minor >= minor)
|
||||
return true;
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
До Ширина: | Высота: | Размер: 2.9 KiB После Ширина: | Высота: | Размер: 2.9 KiB |
|
До Ширина: | Высота: | Размер: 3.5 KiB После Ширина: | Высота: | Размер: 3.5 KiB |
|
До Ширина: | Высота: | Размер: 1.9 KiB После Ширина: | Высота: | Размер: 1.9 KiB |
|
До Ширина: | Высота: | Размер: 5.0 KiB После Ширина: | Высота: | Размер: 5.0 KiB |
|
До Ширина: | Высота: | Размер: 2.3 KiB После Ширина: | Высота: | Размер: 2.3 KiB |
|
До Ширина: | Высота: | Размер: 2.4 KiB После Ширина: | Высота: | Размер: 2.4 KiB |
|
До Ширина: | Высота: | Размер: 4.8 KiB После Ширина: | Высота: | Размер: 4.8 KiB |
|
До Ширина: | Высота: | Размер: 5.5 KiB После Ширина: | Высота: | Размер: 5.5 KiB |
|
До Ширина: | Высота: | Размер: 2.9 KiB После Ширина: | Высота: | Размер: 2.9 KiB |
|
До Ширина: | Высота: | Размер: 3.5 KiB После Ширина: | Высота: | Размер: 3.5 KiB |
|
До Ширина: | Высота: | Размер: 1.9 KiB После Ширина: | Высота: | Размер: 1.9 KiB |
|
До Ширина: | Высота: | Размер: 5.0 KiB После Ширина: | Высота: | Размер: 5.0 KiB |