@@ -7,31 +7,42 @@ import junit.framework.Test; | |||
import junit.framework.TestSuite; | |||
import org.aspectj.systemtest.ajc150.AllTestsAspectJ150; | |||
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.ajc154.AllTestsAspectJ154; | |||
import org.aspectj.systemtest.incremental.tools.IncrementalCompilationTests; | |||
import org.aspectj.systemtest.incremental.tools.IncrementalOutputLocationManagerTests; | |||
import org.aspectj.systemtest.incremental.tools.IncrementalPerformanceTests; | |||
import org.aspectj.systemtest.incremental.tools.MoreOutputLocationManagerTests; | |||
import org.aspectj.systemtest.incremental.tools.MultiProjectIncrementalTests; | |||
import org.aspectj.systemtest.model.Model5Tests; | |||
import org.aspectj.systemtest.xlint.XLint5Tests; | |||
public class AllTests15 { | |||
public static Test suite() { | |||
TestSuite suite = new TestSuite("AspectJ System Test Suite - JDK 1.5"); | |||
// $JUnit-BEGIN$ | |||
// wibble | |||
// suite.addTest(AllTests14.suite()); | |||
suite.addTest(AllTests14.suite()); | |||
suite.addTest(AllTestsAspectJ150.suite()); | |||
// suite.addTest(AllTestsAspectJ151.suite()); | |||
// suite.addTest(AllTestsAspectJ152.suite()); | |||
// suite.addTest(AllTestsAspectJ153.suite()); | |||
// suite.addTest(AllTestsAspectJ154.suite()); | |||
// suite.addTest(AtAjAnnotationGenTests.suite()); | |||
// suite.addTest(Model5Tests.suite()); | |||
suite.addTest(AllTestsAspectJ151.suite()); | |||
suite.addTest(AllTestsAspectJ152.suite()); | |||
suite.addTest(AllTestsAspectJ153.suite()); | |||
suite.addTest(AllTestsAspectJ154.suite()); | |||
suite.addTest(AtAjAnnotationGenTests.suite()); | |||
suite.addTest(Model5Tests.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.addTestSuite(IncrementalCompilationTests.class); | |||
// suite.addTestSuite(IncrementalPerformanceTests.class); | |||
// suite.addTestSuite(MoreOutputLocationManagerTests.class); | |||
// suite.addTestSuite(IncrementalOutputLocationManagerTests.class); | |||
// suite.addTest(XLint5Tests.suite()); | |||
suite.addTestSuite(MultiProjectIncrementalTests.class); | |||
suite.addTestSuite(IncrementalCompilationTests.class); | |||
suite.addTestSuite(IncrementalPerformanceTests.class); | |||
suite.addTestSuite(MoreOutputLocationManagerTests.class); | |||
suite.addTestSuite(IncrementalOutputLocationManagerTests.class); | |||
suite.addTest(XLint5Tests.suite()); | |||
// $JUnit-END$ | |||
return suite; | |||
} |
@@ -6,25 +6,37 @@ package org.aspectj.systemtest; | |||
import junit.framework.Test; | |||
import junit.framework.TestSuite; | |||
import org.aspectj.systemtest.ajc160.AllTestsAspectJ160; | |||
import org.aspectj.systemtest.ajc161.AllTestsAspectJ161; | |||
import org.aspectj.systemtest.ajc1610.AllTestsAspectJ1610; | |||
import org.aspectj.systemtest.ajc1611.AllTestsAspectJ1611; | |||
import org.aspectj.systemtest.ajc1612.AllTestsAspectJ1612; | |||
import org.aspectj.systemtest.ajc162.AllTestsAspectJ162; | |||
import org.aspectj.systemtest.ajc163.AllTestsAspectJ163; | |||
import org.aspectj.systemtest.ajc164.AllTestsAspectJ164; | |||
import org.aspectj.systemtest.ajc165.AllTestsAspectJ165; | |||
import org.aspectj.systemtest.ajc166.AllTestsAspectJ166; | |||
import org.aspectj.systemtest.ajc167.AllTestsAspectJ167; | |||
import org.aspectj.systemtest.ajc169.AllTestsAspectJ169; | |||
public class AllTests16 { | |||
public static Test suite() { | |||
TestSuite suite = new TestSuite("AspectJ System Test Suite - JDK 1.6"); | |||
// $JUnit-BEGIN$ | |||
// These 16X tests do not require 1.6 jre to run | |||
// wibble | |||
// suite.addTest(AllTestsAspectJ160.suite()); | |||
// suite.addTest(AllTestsAspectJ161.suite()); | |||
// suite.addTest(AllTestsAspectJ162.suite()); | |||
// suite.addTest(AllTestsAspectJ163.suite()); | |||
// suite.addTest(AllTestsAspectJ164.suite()); | |||
// suite.addTest(AllTestsAspectJ165.suite()); | |||
// suite.addTest(AllTestsAspectJ166.suite()); | |||
// suite.addTest(AllTestsAspectJ167.suite()); | |||
// suite.addTest(AllTestsAspectJ169.suite()); | |||
// suite.addTest(AllTestsAspectJ1610.suite()); | |||
// suite.addTest(AllTestsAspectJ1611.suite()); | |||
// suite.addTest(AllTestsAspectJ1612.suite()); | |||
suite.addTest(AllTestsAspectJ160.suite()); | |||
suite.addTest(AllTestsAspectJ161.suite()); | |||
suite.addTest(AllTestsAspectJ162.suite()); | |||
suite.addTest(AllTestsAspectJ163.suite()); | |||
suite.addTest(AllTestsAspectJ164.suite()); | |||
suite.addTest(AllTestsAspectJ165.suite()); | |||
suite.addTest(AllTestsAspectJ166.suite()); | |||
suite.addTest(AllTestsAspectJ167.suite()); | |||
suite.addTest(AllTestsAspectJ169.suite()); | |||
suite.addTest(AllTestsAspectJ1610.suite()); | |||
suite.addTest(AllTestsAspectJ1611.suite()); | |||
suite.addTest(AllTestsAspectJ1612.suite()); | |||
suite.addTest(AllTests15.suite()); | |||
// $JUnit-END$ | |||
return suite; |
@@ -14,6 +14,10 @@ import junit.framework.Test; | |||
import junit.framework.TestSuite; | |||
import org.aspectj.systemtest.ajc150.ataspectj.AtAjLTWTests; | |||
import org.aspectj.systemtest.ajc150.ataspectj.AtAjMisuseTests; | |||
import org.aspectj.systemtest.ajc150.ataspectj.AtAjSyntaxTests; | |||
import org.aspectj.systemtest.ajc150.ltw.LTWServerTests; | |||
import org.aspectj.systemtest.ajc150.ltw.LTWTests; | |||
/** | |||
* This pulls together tests we have written for AspectJ 1.5.0 that don't need Java 1.5 to run | |||
@@ -22,38 +26,37 @@ public class AllTestsAspectJ150 { | |||
public static Test suite() { | |||
TestSuite suite = new TestSuite("AspectJ1.5.0 tests"); | |||
// wibble | |||
// $JUnit-BEGIN$ | |||
// suite.addTestSuite(MigrationTests.class); | |||
// suite.addTest(Ajc150Tests.suite()); | |||
// suite.addTestSuite(SCCSFixTests.class); | |||
// | |||
// suite.addTest(AccBridgeMethods.suite()); | |||
// suite.addTestSuite(CovarianceTests.class); | |||
// suite.addTestSuite(Enums.class); | |||
// suite.addTest(AnnotationsBinaryWeaving.suite()); | |||
// suite.addTest(AnnotationPointcutsTests.suite()); | |||
// suite.addTestSuite(VarargsTests.class); | |||
// suite.addTestSuite(StaticImports.class); | |||
// suite.addTest(AnnotationRuntimeTests.suite()); | |||
// suite.addTestSuite(PerTypeWithinTests.class); | |||
// | |||
// suite.addTest(Autoboxing.suite()); | |||
// suite.addTest(Annotations.suite()); | |||
// suite.addTest(AnnotationBinding.suite()); | |||
// suite.addTest(RuntimeAnnotations.suite()); | |||
// | |||
// suite.addTest(SuppressedWarnings.suite()); | |||
// suite.addTest(DeclareAnnotationTests.suite()); | |||
// suite.addTest(GenericsTests.suite()); | |||
// suite.addTest(GenericITDsDesign.suite()); | |||
// suite.addTest(AtAjSyntaxTests.suite()); | |||
// suite.addTest(AtAjMisuseTests.suite()); | |||
suite.addTestSuite(MigrationTests.class); | |||
suite.addTest(Ajc150Tests.suite()); | |||
suite.addTestSuite(SCCSFixTests.class); | |||
suite.addTest(AccBridgeMethods.suite()); | |||
suite.addTestSuite(CovarianceTests.class); | |||
suite.addTestSuite(Enums.class); | |||
suite.addTest(AnnotationsBinaryWeaving.suite()); | |||
suite.addTest(AnnotationPointcutsTests.suite()); | |||
suite.addTestSuite(VarargsTests.class); | |||
suite.addTestSuite(StaticImports.class); | |||
suite.addTest(AnnotationRuntimeTests.suite()); | |||
suite.addTestSuite(PerTypeWithinTests.class); | |||
suite.addTest(Autoboxing.suite()); | |||
suite.addTest(Annotations.suite()); | |||
suite.addTest(AnnotationBinding.suite()); | |||
suite.addTest(RuntimeAnnotations.suite()); | |||
suite.addTest(SuppressedWarnings.suite()); | |||
suite.addTest(DeclareAnnotationTests.suite()); | |||
suite.addTest(GenericsTests.suite()); | |||
suite.addTest(GenericITDsDesign.suite()); | |||
suite.addTest(AtAjSyntaxTests.suite()); | |||
suite.addTest(AtAjMisuseTests.suite()); | |||
suite.addTest(AtAjLTWTests.suite()); | |||
// suite.addTest(HasMember.suite()); | |||
// | |||
// suite.addTestSuite(LTWTests.class); | |||
// suite.addTestSuite(LTWServerTests.class); | |||
suite.addTest(HasMember.suite()); | |||
suite.addTestSuite(LTWTests.class); | |||
suite.addTestSuite(LTWServerTests.class); | |||
// $JUnit-END$ | |||
return suite; | |||
} |