diff options
Diffstat (limited to 'tests/junit/plugins')
5 files changed, 329 insertions, 307 deletions
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/ClassificationConfig.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/ClassificationConfig.java index 904106b6d40..3ab2db04d4c 100644 --- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/ClassificationConfig.java +++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/ClassificationConfig.java @@ -1,285 +1,297 @@ -/*****************************************************************************
- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
- *
- * 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- * Christian W. Damus - bug 451230
- *****************************************************************************/
-package org.eclipse.papyrus.junit.framework.classification;
-
-import static org.eclipse.papyrus.junit.framework.classification.TestCategory.ExpensiveTest;
-import static org.eclipse.papyrus.junit.framework.classification.TestCategory.FailingTest;
-import static org.eclipse.papyrus.junit.framework.classification.TestCategory.InteractiveTest;
-import static org.eclipse.papyrus.junit.framework.classification.TestCategory.InvalidTest;
-import static org.eclipse.papyrus.junit.framework.classification.TestCategory.NotImplemented;
-import static org.eclipse.papyrus.junit.framework.classification.TestCategory.Standard;
-
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.papyrus.infra.tools.util.ListHelper;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-
-/**
- * <p>
- * This class is used to configure the Classification Annotations which should be excluded from a test job. A classification configuration is an immutable set of {@linkplain TestCategory test categories} that are included in the test configuration.
- * </p>
- * <p>
- * Usage:
- * </p>
- *
- * <pre>
- * ClassificationConfig.setExcludedTestCategories(TestCategory.InvalidTest, TestCategory.NotImplemented);
- *
- * // or
- *
- * ClassificationConfig.setIncludedTestCategories(TestCategory.Standard, TestCategory.NotImplemented);
- *
- * // or
- *
- * ClassificationConfig.setExcludedTestCategories(ClassificationConfig.FAILING_TESTS_CONFIG);
- *
- * // or
- *
- * ClassificationConfig.setIncludedTestCategories(ClassificationConfig.FULL_CI_TESTS_CONFIG);
- *
- * // or
- *
- * ClassificationConfig.setTestsConfiguration(ClassificationConfig.CI_TESTS_CONFIG);
- * </pre>
- *
- * @author Camille Letavernier
- *
- * @see {@link TestCategory}
- * @see {@link ClassificationRunner}
- *
- */
-public enum ClassificationConfig implements Set<TestCategory> {
-
- /**
- * Default tests configuration for Continuous Integration (Hudson): Excludes the tests which are
- * identified as failing, as well as the interactive tests
- *
- * This configuration may require a couple of hours to run
- */
- CI_TESTS_CONFIG(NotImplemented, InvalidTest, FailingTest, InteractiveTest),
-
- /**
- * This tests configuration runs all tests which are already identified as failing.
- * If one test from this configuration passes, this might mean that the annotation should be removed
- *
- * InteractiveTests are excluded as well, as this configuration is supposed to be executed on Hudson
- */
- FAILING_TESTS_CONFIG(Standard, InteractiveTest),
-
- /**
- * This tests configuration is expected to run in ~15 minutes. This is useful for quick testing,
- * and validation through Gerrit
- */
- LIGTHWEIGHT_TESTS_CONFIG(InteractiveTest, NotImplemented, FailingTest, InvalidTest, ExpensiveTest),
-
- /**
- * This tests configuration is meant to execute all tests in an automated environment
- * It includes all tests which are known to be failing, but excludes tests which
- * require a user interaction
- */
- FULL_CI_TESTS_CONFIG(InteractiveTest),
-
- /**
- * Executes all tests
- */
- FULL_TESTS_CONFIG();
-
- public static final Set<TestCategory> excludedTestCategories = new HashSet<TestCategory>();
-
- private final Set<TestCategory> categories;
-
- static {
- // Default on Hudson: exclude everything which is already identified as an issue (i.e. is not a (new) regression)
- setTestsConfiguration(CI_TESTS_CONFIG);
-
- // Check whether identified regressions are still failing
- // setIncludedTestCategories(FailingTest);
- }
-
- private ClassificationConfig(TestCategory... exclusions) {
- Set<TestCategory> categories = Sets.newHashSet(TestCategory.values());
- categories.removeAll(Arrays.asList(exclusions));
- this.categories = ImmutableSet.copyOf(categories);
- }
-
- // Same as setExcludedTestsCategories, but renamed for clarity (To be used with predefined configurations)
- public static void setTestsConfiguration(Set<TestCategory> predefinedConfiguration) {
- setIncludedTestCategories(predefinedConfiguration);
- }
-
- /**
- * Define the test categories which should be excluded from the TestSuite
- *
- * @param categoriesToInclude
- */
- public static void setExcludedTestCategories(TestCategory... categories) {
- setExcludedTestCategories(Arrays.asList(categories));
- }
-
- /**
- * Define the test categories which should be included in the TestSuite
- *
- * @param categoriesToInclude
- */
- public static void setIncludedTestCategories(TestCategory... categories) {
- setIncludedTestCategories(Arrays.asList(categories));
- }
-
- /**
- * Define the test categories which should be excluded from the TestSuite
- *
- * @param categoriesToInclude
- */
- public static void setExcludedTestCategories(Collection<TestCategory> categoriesToExclude) {
- excludedTestCategories.clear();
- excludedTestCategories.addAll(categoriesToExclude);
- }
-
- /**
- * Define the test categories which should be included in the TestSuite
- *
- * @param categoriesToInclude
- */
- public static void setIncludedTestCategories(Collection<TestCategory> categoriesToInclude) {
- excludedTestCategories.clear();
- List<TestCategory> categoriesToExclude = ListHelper.asList(TestCategory.values());
- categoriesToExclude.removeAll(categoriesToInclude);
- excludedTestCategories.addAll(categoriesToExclude);
- }
-
- /**
- * Tests whether a method containing the given set of Annotations should be executed
- *
- * @param annotations
- * The annotations applied to the Method
- * @return
- * True if the test method should be executed, false if it should be ignored
- */
- public static boolean shouldRun(Annotation[] annotations) {
- for (Annotation annotation : annotations) {
- Class<? extends Annotation> annotationClass = annotation.annotationType();
- if (isExcluded(annotationClass)) {
- return false;
- }
- }
-
- if (excludedTestCategories.contains(TestCategory.Standard)) {
- for (TestCategory testCategory : TestCategory.values()) {
- if (testCategory == TestCategory.Standard) {
- continue;
- }
-
- for (Annotation annotation : annotations) {
- if (testCategory.match(annotation.annotationType())) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- return true;
- }
-
- /**
- * Tests whether the given Annotation should be excluded
- *
- * @param annotationClass
- * @return
- */
- public static boolean isExcluded(Class<? extends Annotation> annotationClass) {
- for (TestCategory testCategory : excludedTestCategories) {
- if (testCategory.match(annotationClass)) {
- return true;
- }
- }
-
- return false;
- }
-
- @Override
- public int size() {
- return categories.size();
- }
-
- @Override
- public boolean isEmpty() {
- return categories.isEmpty();
- }
-
- @Override
- public boolean contains(Object o) {
- return categories.contains(o);
- }
-
- @Override
- public boolean containsAll(Collection<?> c) {
- return categories.containsAll(c);
- }
-
- @Override
- public Iterator<TestCategory> iterator() {
- return categories.iterator();
- }
-
- @Override
- public Object[] toArray() {
- return categories.toArray();
- }
-
- @Override
- public <T> T[] toArray(T[] a) {
- return categories.toArray(a);
- }
-
- @Override
- public boolean add(TestCategory e) {
- throw new UnsupportedOperationException("add"); //$NON-NLS-1$
- }
-
- @Override
- public boolean remove(Object o) {
- throw new UnsupportedOperationException("remove"); //$NON-NLS-1$
- }
-
- @Override
- public boolean addAll(Collection<? extends TestCategory> c) {
- throw new UnsupportedOperationException("addAll"); //$NON-NLS-1$
- }
-
- @Override
- public boolean retainAll(Collection<?> c) {
- throw new UnsupportedOperationException("retainAll"); //$NON-NLS-1$
- }
-
- @Override
- public boolean removeAll(Collection<?> c) {
- throw new UnsupportedOperationException("removeAll"); //$NON-NLS-1$
- }
-
- @Override
- public void clear() {
- throw new UnsupportedOperationException("clear"); //$NON-NLS-1$
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others. + * + * 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: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Christian W. Damus - bug 451230 + *****************************************************************************/ +package org.eclipse.papyrus.junit.framework.classification; + +import static org.eclipse.papyrus.junit.framework.classification.TestCategory.ExpensiveTest; +import static org.eclipse.papyrus.junit.framework.classification.TestCategory.FailingTest; +import static org.eclipse.papyrus.junit.framework.classification.TestCategory.InteractiveTest; +import static org.eclipse.papyrus.junit.framework.classification.TestCategory.InvalidTest; +import static org.eclipse.papyrus.junit.framework.classification.TestCategory.NotImplemented; +import static org.eclipse.papyrus.junit.framework.classification.TestCategory.Standard; + +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import org.eclipse.core.runtime.Platform; +import org.eclipse.papyrus.infra.tools.util.ListHelper; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; + + +/** + * <p> + * This class is used to configure the Classification Annotations which should be excluded from a test job. A classification configuration is an immutable set of {@linkplain TestCategory test categories} that are included in the test configuration. + * </p> + * <p> + * Usage: + * </p> + * + * <pre> + * ClassificationConfig.setExcludedTestCategories(TestCategory.InvalidTest, TestCategory.NotImplemented); + * + * // or + * + * ClassificationConfig.setIncludedTestCategories(TestCategory.Standard, TestCategory.NotImplemented); + * + * // or + * + * ClassificationConfig.setExcludedTestCategories(ClassificationConfig.FAILING_TESTS_CONFIG); + * + * // or + * + * ClassificationConfig.setIncludedTestCategories(ClassificationConfig.FULL_CI_TESTS_CONFIG); + * + * // or + * + * ClassificationConfig.setTestsConfiguration(ClassificationConfig.CI_TESTS_CONFIG); + * </pre> + * + * @author Camille Letavernier + * + * @see {@link TestCategory} + * @see {@link ClassificationRunner} + * + */ +public enum ClassificationConfig implements Set<TestCategory> { + + /** + * Default tests configuration for Continuous Integration (Hudson): Excludes the tests which are + * identified as failing, as well as the interactive tests + * + * This configuration may require a couple of hours to run + */ + CI_TESTS_CONFIG(NotImplemented, InvalidTest, FailingTest, InteractiveTest), + + /** + * This tests configuration runs all tests which are already identified as failing. + * If one test from this configuration passes, this might mean that the annotation should be removed + * + * InteractiveTests are excluded as well, as this configuration is supposed to be executed on Hudson + */ + FAILING_TESTS_CONFIG(Standard, InteractiveTest), + + /** + * This tests configuration is expected to run in ~15 minutes. This is useful for quick testing, + * and validation through Gerrit + */ + LIGTHWEIGHT_TESTS_CONFIG(InteractiveTest, NotImplemented, FailingTest, InvalidTest, ExpensiveTest), + + /** + * This tests configuration is meant to execute all tests in an automated environment + * It includes all tests which are known to be failing, but excludes tests which + * require a user interaction + */ + FULL_CI_TESTS_CONFIG(InteractiveTest), + + /** + * Executes all tests + */ + FULL_TESTS_CONFIG(); + + public static final Set<TestCategory> excludedTestCategories = new HashSet<TestCategory>(); + + private final Set<TestCategory> categories; + + static { + // Default on Hudson: exclude everything which is already identified as an issue (i.e. is not a (new) regression) + setTestsConfiguration(CI_TESTS_CONFIG); + + // Check whether identified regressions are still failing + // setIncludedTestCategories(FailingTest); + + for (String arg : Platform.getApplicationArgs()) { + if (arg.contains("-testConfig=")) { + String configName = arg.substring("-testConfig=".length()); + Set<TestCategory> testsConfig = ClassificationConfig.valueOf(configName); + if (testsConfig != null) { + setTestsConfiguration(testsConfig); + } + break; + } + } + } + + private ClassificationConfig(TestCategory... exclusions) { + Set<TestCategory> categories = Sets.newHashSet(TestCategory.values()); + categories.removeAll(Arrays.asList(exclusions)); + this.categories = ImmutableSet.copyOf(categories); + } + + // Same as setExcludedTestsCategories, but renamed for clarity (To be used with predefined configurations) + public static void setTestsConfiguration(Set<TestCategory> predefinedConfiguration) { + setIncludedTestCategories(predefinedConfiguration); + } + + /** + * Define the test categories which should be excluded from the TestSuite + * + * @param categoriesToInclude + */ + public static void setExcludedTestCategories(TestCategory... categories) { + setExcludedTestCategories(Arrays.asList(categories)); + } + + /** + * Define the test categories which should be included in the TestSuite + * + * @param categoriesToInclude + */ + public static void setIncludedTestCategories(TestCategory... categories) { + setIncludedTestCategories(Arrays.asList(categories)); + } + + /** + * Define the test categories which should be excluded from the TestSuite + * + * @param categoriesToInclude + */ + public static void setExcludedTestCategories(Collection<TestCategory> categoriesToExclude) { + excludedTestCategories.clear(); + excludedTestCategories.addAll(categoriesToExclude); + } + + /** + * Define the test categories which should be included in the TestSuite + * + * @param categoriesToInclude + */ + public static void setIncludedTestCategories(Collection<TestCategory> categoriesToInclude) { + excludedTestCategories.clear(); + List<TestCategory> categoriesToExclude = ListHelper.asList(TestCategory.values()); + categoriesToExclude.removeAll(categoriesToInclude); + excludedTestCategories.addAll(categoriesToExclude); + } + + /** + * Tests whether a method containing the given set of Annotations should be executed + * + * @param annotations + * The annotations applied to the Method + * @return + * True if the test method should be executed, false if it should be ignored + */ + public static boolean shouldRun(Annotation[] annotations) { + for (Annotation annotation : annotations) { + Class<? extends Annotation> annotationClass = annotation.annotationType(); + if (isExcluded(annotationClass)) { + return false; + } + } + + if (excludedTestCategories.contains(TestCategory.Standard)) { + for (TestCategory testCategory : TestCategory.values()) { + if (testCategory == TestCategory.Standard) { + continue; + } + + for (Annotation annotation : annotations) { + if (testCategory.match(annotation.annotationType())) { + return true; + } + } + } + + return false; + } + + return true; + } + + /** + * Tests whether the given Annotation should be excluded + * + * @param annotationClass + * @return + */ + public static boolean isExcluded(Class<? extends Annotation> annotationClass) { + for (TestCategory testCategory : excludedTestCategories) { + if (testCategory.match(annotationClass)) { + return true; + } + } + + return false; + } + + @Override + public int size() { + return categories.size(); + } + + @Override + public boolean isEmpty() { + return categories.isEmpty(); + } + + @Override + public boolean contains(Object o) { + return categories.contains(o); + } + + @Override + public boolean containsAll(Collection<?> c) { + return categories.containsAll(c); + } + + @Override + public Iterator<TestCategory> iterator() { + return categories.iterator(); + } + + @Override + public Object[] toArray() { + return categories.toArray(); + } + + @Override + public <T> T[] toArray(T[] a) { + return categories.toArray(a); + } + + @Override + public boolean add(TestCategory e) { + throw new UnsupportedOperationException("add"); //$NON-NLS-1$ + } + + @Override + public boolean remove(Object o) { + throw new UnsupportedOperationException("remove"); //$NON-NLS-1$ + } + + @Override + public boolean addAll(Collection<? extends TestCategory> c) { + throw new UnsupportedOperationException("addAll"); //$NON-NLS-1$ + } + + @Override + public boolean retainAll(Collection<?> c) { + throw new UnsupportedOperationException("retainAll"); //$NON-NLS-1$ + } + + @Override + public boolean removeAll(Collection<?> c) { + throw new UnsupportedOperationException("removeAll"); //$NON-NLS-1$ + } + + @Override + public void clear() { + throw new UnsupportedOperationException("clear"); //$NON-NLS-1$ + } + +} diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/runner/AllTestsRunner.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/runner/AllTestsRunner.java index e0353d2da8e..f7b32e833a5 100644 --- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/runner/AllTestsRunner.java +++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/runner/AllTestsRunner.java @@ -21,11 +21,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Set; -import org.eclipse.core.runtime.Platform; -import org.eclipse.papyrus.junit.framework.classification.ClassificationConfig; -import org.eclipse.papyrus.junit.framework.classification.TestCategory; import org.junit.runners.Suite; import org.junit.runners.model.FrameworkField; import org.junit.runners.model.InitializationError; @@ -47,17 +43,6 @@ public class AllTestsRunner extends Suite { */ public AllTestsRunner(final Class<?> clazz) throws InitializationError { super(clazz, getSuites(clazz)); - - for (String arg : Platform.getApplicationArgs()) { - if (arg.contains("-testConfig=")) { - String configName = arg.substring("-testConfig=".length()); - Set<TestCategory> testsConfig = ClassificationConfig.valueOf(configName); - if (testsConfig != null) { - ClassificationConfig.setTestsConfiguration(testsConfig); - } - break; - } - } } /** diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/JUnitUtils.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/JUnitUtils.java index 0982ea9fc29..c95d2ca791a 100644 --- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/JUnitUtils.java +++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/JUnitUtils.java @@ -101,12 +101,13 @@ public class JUnitUtils { } } - if ((result == null) && (description.getTestClass() != null)) { - Class<?> testClass = description.getTestClass(); - for (Class<? extends Annotation> next : types) { - result = testClass.getAnnotation(next); - if (result != null) { - break; + if (result == null) { + out: for (Class<?> testClass = description.getTestClass(); testClass != null; testClass = testClass.getSuperclass()) { + for (Class<? extends Annotation> next : types) { + result = testClass.getAnnotation(next); + if (result != null) { + break out; + } } } } diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java index 526434faedf..dceec239ec7 100644 --- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java +++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java @@ -519,11 +519,31 @@ public abstract class AbstractModelFixture<T extends EditingDomain> extends Test } else { search = Path.ROOT; } - Enumeration<URL> urls = FrameworkUtil.getBundle(testClass).findEntries(search.toPortableString(), pattern, false); + + Bundle testBundle = FrameworkUtil.getBundle(testClass); + Enumeration<URL> urls = testBundle.findEntries(search.toPortableString(), pattern, false); if ((urls != null) && urls.hasMoreElements()) { result = urls.nextElement(); } + if (result == null) { + // A test case can override a resource in a base test bundle with a corresponding resource of its + // own. But, it may also just use the resource provided by the base test bundle, so look for it + Bundle lastBundle = testBundle; + for (Class<?> baseClass = testClass.getSuperclass(); (baseClass != null); baseClass = baseClass.getSuperclass()) { + testBundle = FrameworkUtil.getBundle(baseClass); + if (testBundle == null) { + break; + } else if (testBundle != lastBundle) { + lastBundle = testBundle; + urls = testBundle.findEntries(search.toPortableString(), pattern, false); + if ((urls != null) && urls.hasMoreElements()) { + result = urls.nextElement(); + } + } + } + } + return result; } } diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java index fbc377f5de2..912f0d9504d 100644 --- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java +++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java @@ -712,6 +712,10 @@ public class PapyrusEditorFixture extends AbstractModelFixture<TransactionalEdit return result; } + public void save() { + save(getEditor()); + } + public void save(ISaveablePart part) { if (part.isDirty()) { try { |