diff options
Diffstat (limited to 'testing-drivers')
7 files changed, 65 insertions, 65 deletions
diff --git a/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java index efaae5c25..563db4801 100644 --- a/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java +++ b/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2003 Contributors - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Wes Isberg initial implementation * ******************************************************************/ @@ -30,28 +30,28 @@ public class AjcHarnessTestsUsingJUnit extends TestCase { public static TestSuite suite() { TestSuite result = HarnessJUnitUtil.suite(null, null, null); result.addTest( - HarnessJUnitUtil.suite("harness", + HarnessJUnitUtil.suite("harness", new String[] {"../tests/ajcHarnessTests.xml"}, null )); result.addTest( - HarnessJUnitUtil.suite("harness selection tests", + HarnessJUnitUtil.suite("harness selection tests", new String[] {"testdata/incremental/harness/selectionTest.xml"}, null )); return result; } - + public AjcHarnessTestsUsingJUnit(String name) { super(name); } - + @Override protected void setUp() throws Exception { super.setUp(); AjState.FORCE_INCREMENTAL_DURING_TESTING = true; } - + @Override protected void tearDown() throws Exception { super.tearDown(); diff --git a/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjcTestsUsingJUnit.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjcTestsUsingJUnit.java index 423404ee1..7154ef32c 100644 --- a/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjcTestsUsingJUnit.java +++ b/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjcTestsUsingJUnit.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2003 Contributors - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Wes Isberg initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Wes Isberg initial implementation * ******************************************************************/ package org.aspectj.testing.drivers; @@ -16,7 +16,7 @@ import junit.framework.*; /** * Run ajc tests as JUnit test suites. - * This class is named to avoid automatic inclusion in + * This class is named to avoid automatic inclusion in * most JUnit test runs. */ public class AjcTestsUsingJUnit extends TestCase { @@ -25,13 +25,13 @@ public class AjcTestsUsingJUnit extends TestCase { "../tests/ajcTests.xml" }; - private static final String SKIPS = + private static final String SKIPS = "-ajctestSkipKeywords=purejava,knownLimitation"; private static final String[][] OPTIONS = new String[][] { new String[] { SKIPS }, new String[] { SKIPS, "-emacssym" } }; - + /** * Create TestSuite with all SUITES running all OPTIONS. * @return Test with all TestSuites and TestCases @@ -41,7 +41,7 @@ public class AjcTestsUsingJUnit extends TestCase { String name = AjcTestsUsingJUnit.class.getName(); return HarnessJUnitUtil.suite(name, SUITES, OPTIONS); } - + public AjcTestsUsingJUnit(String name) { super(name); } diff --git a/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjctestsAdapter.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjctestsAdapter.java index fea887cb6..a7e9ae511 100644 --- a/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjctestsAdapter.java +++ b/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjctestsAdapter.java @@ -2,9 +2,9 @@ * Copyright (c) 2003 Contributors * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Wes Isberg initial implementation @@ -388,4 +388,4 @@ public class AjctestsAdapter extends TestSuite { return name; } } -}
\ No newline at end of file +} diff --git a/testing-drivers/src/test/java/org/aspectj/testing/drivers/Harness.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/Harness.java index 4939368ab..3f3ab1c25 100644 --- a/testing-drivers/src/test/java/org/aspectj/testing/drivers/Harness.java +++ b/testing-drivers/src/test/java/org/aspectj/testing/drivers/Harness.java @@ -3,9 +3,9 @@ * 2003 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Xerox/PARC initial implementation diff --git a/testing-drivers/src/test/java/org/aspectj/testing/drivers/HarnessJUnitUtil.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/HarnessJUnitUtil.java index b26b5286f..6c980ffa7 100644 --- a/testing-drivers/src/test/java/org/aspectj/testing/drivers/HarnessJUnitUtil.java +++ b/testing-drivers/src/test/java/org/aspectj/testing/drivers/HarnessJUnitUtil.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2003 Contributors - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Wes Isberg initial implementation * ******************************************************************/ @@ -82,10 +82,10 @@ public class HarnessJUnitUtil { PrintStream out = new PrintStream(outStream); printer.printRunStatus(out, status); out.flush(); - + return outStream.toString(); } - + /** * Dump results for Test from status into TestResult. * FAIL is a failure, @@ -100,7 +100,7 @@ public class HarnessJUnitUtil { * @return 0 (ignored) */ public static int reportResult( - TestResult result, + TestResult result, IRunStatus status, Test test, int numIncomplete) { @@ -126,7 +126,7 @@ public class HarnessJUnitUtil { } return 0; // XXX not doing incomplete } - + /** * Report results as error, failure, or success (ignored), * differently if result is null @@ -155,9 +155,9 @@ public class HarnessJUnitUtil { } return 0; } - + // public static int reportResultComplex( -// TestResult result, +// TestResult result, // IRunStatus status, // Test test, // int numIncomplete) { @@ -171,7 +171,7 @@ public class HarnessJUnitUtil { // } // } // } -// +// // Throwable thrown = status.getThrown(); // if (null != thrown) { // always report this? XXX what if expected? // result.addError(test, thrown); @@ -224,14 +224,14 @@ public class HarnessJUnitUtil { return "nullTest"; } } - + /** * Fix up test names for JUnit. * (i.e., workaround eclipse JUnit bugs) * @param name the String identifier for the test * @return the String permitted by (Eclipse) JUnit support */ - public static String cleanTestName(String name) { + public static String cleanTestName(String name) { name = name.replace(',', ' '); name = name.replace('[', ' '); name = name.replace(']', ' '); @@ -248,7 +248,7 @@ public class HarnessJUnitUtil { } return result; } - + /** * Get the test suite specifications from the suite file, * apply the options to all, @@ -260,7 +260,7 @@ public class HarnessJUnitUtil { * (non-null but empty if some error) */ public static AjcTest.Suite.Spec getSuiteSpec( - String suitePath, + String suitePath, String[] options, IMessageHolder holder) { if (null == suitePath) { @@ -282,7 +282,7 @@ public class HarnessJUnitUtil { options = new String[0]; } runtime.setOptions(options); - boolean skip = !tempSpec.adoptParentValues(runtime, holder); + boolean skip = !tempSpec.adoptParentValues(runtime, holder); if (skip) { tempSpec = EmptySuite.ME; } @@ -292,7 +292,7 @@ public class HarnessJUnitUtil { return EmptySuite.ME; } } - + private static class EmptySuite extends AjcTest.Suite.Spec { static final EmptySuite ME = new EmptySuite(); final ArrayList children; diff --git a/testing-drivers/src/test/java/org/aspectj/testing/drivers/HarnessSelectionTest.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/HarnessSelectionTest.java index 790c4a710..61e72c455 100644 --- a/testing-drivers/src/test/java/org/aspectj/testing/drivers/HarnessSelectionTest.java +++ b/testing-drivers/src/test/java/org/aspectj/testing/drivers/HarnessSelectionTest.java @@ -3,9 +3,9 @@ * 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Xerox/PARC initial implementation diff --git a/testing-drivers/src/test/java/org/aspectj/testing/drivers/TestingDriversModuleTests.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/TestingDriversModuleTests.java index d4b6f9900..35cc9899b 100644 --- a/testing-drivers/src/test/java/org/aspectj/testing/drivers/TestingDriversModuleTests.java +++ b/testing-drivers/src/test/java/org/aspectj/testing/drivers/TestingDriversModuleTests.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ package org.aspectj.testing.drivers; @@ -16,13 +16,13 @@ import junit.framework.*; public class TestingDriversModuleTests extends TestCase { - public static Test suite() { + public static Test suite() { TestSuite suite = new TestSuite(TestingDriversModuleTests.class.getName()); - suite.addTestSuite(HarnessSelectionTest.class); - suite.addTest(AjcHarnessTestsUsingJUnit.suite()); - return suite; + suite.addTestSuite(HarnessSelectionTest.class); + suite.addTest(AjcHarnessTestsUsingJUnit.suite()); + return suite; } public TestingDriversModuleTests(String name) { super(name); } -} +} |