[svn] r7722: nemerle/trunk/tools/nemerle-unit: a.build src/tests/TestHelper.n src/tests/tests.n

[Luntain]

Log:
modified to work with version 2.4.1 of nunit

Author: Luntain
Date: Fri Jun 29 12:59:45 2007
New Revision: 7722

Modified:
   nemerle/trunk/tools/nemerle-unit/a.build
   nemerle/trunk/tools/nemerle-unit/src/tests/TestHelper.n
   nemerle/trunk/tools/nemerle-unit/src/tests/tests.n

Modified: nemerle/trunk/tools/nemerle-unit/a.build
==============================================================================
--- nemerle/trunk/tools/nemerle-unit/a.build	(original)
+++ nemerle/trunk/tools/nemerle-unit/a.build	Fri Jun 29 12:59:45 2007
@@ -9,9 +9,9 @@
 			<references>
 				<lib>
 					<include name='lib'/>
-					<include name='${build.dir}'/>
 				</lib>
 				<include name='nunit.framework.dll'/>
+                <include name='NUnit.core.interfaces.dll'/>
 			</references>
 			<sources basedir='src/macros'>
 				<include name='*.n' />
@@ -38,6 +38,7 @@
 				<include name='nunit.framework.dll'/>
 				<include name='NemerleUnit.dll'/>
                 <include name='nunit.core.dll'/>
+                <include name='NUnit.Core.Interfaces.dll'/>
 			</references>
             <sources basedir='src/'>
 				<include name='tests/**.n'/>
@@ -57,8 +58,6 @@
 
 	<target name='run-tests'>
 		<exec 
-		        <!-- it works this way in Linux, not sure about windows. -->
-			<!-- program="nunit-console2" -->
 			program="nunit-console.exe"
 			workingdir="${build.dir}">
 			<arg value="UnitTests.dll" />

Modified: nemerle/trunk/tools/nemerle-unit/src/tests/TestHelper.n
==============================================================================
--- nemerle/trunk/tools/nemerle-unit/src/tests/TestHelper.n	(original)
+++ nemerle/trunk/tools/nemerle-unit/src/tests/TestHelper.n	Fri Jun 29 12:59:45 2007
@@ -1,35 +1,35 @@
 using NUnit.Core
 using Nemerle.Collections
+using Nemerle.IO
 
 module TestHelper
-    public FindTest(test_name: string,tests: list[Test]): Test
-        match ( tests.Find( (x=>x.Name.Equals(test_name)) ) )
+    public FindTest(test_name: string,tests: list[ITest]): ITest
+        match ( tests.Find( (x=>x.TestName.Name.Equals(test_name)) ) )
                     | Some(x) => x
                     | None => null
         
-    public TestPasses(test_name: string, tests:list[Test]): bool
+    public TestPasses(test_name: string, tests:list[ITest]): bool
         def the_test = FindTest(test_name,tests) 
-        def test_result = the_test.Run(NullListener())
+        def test_result = (the_test:>Test).Run(NullListener())
         test_result.IsSuccess
 
     public MessageAfterTestRun(test_name: string, test_fixture: string): string
         def the_test = FindTest(test_name,GetAllTests(GetFixture(test_fixture)))
-        def test_result = the_test.Run(NullListener())
+        print("got $the_test\n")
+        def test_result = (the_test:>Test).Run(NullListener())
         test_result.Message
 
-    public TestPasses(test_name: string, test_fixture: Test): bool
+    public TestPasses(test_name: string, test_fixture: ITest): bool
         TestPasses(test_name,GetAllTests(test_fixture))
 
-    public GetAllTests(a_test: Test): list[Test]
-        def descendants = if (a_test.Tests != null) //co za gowniania implementacja NUnit!
-             $[GetAllTests(child:>Test) | child in a_test.Tests]
+    public GetAllTests(a_test: ITest): list[ITest]
+        def descendants = if (a_test.Tests != null) 
+             $[GetAllTests(child:>ITest) | child in a_test.Tests]
         else
             []
         a_test :: List.Concat(descendants)
 
-    public GetFixture(name: string): Test
-        def runner = SimpleTestRunner()
-        def suit = runner.Load( "fixture.dll" )
-        FindTest( name, GetAllTests(suit) )
-
-
+    public GetFixture(name: string): ITest
+        def suite_builder = TestSuiteBuilder()
+        def test_suite = suite_builder.Build( TestPackage("fixture.dll") )
+        FindTest( name, GetAllTests(test_suite) )

Modified: nemerle/trunk/tools/nemerle-unit/src/tests/tests.n
==============================================================================
--- nemerle/trunk/tools/nemerle-unit/src/tests/tests.n	(original)
+++ nemerle/trunk/tools/nemerle-unit/src/tests/tests.n	Fri Jun 29 12:59:45 2007
@@ -12,7 +12,7 @@
             assert TestHelper.TestPasses("regular_nunit_test", tests)
 
         test "tests are recognized by the NUnit runner"
-            assert tests.Exists( x=>x.Name.Equals("empty unit test") )
+            assert tests.Exists( x=>x.TestName.Name.Equals("empty unit test") )
 
         test "empty test passes"
             assert TestHelper.TestPasses("empty unit test", tests)