* NUnit2ified makefile.gnu, Test/dslib_linux_test.args

          Test/makefile.gnu, Test/Mono.Directory.LDAP/BindSimpleTest.cs
          Test/Mono.Directory.LDAP/QueryRootDSE.cs
        * Renamed Test/Mono.Directory.LDAP/QueryRootDSE.cs to QueryRootDSETest.cs
        * Removed Test/NUnit.Prefs, Test/Mono.Directory.LDAP/AllTests.cs
        * Fixed Mono.Directory.LDAP/LDAP.cs casting of null to object.

svn path=/trunk/mcs/; revision=12463

9 files changed, 48 insertions, 88 deletions

diff --git a/mcs/class/Mono.Directory.LDAP/ChangeLog b/mcs/class/Mono.Directory.LDAP/ChangeLog
index 119a5f75b04..968592f7592 100644
--- a/mcs/class/Mono.Directory.LDAP/ChangeLog
+++ b/mcs/class/Mono.Directory.LDAP/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-12  Martin Willemoes Hansen <mwh@sysrq.dk>

+	* NUnit2ified makefile.gnu, Test/dslib_linux_test.args

+	  Test/makefile.gnu, Test/Mono.Directory.LDAP/BindSimpleTest.cs

+	  Test/Mono.Directory.LDAP/QueryRootDSE.cs

+	* Renamed Test/Mono.Directory.LDAP/QueryRootDSE.cs to QueryRootDSETest.cs

+	* Removed Test/NUnit.Prefs, Test/Mono.Directory.LDAP/AllTests.cs

+	* Fixed Mono.Directory.LDAP/LDAP.cs casting of null to object.

+	

 2002-12-11  Jeroen Janssen <japj@darius.demon.nl>

 	

 	* add reference to corlib.dll in order to eliminate [MonoTODO] build error

diff --git a/mcs/class/Mono.Directory.LDAP/Mono.Directory.LDAP/LDAP.cs b/mcs/class/Mono.Directory.LDAP/Mono.Directory.LDAP/LDAP.cs
index 4fe55f52c57..50753356269 100644
--- a/mcs/class/Mono.Directory.LDAP/Mono.Directory.LDAP/LDAP.cs
+++ b/mcs/class/Mono.Directory.LDAP/Mono.Directory.LDAP/LDAP.cs
@@ -61,7 +61,7 @@ namespace Mono.Directory.LDAP
 
 		public int StartTLS () {
 			// FIXME should expose client/server ctrls
-			return ldap_start_tls_s (ld, (IntPtr)null, (IntPtr)null);
+			return ldap_start_tls_s (ld, IntPtr.Zero, IntPtr.Zero);
 		}
 
 		public int Search (string      base_entry,
@@ -92,10 +92,9 @@ namespace Mono.Directory.LDAP
 		  return rv;
 		}
 				   
-
 		public void Unbind () {
 			// FIXME should expose client/server ctrls
-			ldap_unbind_ext_s (ld, (IntPtr)null, (IntPtr)null);
+			ldap_unbind_ext_s (ld, IntPtr.Zero, IntPtr.Zero);
 			// FIXME throw something here if ldap_unbind_ext_s returns an error
 		}
 
diff --git a/mcs/class/Mono.Directory.LDAP/Test/Mono.Directory.LDAP/AllTests.cs b/mcs/class/Mono.Directory.LDAP/Test/Mono.Directory.LDAP/AllTests.cs
deleted file mode 100644
index 678d57d296a..00000000000
--- a/mcs/class/Mono.Directory.LDAP/Test/Mono.Directory.LDAP/AllTests.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// MonoTests.System.DirectoryServices.AllTests, System.DirectoryServices.dll
-//
-// Author:
-//   Chris Toshok <toshok@ximian.com>
-//
-
-using NUnit.Framework;
-using System;
-using MonoTests.Directory.LDAP;
-
-namespace MonoTests.Directory.LDAP  {
-	
-	public class AllTests : TestCase {
-
-		public AllTests (string name) : base (name)
-		{
-		}
-
-		public static ITest Suite {
-			get {
-				TestSuite suite = new TestSuite ();
-				suite.AddTest (BindSimpleTest.Suite);
-				suite.AddTest (QueryRootDSE.Suite);
-				return suite;
-			}
-		}
-	}
-}
-
diff --git a/mcs/class/Mono.Directory.LDAP/Test/Mono.Directory.LDAP/BindSimpleTest.cs b/mcs/class/Mono.Directory.LDAP/Test/Mono.Directory.LDAP/BindSimpleTest.cs
index c184d668603..423acdd3950 100644
--- a/mcs/class/Mono.Directory.LDAP/Test/Mono.Directory.LDAP/BindSimpleTest.cs
+++ b/mcs/class/Mono.Directory.LDAP/Test/Mono.Directory.LDAP/BindSimpleTest.cs
@@ -1,3 +1,4 @@
+// BindSimpleTest.cs 
 
 using NUnit.Framework;
 using System;
