Extended test coverage

2 files changed, 19 insertions, 6 deletions

diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocModuleTests.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocModuleTests.java
index bf00ddd36..a42b5435d 100644
--- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocModuleTests.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocModuleTests.java
@@ -22,8 +22,8 @@ public class AjdocModuleTests {
 		TestSuite suite = new TestSuite("Test for org.aspectj.tools.ajdoc");
 		//$JUnit-BEGIN$
 		suite.addTestSuite(SpacewarTestCase.class);
-		suite.addTestSuite(ExecutionTestCase.class);
-		suite.addTestSuite(MainTestCase.class); // !!! must be last because it exists
+		suite.addTestSuite(CoverageTestCase.class); 
+		suite.addTestSuite(ExecutionTestCase.class);// !!! must be last because it exists
 		//$JUnit-END$
 		return suite;
 	}
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/MainTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
index ff31aa435..790d8302c 100644
--- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/MainTestCase.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
@@ -16,9 +16,11 @@ import java.io.File;
 import junit.framework.TestCase;
 
 /**
+ * A long way to go until full coverage, but this is the place to add more.
+ * 
  * @author Mik Kersten
  */
-public class MainTestCase extends TestCase {
+public class CoverageTestCase extends TestCase {
 	
 	public void testSimpleExample() {
 		
@@ -26,18 +28,29 @@ public class MainTestCase extends TestCase {
 		File file1 = new File("testdata/simple/foo/ClassA.java");
 		File aspect1 = new File("testdata/simple/foo/AspectA.java");
 		File file2 = new File("testdata/simple/foo/InterfaceI.java");
+		File file3 = new File("testdata/simple/foo/PlainJava.java");
 		File outdir = new File("testdata/simple/doc");
 		
 		String[] args = { "-d", 
 				outdir.getAbsolutePath(),
 				aspect1.getAbsolutePath(),
 				file1.getAbsolutePath(), 
-				file2.getAbsolutePath() };
+				file2.getAbsolutePath(),
+				file3.getAbsolutePath()};
 		
 		org.aspectj.tools.ajdoc.Main.main(args);
-		
-		assertTrue(true);
 	}
+
+//	public void testPlainJava() {
+//		File file1 = new File("testdata/simple/foo/PlainJava.java");
+//		File outdir = new File("testdata/simple/doc");
+//		
+//		String[] args = { "-d", 
+//				outdir.getAbsolutePath(),
+//				file1.getAbsolutePath() };
+//		
+//		org.aspectj.tools.ajdoc.Main.main(args);
+//	}
 	
 	protected void setUp() throws Exception {
 		super.setUp();