From 594b441f49fd3be06e1bc1caa060194f42477f38 Mon Sep 17 00:00:00 2001
From: mwebster <mwebster>
Date: Wed, 9 Aug 2006 12:53:39 +0000
Subject: [PATCH] Bug 152982 "org.aspectj Restructure - Phase 2: Move tests"
 (move MultiProjectIncrementalTests fromm AllTests to AllTests15 because of
 Java 5 dependencies)

---
 tests/src/org/aspectj/systemtest/AllTests.java   | 2 --
 tests/src/org/aspectj/systemtest/AllTests15.java | 9 +++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/src/org/aspectj/systemtest/AllTests.java b/tests/src/org/aspectj/systemtest/AllTests.java
index f22cc1a39..2a399b1dc 100644
--- a/tests/src/org/aspectj/systemtest/AllTests.java
+++ b/tests/src/org/aspectj/systemtest/AllTests.java
@@ -18,7 +18,6 @@ import org.aspectj.systemtest.base.BaseTests;
 import org.aspectj.systemtest.design.DesignTests;
 import org.aspectj.systemtest.incremental.IncrementalTests;
 import org.aspectj.systemtest.incremental.model.IncrementalModelTests;
-import org.aspectj.systemtest.incremental.tools.MultiProjectIncrementalTests;
 import org.aspectj.systemtest.incremental.tools.OutputLocationManagerTests;
 import org.aspectj.systemtest.inpath.InPathTests;
 import org.aspectj.systemtest.options.OptionsTests;
@@ -44,7 +43,6 @@ public class AllTests {
 		suite.addTest(BaseTests.suite());
 		suite.addTest(DesignTests.suite());
 		suite.addTest(IncrementalTests.suite());
-		suite.addTestSuite(MultiProjectIncrementalTests.class);
 		suite.addTestSuite(OutputLocationManagerTests.class);
 		suite.addTest(IncrementalModelTests.suite());
 		//suite.addTest(KnownLimitationsTests.class);
diff --git a/tests/src/org/aspectj/systemtest/AllTests15.java b/tests/src/org/aspectj/systemtest/AllTests15.java
index 3881f18d9..09ed48206 100644
--- a/tests/src/org/aspectj/systemtest/AllTests15.java
+++ b/tests/src/org/aspectj/systemtest/AllTests15.java
@@ -11,6 +11,8 @@ import org.aspectj.systemtest.ajc150.ataspectj.AtAjAnnotationGenTests;
 import org.aspectj.systemtest.ajc151.AllTestsAspectJ151;
 import org.aspectj.systemtest.ajc152.AllTestsAspectJ152;
 import org.aspectj.systemtest.ajc153.AllTestsAspectJ153;
+import org.aspectj.systemtest.incremental.tools.MultiProjectIncrementalTests;
+import org.aspectj.systemtest.xlint.XLint5Tests;
 
 public class AllTests15 {
 
@@ -23,6 +25,13 @@ public class AllTests15 {
 		suite.addTest(AllTestsAspectJ152.suite());
 		suite.addTest(AllTestsAspectJ153.suite());
 		suite.addTest(AtAjAnnotationGenTests.suite());
+		/* FIXME maw Many of these tests do not depend on Java 5 but they
+		 * cannot be executed in Eclipse with 1.3 because of XML issues and
+		 * are excluded on the build machine so moving them here loses nothing
+		 * for the moment.
+		 */
+		suite.addTestSuite(MultiProjectIncrementalTests.class);
+		suite.addTest(XLint5Tests.suite());
 		//$JUnit-END$
 		return suite;
 	}
-- 
2.39.5