Merge pull request #3851 from akoeplinger/nunitlite

Switch BCL testing from nunit to nunitlite

7 files changed, 8 insertions, 47 deletions

diff --git a/mcs/class/System/Test/System.CodeDom.Compiler/CodeGeneratorGenerateFromCompileUnitTest.cs b/mcs/class/System/Test/System.CodeDom.Compiler/CodeGeneratorGenerateFromCompileUnitTest.cs
index c6ccdf0a26a..823204cf486 100644
--- a/mcs/class/System/Test/System.CodeDom.Compiler/CodeGeneratorGenerateFromCompileUnitTest.cs
+++ b/mcs/class/System/Test/System.CodeDom.Compiler/CodeGeneratorGenerateFromCompileUnitTest.cs
@@ -53,7 +53,7 @@ namespace MonoTests.System.CodeDom.Compiler
 			int importPosition = result.IndexOf (IMPORT);
 			int attributePosition = result.IndexOf (ATTRIBUTE);
 
-			Assert.Greater (attributePosition, importPosition, "Actual order: " + result);
+			AssertHelper.Greater (attributePosition, importPosition, "Actual order: " + result);
 		}
 
 		[Test]
diff --git a/mcs/class/System/Test/System.Collections.Generic/SortedListTest.cs b/mcs/class/System/Test/System.Collections.Generic/SortedListTest.cs
index b6baac08e85..6586c4c092f 100644
--- a/mcs/class/System/Test/System.Collections.Generic/SortedListTest.cs
+++ b/mcs/class/System/Test/System.Collections.Generic/SortedListTest.cs
@@ -38,9 +38,6 @@ using System.Text;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using NUnit.Framework;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Collections.Generic
 {
diff --git a/mcs/class/System/Test/System.Diagnostics/SourceSwitchTest.cs b/mcs/class/System/Test/System.Diagnostics/SourceSwitchTest.cs
index 820e84d2a89..07195bb9246 100644
--- a/mcs/class/System/Test/System.Diagnostics/SourceSwitchTest.cs
+++ b/mcs/class/System/Test/System.Diagnostics/SourceSwitchTest.cs
@@ -53,7 +53,7 @@ namespace MonoTests.System.Diagnostics
 		public void ConstructorNullName ()
 		{
 			SourceSwitch s = new SourceSwitch (null);
-			Assert.IsEmpty (s.DisplayName);
+			AssertHelper.IsEmpty (s.DisplayName);
 		}
 
 		[Test]
diff --git a/mcs/class/System/Test/System.Diagnostics/SwitchesTest.cs b/mcs/class/System/Test/System.Diagnostics/SwitchesTest.cs
index 9d97fc8b53c..d8821a00c2d 100644
--- a/mcs/class/System/Test/System.Diagnostics/SwitchesTest.cs
+++ b/mcs/class/System/Test/System.Diagnostics/SwitchesTest.cs
@@ -190,8 +190,8 @@ namespace MonoTests.System.Diagnostics {
 		public void NullSwitchHasEmptyDisplayNameAndDescription ()
 		{
 			var s = new TestNullSwitch ();
-			Assert.IsEmpty (s.DisplayName);
-			Assert.IsEmpty (s.Description);
+			AssertHelper.IsEmpty (s.DisplayName);
+			AssertHelper.IsEmpty (s.Description);
 		}
 	}
 }
diff --git a/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/PkitsTest.cs b/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/PkitsTest.cs
index 5da8a5d59c7..5f6daa28b60 100644
--- a/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/PkitsTest.cs
+++ b/mcs/class/System/Test/System.Security.Cryptography.X509Certificates/PkitsTest.cs
@@ -37,6 +37,7 @@ using System.IO;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using System.Reflection;
 
 namespace MonoTests.System.Security.Cryptography.X509Certificates {
 
@@ -64,7 +65,7 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		public void FixtureSetUp ()
 		{
 			base_dir = String.Format ("{0}{1}Test{1}System.Security.Cryptography.X509Certificates{1}pkits{1}certs",
-				Directory.GetCurrentDirectory (), Path.DirectorySeparatorChar);
+				Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location), Path.DirectorySeparatorChar);
 			if (!Directory.Exists (base_dir))
 				Assert.Ignore ("PKITS tests data not found under '{0}'.", new object[] { base_dir });
 
@@ -75,7 +76,8 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		[TestFixtureTearDown]
 		public void FixtureTearDown ()
 		{
-			cache.Clear ();
+			if (cache != null)
+				cache.Clear ();
 			// clean-up, as best as possible, the stores
 		}
 
diff --git a/mcs/class/System/Test/test-config-file b/mcs/class/System/Test/test-config-file
index d2eea338663..69d28f6df91 100644
--- a/mcs/class/System/Test/test-config-file
+++ b/mcs/class/System/Test/test-config-file
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
   <system.diagnostics>
     <switches>
       <!-- Boolean switches: any non-zero value is true -->
@@ -22,5 +20,4 @@
       <add name="trace-negative" value="-1"/>
     </switches>
   </system.diagnostics>
-</configuration>
 
diff --git a/mcs/class/System/Test/test-config-file-net-2.0 b/mcs/class/System/Test/test-config-file-net-2.0
deleted file mode 100644
index 03940481236..00000000000
--- a/mcs/class/System/Test/test-config-file-net-2.0
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <system.diagnostics>
-    <sources>
-      <source name="source1" switchName="switch" switchType="System.Diagnostics.SourceSwitch">
-        <!--
-        <listeners>
-          <add name="console" type="System.Diagnostics.ConsoleTraceListener"/>
-        </listeners>
-          -->
-      </source>
-    </sources>
-    <switches>
-      <!-- Boolean switches: any non-zero value is true -->
-      <add name="bool-true" value="1"/>
-      <add name="bool-true-2" value="4"/>
-      <add name="bool-true-3" value="-2"/>
-      <add name="bool-false" value="0"/>
-
-      <!-- trace switches: -->
-      <add name="trace-off" value="0"/>
-      <add name="trace-error" value="1"/>
-      <add name="trace-warning" value="2"/>
-      <add name="trace-info" value="3"/>
-      <add name="trace-verbose" value="4"/>
-
-      <!-- custom switches: -->
-      <add name="custom-switch" value="42"/>
-
-      <!-- this causes problems on .NET -->
-      <add name="trace-negative" value="-1"/>
-    </switches>
-  </system.diagnostics>
-</configuration>
-