wire in older minimal test cases

diff --git a/testing/testsrc/TestingModuleTests.java b/testing/testsrc/TestingModuleTests.java
index 37396e20010e782d69d34c8916bebfdb46507b3b..452d2e0b1dd3bbf59ffd23dad631244294c8e75e 100644 (file)
--- a/testing/testsrc/TestingModuleTests.java
+++ b/testing/testsrc/TestingModuleTests.java
@@ -22,6 +22,8 @@ public class TestingModuleTests extends TestCase {
 
     public static Test suite() { 
         TestSuite suite = new TestSuite(TestingModuleTests.class.getName());
+        suite.addTest(org.aspectj.testing.harness.bridge.TestingBridgeTests.suite()); 
+        suite.addTest(org.aspectj.testing.taskdefs.TaskdefTests.suite()); 
         suite.addTest(org.aspectj.testing.util.UtilTests.suite()); 
         suite.addTest(org.aspectj.testing.xml.TestingXmlTests.suite()); 
         return suite;

diff --git a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java b/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
index 5883505ecd247651c0bc9ad61fc20b40fa34b45d..d9b89b203e7af716e8a6c2fee1e3effa18234390 100644 (file)
--- a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
+++ b/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
@@ -127,10 +127,11 @@ public class AjcTaskCompileCommandTest extends TestCase {
         MessageHandler handler = new MessageHandler();
         String[] parms = (String[]) args.toArray(new String[0]);
         boolean result = command.runCommand(parms, handler);
-        final boolean fail = (result  == (0 == expectedErrors));
-        if (fail) {
-            String m = "expected " + (fail ? "fail" : "pass");
-            assertTrue(m + ": " + args, false);
+        boolean expectPass = (0 == expectedErrors);
+        final boolean pass = (result == expectPass);
+        if (!pass) {
+            String m = expectPass ? "pass" : "fail";
+            assertTrue("expected " + m + ": " + args, false);
         }
     }
 

diff --git a/testing/testsrc/org/aspectj/testing/taskdefs/TaskdefTests.java b/testing/testsrc/org/aspectj/testing/taskdefs/TaskdefTests.java
new file mode 100644 (file)
index 0000000..1ddae25
--- /dev/null
+++ b/testing/testsrc/org/aspectj/testing/taskdefs/TaskdefTests.java
@@ -0,0 +1,29 @@
+/* *******************************************************************
+ * Copyright (c) 2003 Contributors.
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Wes Isberg     initial implementation 
+ * ******************************************************************/
+
+package org.aspectj.testing.taskdefs;
+
+import junit.framework.*;
+
+public class TaskdefTests extends TestCase {
+
+    public static Test suite() { 
+        TestSuite suite = new TestSuite(TaskdefTests.class.getName());
+        //$JUnit-BEGIN$
+        suite.addTestSuite(AjcTaskCompileCommandTest.class); 
+        //$JUnit-END$
+        return suite;
+    }
+
+    public TaskdefTests(String name) { super(name); }
+
+}