Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.ua.tests/help')
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/AllHelpPerformanceTests.java35
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/BuildHtmlSearchIndex.java10
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java10
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java10
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java10
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/OpenHelpTest.java10
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java10
7 files changed, 11 insertions, 84 deletions
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/AllHelpPerformanceTests.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/AllHelpPerformanceTests.java
index 5a225646f..c754bd9ef 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/AllHelpPerformanceTests.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/AllHelpPerformanceTests.java
@@ -14,38 +14,25 @@
package org.eclipse.ua.tests.help;
import org.eclipse.ua.tests.help.performance.BuildHtmlSearchIndex;
-import org.eclipse.ua.tests.help.performance.IndexAssemblePerformanceTest;
import org.eclipse.ua.tests.help.performance.HelpServerTest;
+import org.eclipse.ua.tests.help.performance.IndexAssemblePerformanceTest;
import org.eclipse.ua.tests.help.performance.TocAssemblePerformanceTest;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
/*
* Tests help performance (automated).
*/
-public class AllHelpPerformanceTests extends TestSuite {
-
- /*
- * Returns the entire test suite.
- */
- public static Test suite() {
- return new AllHelpPerformanceTests();
- }
+@RunWith(Suite.class)
+@SuiteClasses({ TocAssemblePerformanceTest.class, IndexAssemblePerformanceTest.class, BuildHtmlSearchIndex.class,
+ HelpServerTest.class })
+public class AllHelpPerformanceTests {
/*
- * Constructs a new performance test suite.
+ * Disabled due to inability to get reliable results. Browser/SWT changes in
+ * timing of listener events no longer consistent in 3.3.
*/
- public AllHelpPerformanceTests() {
-
- /*
- * Disabled due to inability to get reliable results. Browser/SWT
- * changes in timing of listener events no longer consistent in 3.3.
- */
- //addTest(OpenHelpTest.suite());
- addTest(TocAssemblePerformanceTest.suite());
- addTest(IndexAssemblePerformanceTest.suite());
- addTest(BuildHtmlSearchIndex.suite());
- addTest(HelpServerTest.suite());
- }
+ // addTest(OpenHelpTest.suite());
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/BuildHtmlSearchIndex.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/BuildHtmlSearchIndex.java
index 0bffc5024..7e832deae 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/BuildHtmlSearchIndex.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/BuildHtmlSearchIndex.java
@@ -15,9 +15,6 @@ package org.eclipse.ua.tests.help.performance;
import java.net.URL;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.help.AbstractIndexProvider;
@@ -40,13 +37,6 @@ public class BuildHtmlSearchIndex extends PerformanceTestCase {
private AbstractIndexProvider[] indexProviders;
private AnalyzerDescriptor analyzerDesc;
- /*
- * Returns an instance of this Test.
- */
- public static Test suite() {
- return new TestSuite(BuildHtmlSearchIndex.class);
- }
-
@Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java
index 0311c236e..1d9f52cab 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/HelpServerTest.java
@@ -14,9 +14,6 @@
package org.eclipse.ua.tests.help.performance;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
import org.eclipse.ua.tests.help.util.LoadServletUtil;
@@ -27,13 +24,6 @@ import org.eclipse.ua.tests.help.util.LoadServletUtil;
public class HelpServerTest extends PerformanceTestCase {
- /*
- * Returns an instance of this Test.
- */
- public static Test suite() {
- return new TestSuite(HelpServerTest.class);
- }
-
@Override
protected void tearDown() throws Exception {
LoadServletUtil.stopServer();
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java
index f0bb1b3fb..7364425bb 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/IndexAssemblePerformanceTest.java
@@ -31,18 +31,8 @@ import org.eclipse.test.performance.PerformanceTestCase;
import org.eclipse.ua.tests.plugin.UserAssistanceTestPlugin;
import org.xml.sax.SAXException;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
public class IndexAssemblePerformanceTest extends PerformanceTestCase {
- /*
- * Returns an instance of this Test.
- */
- public static Test suite() {
- return new TestSuite(IndexAssemblePerformanceTest.class);
- }
-
public void testIndexAssemble() throws Exception {
tagAsSummary("Assemble Index", Dimension.ELAPSED_PROCESS);
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java
index 4a6bf9c96..c6e1bbc66 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/LowIterationHelpServerTest.java
@@ -14,9 +14,6 @@
package org.eclipse.ua.tests.help.performance;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
import org.eclipse.ua.tests.help.util.LoadServletUtil;
@@ -27,13 +24,6 @@ import org.eclipse.ua.tests.help.util.LoadServletUtil;
public class LowIterationHelpServerTest extends PerformanceTestCase {
- /*
- * Returns an instance of this Test.
- */
- public static Test suite() {
- return new TestSuite(LowIterationHelpServerTest.class);
- }
-
@Override
protected void tearDown() throws Exception {
LoadServletUtil.stopServer();
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/OpenHelpTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/OpenHelpTest.java
index 710354607..8d16c589a 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/OpenHelpTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/OpenHelpTest.java
@@ -13,9 +13,6 @@
*******************************************************************************/
package org.eclipse.ua.tests.help.performance;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.core.runtime.Platform;
import org.eclipse.help.AbstractIndexProvider;
import org.eclipse.help.AbstractTocProvider;
@@ -44,13 +41,6 @@ public class OpenHelpTest extends PerformanceTestCase {
private AbstractIndexProvider[] indexProviders;
private Shell shell;
- /*
- * Returns an instance of this Test.
- */
- public static Test suite() {
- return new TestSuite(OpenHelpTest.class);
- }
-
@Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java
index 2367cd2b6..d7e20bee6 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/performance/TocAssemblePerformanceTest.java
@@ -30,18 +30,8 @@ import org.eclipse.test.performance.PerformanceTestCase;
import org.eclipse.ua.tests.plugin.UserAssistanceTestPlugin;
import org.xml.sax.SAXException;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
public class TocAssemblePerformanceTest extends PerformanceTestCase {
- /*
- * Returns an instance of this Test.
- */
- public static Test suite() {
- return new TestSuite(TocAssemblePerformanceTest.class);
- }
-
private TocContribution parse(TocFileParser parser, String tocFile)
throws IOException, SAXException, ParserConfigurationException {
return parser.parse(new TocFile(UserAssistanceTestPlugin.getPluginId(), tocFile, true, "en", null, null));

Back to the top