@@ -5,26 +6,18 @@ using Mono.Directory.LDAP;
 
 namespace MonoTests.Directory.LDAP
 {
-	public class BindSimpleTest : TestCase {
-		public BindSimpleTest () :
-			base ("[MonoTests.Directory.LDAP.BindSimpleTest]'") {}
+	[TestFixture]
+	public class BindSimpleTest {
 
-		public BindSimpleTest (string name) :
-			base (name) {}
+		[SetUp]
+		public void GetReady () {}
 
-		protected override void SetUp () {}
+		[TearDown]
+		public void Clear () {}
 
-		protected override void TearDown () {}
-
-		public static ITest Suite
+		[Test]
+		public void Stuff() 
 		{
-			get {
-				return new TestSuite (typeof (BindSimpleTest));
-			}
-		}
-		
-
-		public void TestStuff() {
 			string myLDAPPath = "ldap://ldap.toshok.org";
 			string username = "cn=Manager,dc=toshok,dc=org", passwd = "evotest";
 			try {
diff --git a/mcs/class/Mono.Directory.LDAP/Test/Mono.Directory.LDAP/QueryRootDSE.cs b/mcs/class/Mono.Directory.LDAP/Test/Mono.Directory.LDAP/QueryRootDSETest.cs
index 68b77163b8a..4d684107ca7 100644
--- a/mcs/class/Mono.Directory.LDAP/Test/Mono.Directory.LDAP/QueryRootDSE.cs
+++ b/mcs/class/Mono.Directory.LDAP/Test/Mono.Directory.LDAP/QueryRootDSETest.cs
@@ -1,3 +1,4 @@
+// QueryRootDSETest.cs
 
 using NUnit.Framework;
 using System;
@@ -5,26 +6,18 @@ using Mono.Directory.LDAP;
 
 namespace MonoTests.Directory.LDAP
 {
-	public class QueryRootDSE : TestCase {
-		public QueryRootDSE () :
-			base ("[MonoTests.Directory.LDAP.QueryRootDSE]'") {}
+	[TestFixture]
+	public class QueryRootDSETest {
 
-		public QueryRootDSE (string name) :
-			base (name) {}
+		[SetUp]
+		public void GetReady () {}
 
-		protected override void SetUp () {}
+		[TearDown]
+		public void Clear () {}
 
-		protected override void TearDown () {}
-
-		public static ITest Suite
+		[Test]
+		public void Stuff() 
 		{
-			get {
-				return new TestSuite (typeof (QueryRootDSE));
-			}
-		}
-		
-
-		public void TestStuff() {
 			string myLDAPPath = "ldap://ldap.toshok.org";
 			try {
 				LDAP ld = new LDAP (myLDAPPath);
diff --git a/mcs/class/Mono.Directory.LDAP/Test/NUnit.Prefs b/mcs/class/Mono.Directory.LDAP/Test/NUnit.Prefs
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/mcs/class/Mono.Directory.LDAP/Test/NUnit.Prefs
+++ /dev/null
diff --git a/mcs/class/Mono.Directory.LDAP/Test/dslib_linux_test.args b/mcs/class/Mono.Directory.LDAP/Test/dslib_linux_test.args
index f6fbe0f7853..13884434093 100644
--- a/mcs/class/Mono.Directory.LDAP/Test/dslib_linux_test.args
+++ b/mcs/class/Mono.Directory.LDAP/Test/dslib_linux_test.args
@@ -1,10 +1,2 @@
---target library
--o dslib_linux_test.dll
---noconfig
--r ../../lib/Mono.Directory.LDAP.dll
--r ../../lib/corlib.dll
--r ../../lib/System.dll
--r ../../../nunit/NUnitCore_mono.dll
 Mono.Directory.LDAP/BindSimpleTest.cs
-Mono.Directory.LDAP/QueryRootDSE.cs
-Mono.Directory.LDAP/AllTests.cs
+Mono.Directory.LDAP/QueryRootDSETest.cs
diff --git a/mcs/class/Mono.Directory.LDAP/Test/makefile.gnu b/mcs/class/Mono.Directory.LDAP/Test/makefile.gnu
index 943289f4cb7..78b48947d07 100644
--- a/mcs/class/Mono.Directory.LDAP/Test/makefile.gnu
+++ b/mcs/class/Mono.Directory.LDAP/Test/makefile.gnu
@@ -3,21 +3,26 @@ topdir = ../../..
 LIBRARY = dslib_linux_test.dll
 
 LIB_LIST = dslib_linux_test.args
-LIB_FLAGS = -r ../../lib/Mono.Directory.LDAP.dll -r ../../lib/corlib.dll -r ../../lib/System.dll \
-	    -r $(topdir)/nunit/src/NUnitCore/NUnitCore_mono.dll
+LIB_FLAGS =     \
+                -r $(topdir)/class/lib/corlib.dll \
+                -r $(topdir)/class/lib/System.dll \
+                -r $(topdir)/class/lib/Mono.Directory.LDAP.dll \
+                -r $(topdir)/nunit20/NUnit.Framework.dll
 
-include ../../library.make
+ifdef SUBDIR
+USE_SOURCE_RULES=1
+SOURCES_INCLUDE=./$(SUBDIR)/*.cs
+SOURCES_EXCLUDE=_DUMMY_
+endif
 
-MCS_FLAGS = --target library --noconfig
+include $(topdir)/class/library.make
 
-TEST_SUITE_PREFIX = MonoTests.Directory.LDAP.
-TEST_SUITE = AllTests
-NUNITCONSOLE=$(topdir)/nunit/src/NUnitConsole/NUnitConsole_mono.exe 
-NUNIT_MONO_PATH=$(topdir)/nunit/src/NUnitCore:.
+NUNITCONSOLE=$(topdir)/nunit20/nunit-console.exe
+MONO_PATH = $(topdir)/nunit20:.
 
 test: $(LIBRARY) run_test
 
 .PHONY: run_test
 
 run_test:
-	MONO_PATH=$(NUNIT_MONO_PATH) mono $(NUNITCONSOLE) $(TEST_SUITE_PREFIX)$(TEST_SUITE),dslib_linux_test.dll
+        -MONO_PATH=$(MONO_PATH) mono --debug $(NUNITCONSOLE) $(LIBRARY)
diff --git a/mcs/class/Mono.Directory.LDAP/makefile.gnu b/mcs/class/Mono.Directory.LDAP/makefile.gnu
index 6ca9c4697dc..31c2b7535ae 100644
--- a/mcs/class/Mono.Directory.LDAP/makefile.gnu
+++ b/mcs/class/Mono.Directory.LDAP/makefile.gnu
@@ -1,14 +1,14 @@
 topdir = ../..
 
-LIBRARY = ../lib/Mono.Directory.LDAP.dll
+TEST_DIR= Test
+LIBRARY = $(topdir)/class/lib/Mono.Directory.LDAP.dll
 
 LIB_LIST = list
 LIB_FLAGS = -r corlib -r System -r System.Data -r mscorlib
 
 SOURCES_INCLUDE=*.cs
-SOURCES_EXCLUDE=\
-	./Test*
+SOURCES_EXCLUDE=./Test*
 
-export MONO_PATH_PREFIX = ../lib:
+export MONO_PATH_PREFIX = $(topdir)/class/lib:
 
-include ../library.make
+include $(topdir)/class/library.make