Remove useless suite methods from core.tests.runtime.
Change-Id: I335deabc58673a14912241fee6524dc770010ed5
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java
index 95c4602..be6e1c5 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation 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
@@ -31,14 +31,14 @@
suite.addTestSuite(OperationCanceledExceptionTest.class);
suite.addTestSuite(PathTest.class);
suite.addTestSuite(PlatformTest.class);
- suite.addTest(PluginVersionIdentifierTest.suite());
+ suite.addTestSuite(PluginVersionIdentifierTest.class);
suite.addTestSuite(SubMonitorTest.class);
suite.addTestSuite(SubProgressTest.class);
suite.addTestSuite(SubMonitorSmallTicksTest.class);
suite.addTestSuite(ProgressMonitorWrapperTest.class);
- suite.addTest(QualifiedNameTest.suite());
+ suite.addTestSuite(QualifiedNameTest.class);
suite.addTestSuite(SafeRunnerTest.class);
- suite.addTest(StatusTest.suite());
+ suite.addTestSuite(StatusTest.class);
suite.addTestSuite(URIUtilTest.class);
suite.addTestSuite(URLTest.class);
return suite;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PluginVersionIdentifierTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PluginVersionIdentifierTest.java
index 7275ef5..488cff9 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PluginVersionIdentifierTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PluginVersionIdentifierTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation 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
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.core.tests.runtime;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.eclipse.core.runtime.PluginVersionIdentifier;
@Deprecated
@@ -25,14 +23,6 @@
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(PluginVersionIdentifierTest.class.getName());
- suite.addTest(new PluginVersionIdentifierTest("testConstructor"));
- suite.addTest(new PluginVersionIdentifierTest("testEqual"));
- suite.addTest(new PluginVersionIdentifierTest("testComparisons"));
- return suite;
- }
-
public void testConstructor() {
assertEquals("1.0", "123.456.789", new PluginVersionIdentifier(123, 456, 789).toString());
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/QualifiedNameTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/QualifiedNameTest.java
index c65b9c1..08b41c2 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/QualifiedNameTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/QualifiedNameTest.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.core.tests.runtime;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import static org.junit.Assert.assertNotEquals;
+
import org.eclipse.core.runtime.QualifiedName;
/**
@@ -36,15 +36,6 @@
super(name);
}
- public static Test suite() {
-
- TestSuite suite = new TestSuite(QualifiedNameTest.class.getName());
- suite.addTest(new QualifiedNameTest("testQualifiers"));
- suite.addTest(new QualifiedNameTest("testLocalNames"));
- suite.addTest(new QualifiedNameTest("testEqualsAndHashcode"));
- return suite;
- }
-
public void testQualifiers() {
try {
@@ -111,7 +102,7 @@
assertTrue("1.1", qN2.equals(qN1));
assertEquals("1.2", qN1.hashCode(), qN2.hashCode());
- assertTrue("2.0", !qN1.equals("org.eclipse.runtime.myClass"));
+ assertNotEquals("2.0", "org.eclipse.runtime.myClass", qN1);
QualifiedName qN3 = new QualifiedName(null, "myClass");
assertTrue("3.0", !qN1.equals(qN3));
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/StatusTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/StatusTest.java
index 2a463a1..e0a07c1 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/StatusTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/StatusTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation 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
@@ -11,8 +11,6 @@
package org.eclipse.core.tests.runtime;
import java.util.Arrays;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.eclipse.core.runtime.*;
public class StatusTest extends RuntimeTest {
@@ -48,17 +46,6 @@
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(StatusTest.class.getName());
- suite.addTest(new StatusTest("testSingleStatusReturnValues"));
- suite.addTest(new StatusTest("testMultiStatusReturnValues"));
- suite.addTest(new StatusTest("testAdd"));
- suite.addTest(new StatusTest("testAddAll"));
- suite.addTest(new StatusTest("testIsOK"));
- suite.addTest(new StatusTest("testMerge"));
- return suite;
- }
-
@Override
protected void setUp() {
status1 = new Status(status1Severity, status1PluginId, status1Code, status1Message, status1Exception);
