fix for Bugzilla Bug 58681

 	-X should output available -X options

2 files changed, 10 insertions, 6 deletions

diff --git a/org.aspectj.ajdt.core/testsrc/EajcModuleTests.java b/org.aspectj.ajdt.core/testsrc/EajcModuleTests.java
index d2347fd87..4d342ce4b 100644
--- a/org.aspectj.ajdt.core/testsrc/EajcModuleTests.java
+++ b/org.aspectj.ajdt.core/testsrc/EajcModuleTests.java
@@ -14,6 +14,7 @@
 
 // default package
 
+
 import junit.framework.*;
 import junit.framework.Test;
 
@@ -24,6 +25,7 @@ public class EajcModuleTests extends TestCase {
         suite.addTest(org.aspectj.ajdt.ajc.AjdtAjcTests.suite()); 
         suite.addTest(org.aspectj.ajdt.internal.compiler.batch.AjdtBatchTests.suite()); 
         suite.addTest(org.aspectj.ajdt.internal.core.builder.AjdtBuilderTests.suite()); 
+        suite.addTestSuite(org.aspectj.tools.ajc.MainTest.class);
         return suite;
     }
 
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/MainTest.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/MainTest.java
index 29d64c27c..13d7216dd 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/MainTest.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/MainTest.java
@@ -20,14 +20,16 @@ import junit.framework.TestCase;
  * 
  */
 public class MainTest extends TestCase {
-
+	
     public void testMainbare() {
         ArrayList list = new ArrayList();
-        Main.bareMain(new String[] {"-help"}, false, list, null, null, null);
-        assertTrue(1 == list.size());
-        Object o = list.get(0);
+// Usage now printed by Eclipse compiler so doesn't appear here in our message list
+//        Main.bareMain(new String[] {"-help"}, false, list, null, null, null);
+//        assertTrue(1 == list.size());
+        Main.bareMain(new String[] {"-X"}, false, list, null, null, null);
+        assertTrue(1 == list.size());        Object o = list.get(0);
         assertTrue(o instanceof String);
-        assertTrue(-1 != ((String)o).indexOf("-aspectpath"));
-        assertTrue(-1 != ((String)o).indexOf("-incremental"));
+//        assertTrue(-1 != ((String)o).indexOf("-aspectpath"));
+//        assertTrue(-1 != ((String)o).indexOf("-incremental"));
     }
 }