* makefile.gnu NUnit20ified.

        * security_linux_test.args NUnit20ified.
        * renamed System.Security.Cryptography.Xml/AllTests.cs to
          System.Security.Cryptography.Xml/AssertCrypto.cs

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

diff --git a/mcs/class/System.Security/Test/ChangeLog b/mcs/class/System.Security/Test/ChangeLog
index b9f1d4a054e317680f88c69ed3effccbce8df4b6..59591348db198c5298cba08eac89166af23d9bdf 100644 (file)
--- a/mcs/class/System.Security/Test/ChangeLog
+++ b/mcs/class/System.Security/Test/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-18  Martin Willemoes Hansen <mwh@sysrq.dk>
+
+       * makefile.gnu NUnit20ified.
+       * security_linux_test.args NUnit20ified.
+       * renamed System.Security.Cryptography.Xml/AllTests.cs to 
+          System.Security.Cryptography.Xml/AssertCrypto.cs
+
 2003-03-03  Sebastien Pouliot  <spouliot@videotron.ca>
 
        * System.Security_test.build: Updated build file to stop linking 

diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/AssertCrypto.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/AssertCrypto.cs
new file mode 100644 (file)
index 0000000..d733d5b
--- /dev/null
+++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/AssertCrypto.cs
@@ -0,0 +1,43 @@
+//
+// MonoTests.System.Security.Cryptography.Xml.AssertCrypto.cs
+//
+// Author:
+//     Sebastien Pouliot (spouliot@motus.com)
+//
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
+//
+
+using System;
+using System.Security.Cryptography;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Security.Cryptography.Xml {
+
+       public class AssertCrypto {
+
+               // because most crypto stuff works with byte[] buffers
+               static public void AssertEquals (string msg, byte[] array1, byte[] array2) 
+               {
+                       if ((array1 == null) && (array2 == null))
+                               return;
+                       if (array1 == null)
+                               Assertion.Fail (msg + " -> First array is NULL");
+                       if (array2 == null)
+                               Assertion.Fail (msg + " -> Second array is NULL");
+
+                       bool a = (array1.Length == array2.Length);
+                       if (a) {
+                               for (int i = 0; i < array1.Length; i++) {
+                                       if (array1 [i] != array2 [i]) {
+                                               a = false;
+                                               break;
+                                       }
+                               }
+                       }
+                       msg += " -> Expected " + BitConverter.ToString (array1, 0);
+                       msg += " is different than " + BitConverter.ToString (array2, 0);
+                       Assertion.Assert (msg, a);
+               }
+       }
+}

diff --git a/mcs/class/System.Security/Test/makefile.gnu b/mcs/class/System.Security/Test/makefile.gnu
index 96471ff79e27d23b8e5f0ec5c080b9f3694142df..36a4ab203a754b6701380238db8045efbc19e8b8 100644 (file)
--- a/mcs/class/System.Security/Test/makefile.gnu
+++ b/mcs/class/System.Security/Test/makefile.gnu
@@ -4,24 +4,25 @@ LIBRARY = security_linux_test.dll
 
 LIB_LIST = security_linux_test.args
 LIB_FLAGS =    \
-       -r $(topdir)/class/lib/corlib.dll \
-       -r $(topdir)/class/lib/System.Xml.dll \
-       -r $(topdir)/class/lib/NUnitCore_mono.dll
-
-SOURCES_INCLUDE=*.cs
+               -r $(topdir)/class/lib/corlib.dll \
+               -r $(topdir)/class/lib/System.Xml.dll \
+               -r $(topdir)/class/lib/System.Security.dll \
+               -r $(topdir)/nunit20/NUnit.Framework.dll
+
+ifdef SUBDIR
+USE_SOURCE_RULES=1
+SOURCES_INCLUDE=./$(SUBDIR)/*.cs
 SOURCES_EXCLUDE=_DUMMY_
+endif
 
 include $(topdir)/class/library.make
 
-MCS_FLAGS = --target library --noconfig
-
-TEST_SUITE_PREFIX = MonoTests.
-TEST_SUITE = AllTests
-NUNITCONSOLE=$(topdir)/class/lib/NUnitConsole_mono.exe 
+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),security_linux_test.dll
+       -MONO_PATH=$(MONO_PATH) mono --debug $(NUNITCONSOLE) $(LIBRARY)

diff --git a/mcs/class/System.Security/Test/security_linux_test.args b/mcs/class/System.Security/Test/security_linux_test.args
index f6a650601f36ad12ac019f799540e92a12eaf786..a4c30e3866b777d09ea99570a0d6e01ab6d3c6d1 100644 (file)
--- a/mcs/class/System.Security/Test/security_linux_test.args
+++ b/mcs/class/System.Security/Test/security_linux_test.args
@@ -1,5 +1,18 @@
---target library
--o security_linux_test.dll
---noconfig
--r ../../lib/System.Xml.dll
--r ../../../nunit20/NUnit.Framework.dll
\ No newline at end of file
+System.Security.Cryptography.Xml/AssertCrypto.cs
+System.Security.Cryptography.Xml/DataObjectTest.cs
+System.Security.Cryptography.Xml/DSAKeyValueTest.cs
+System.Security.Cryptography.Xml/KeyInfoNameTest.cs
+System.Security.Cryptography.Xml/KeyInfoNodeTest.cs
+System.Security.Cryptography.Xml/KeyInfoRetrievalMethodTest.cs
+System.Security.Cryptography.Xml/KeyInfoTest.cs
+System.Security.Cryptography.Xml/KeyInfoX509DataTest.cs
+System.Security.Cryptography.Xml/ReferenceTest.cs
+System.Security.Cryptography.Xml/RSAKeyValueTest.cs
+System.Security.Cryptography.Xml/SignatureTest.cs
+System.Security.Cryptography.Xml/SignedInfoTest.cs
+System.Security.Cryptography.Xml/SignedXmlTest.cs
+System.Security.Cryptography.Xml/TransformChainTest.cs
+System.Security.Cryptography.Xml/XmlDsigBase64TransformTest.cs
+System.Security.Cryptography.Xml/XmlDsigC14NTransformTest.cs
+System.Security.Cryptography.Xml/XmlDsigC14NWithCommentsTransformTest.cs
+System.Security.Cryptography.Xml/XmlDsigXsltTransformTest.cs