From eacb4eff973bb9b8160871aecf7374f332296e26 Mon Sep 17 00:00:00 2001 From: aclement Date: Thu, 12 May 2011 22:11:04 +0000 Subject: [PATCH] reduce to just failing tests for one run --- .../org/aspectj/systemtest/AllTests15.java | 39 ++++------ .../org/aspectj/systemtest/AllTests16.java | 38 ++++------ .../systemtest/ajc150/AllTestsAspectJ150.java | 73 +++++++++---------- 3 files changed, 62 insertions(+), 88 deletions(-) diff --git a/tests/src/org/aspectj/systemtest/AllTests15.java b/tests/src/org/aspectj/systemtest/AllTests15.java index 8b19ef23b..b6d3b97c0 100644 --- a/tests/src/org/aspectj/systemtest/AllTests15.java +++ b/tests/src/org/aspectj/systemtest/AllTests15.java @@ -7,42 +7,31 @@ 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$ - suite.addTest(AllTests14.suite()); + // wibble + // 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; } diff --git a/tests/src/org/aspectj/systemtest/AllTests16.java b/tests/src/org/aspectj/systemtest/AllTests16.java index c13b783c4..ac81397fd 100644 --- a/tests/src/org/aspectj/systemtest/AllTests16.java +++ b/tests/src/org/aspectj/systemtest/AllTests16.java @@ -6,37 +6,25 @@ 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 - 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()); + // 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(AllTests15.suite()); // $JUnit-END$ return suite; diff --git a/tests/src/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java b/tests/src/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java index 0d83ed149..b963f7326 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java +++ b/tests/src/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java @@ -10,15 +10,11 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc150; -import org.aspectj.systemtest.ajc150.ataspectj.AtAjSyntaxTests; -import org.aspectj.systemtest.ajc150.ataspectj.AtAjMisuseTests; -import org.aspectj.systemtest.ajc150.ataspectj.AtAjLTWTests; -import org.aspectj.systemtest.ajc150.ltw.LTWServerTests; -import org.aspectj.systemtest.ajc150.ltw.LTWTests; - import junit.framework.Test; import junit.framework.TestSuite; +import org.aspectj.systemtest.ajc150.ataspectj.AtAjLTWTests; + /** * This pulls together tests we have written for AspectJ 1.5.0 that don't need Java 1.5 to run */ @@ -26,38 +22,39 @@ public class AllTestsAspectJ150 { public static Test suite() { TestSuite suite = new TestSuite("AspectJ1.5.0 tests"); - //$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.addTest(AtAjLTWTests.suite()); - suite.addTest(HasMember.suite()); - - suite.addTestSuite(LTWTests.class); - suite.addTestSuite(LTWServerTests.class); - //$JUnit-END$ + // 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.addTest(AtAjLTWTests.suite()); + // suite.addTest(HasMember.suite()); + // + // suite.addTestSuite(LTWTests.class); + // suite.addTestSuite(LTWServerTests.class); + // $JUnit-END$ return suite; } } -- 2.39.5