From b358a5d95e4e54d47e1e3e4a98745607dc848d81 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Thu, 31 Jan 2019 16:44:03 -0800
Subject: [PATCH] Add module tests back in - but streamlined

---
 .../aspectj/tools/ajdoc/AjdocModuleTests.java | 36 +++++++++++++++++++
 .../org/aspectj/tools/ajdoc/AjdocTests.java   | 17 ---------
 .../aspectj/tools/ajdoc/JDKVersionTest.java   | 31 ----------------
 3 files changed, 36 insertions(+), 48 deletions(-)
 create mode 100644 ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocModuleTests.java
 delete mode 100644 ajdoc/src/test/java/org/aspectj/tools/ajdoc/JDKVersionTest.java

diff --git a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocModuleTests.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocModuleTests.java
new file mode 100644
index 000000000..6210647e0
--- /dev/null
+++ b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocModuleTests.java
@@ -0,0 +1,36 @@
+package org.aspectj.tools.ajdoc;
+/* *******************************************************************
+ * Copyright (c) 2003 Contributors.
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Eclipse Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/epl-v10.html 
+ *  
+ * Contributors: 
+ *     Mik Kersten     initial implementation 
+ * ******************************************************************/
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+
+/**
+ * @author Mik Kersten
+ */
+public class AjdocModuleTests {
+    public static Test suite() {
+        TestSuite suite = new TestSuite(AjdocModuleTests.class.getName());
+        suite.addTestSuite(DeclareFormsTest.class);
+        suite.addTestSuite(SpacewarTestCase.class);
+        suite.addTestSuite(PatternsTestCase.class);
+        suite.addTestSuite(CoverageTestCase.class); 
+        suite.addTestSuite(ITDTest.class);
+        suite.addTestSuite(FullyQualifiedArgumentTest.class);
+        suite.addTestSuite(EnumTest.class);
+        suite.addTestSuite(PointcutVisibilityTest.class);
+        suite.addTestSuite(ExecutionTestCase.class); 
+        suite.addTestSuite(BugTest.class);
+        return suite;
+    }
+}
diff --git a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocTests.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocTests.java
index 52fe56b03..787a4160d 100644
--- a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocTests.java
+++ b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocTests.java
@@ -32,22 +32,5 @@ public class AjdocTests {//extends TestCase {
                 "../runtime/bin"};
         ASPECTJRT_PATH = FileUtil.getBestFile(paths);
     }
-//
-//    public static Test suite() {
-//        TestSuite suite = new TestSuite(AjdocTests.class.getName());
-//        //$JUnit-BEGIN$
-//        suite.addTestSuite(DeclareFormsTest.class);
-//        suite.addTestSuite(SpacewarTestCase.class);
-//        suite.addTestSuite(PatternsTestCase.class);
-//        suite.addTestSuite(CoverageTestCase.class); 
-//        suite.addTestSuite(ITDTest.class);
-//        suite.addTestSuite(FullyQualifiedArgumentTest.class);
-//        suite.addTestSuite(EnumTest.class);
-//        suite.addTestSuite(PointcutVisibilityTest.class);
-//        suite.addTestSuite(ExecutionTestCase.class); 
-//        suite.addTestSuite(BugTest.class);
-//        //$JUnit-END$
-//        return suite;
-//    }
 
 }
diff --git a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/JDKVersionTest.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/JDKVersionTest.java
deleted file mode 100644
index 33f0daecb..000000000
--- a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/JDKVersionTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 2005 Contributors.
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Mik Kersten     initial implementation 
- * ******************************************************************/
-package org.aspectj.tools.ajdoc;
-
-
-/**
- * @author Mik Kersten
- */
-public class JDKVersionTest extends AjdocTestCase {
-
-//    public void testIsUsing1point4() {
-//        String v = System.getProperty("java.class.version","44.0");
-//        assertTrue(("49.0".compareTo(v) > 0) && ("48.0".compareTo(v) <= 0));
-//        assertFalse(Util.isExecutingOnJava5());
-//    }
-
-    public void testNothing() {}
-//    public void testIsUsing1point5() {
-//        assertTrue(Util.isExecutingOnJava5());
-//    }
-    
-}
-- 
2.39.5