Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2015-07-29 16:51:16 +0000
committerMarkus Keller2015-07-29 18:03:56 +0000
commit19f32631b872a84a41dc65721cfbc0bd2ac8a5b6 (patch)
treeee94a6d29e1b926bcfba39e5b96331a27a6c717f
parentcb427a264844cc5a28a0c6c1272631ddfca57b2a (diff)
downloadeclipse.jdt.core-19f32631b872a84a41dc65721cfbc0bd2ac8a5b6.tar.gz
eclipse.jdt.core-19f32631b872a84a41dc65721cfbc0bd2ac8a5b6.tar.xz
eclipse.jdt.core-19f32631b872a84a41dc65721cfbc0bd2ac8a5b6.zip
Bug 473867: [test][apt] avoid calling BuilderTests#suite() twice (via jdt.apt.pluggable.tests)
-rw-r--r--org.eclipse.jdt.apt.pluggable.tests/pom.xml7
-rw-r--r--org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/TestBase.java7
2 files changed, 13 insertions, 1 deletions
diff --git a/org.eclipse.jdt.apt.pluggable.tests/pom.xml b/org.eclipse.jdt.apt.pluggable.tests/pom.xml
index 0ef4a1c5c3..0104950209 100644
--- a/org.eclipse.jdt.apt.pluggable.tests/pom.xml
+++ b/org.eclipse.jdt.apt.pluggable.tests/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ Copyright (c) 2012, 2015 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
Contributors:
Igor Fedorenko - initial implementation
+ IBM Corporation - bug fixes
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -21,4 +22,8 @@
<artifactId>org.eclipse.jdt.apt.pluggable.tests</artifactId>
<version>3.4.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <testSuite>${project.artifactId}</testSuite>
+ <testClass>org.eclipse.jdt.apt.pluggable.tests.TestAll</testClass>
+ </properties>
</project>
diff --git a/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/TestBase.java b/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/TestBase.java
index 1954d27bcc..60fb70de40 100644
--- a/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/TestBase.java
+++ b/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/TestBase.java
@@ -28,6 +28,8 @@ import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.tests.builder.BuilderTests;
import org.eclipse.jdt.core.tests.util.Util;
+import junit.framework.Test;
+
public class TestBase extends BuilderTests
{
@@ -41,6 +43,11 @@ public class TestBase extends BuilderTests
super(name);
}
+ public static Test suite() {
+ throw new IllegalStateException("This is a base test class whose suite() method must not be called.\n"
+ + "This exception is thrown to avoid running org.eclipse.jdt.core.tests.builder.BuilderTests#suite() twice.");
+ }
+
/**
* Extract lib/annotations.jar from the test bundle and add it to the specified project
*/

Back to the top