diff options
author | Kim Moir | 2012-02-01 15:13:36 +0000 |
---|---|---|
committer | Kim Moir | 2012-02-01 15:13:36 +0000 |
commit | 37eee2cc62cddb14867a08a73929575c2dac5401 (patch) | |
tree | bdd67e56b287afe6624120e69d49470aabbf33e7 /org.eclipse.ua.tests | |
parent | 2ebe1f2dcfc66c1bb947c428cce6df473952bd47 (diff) | |
download | eclipse.platform.ua-37eee2cc62cddb14867a08a73929575c2dac5401.tar.gz eclipse.platform.ua-37eee2cc62cddb14867a08a73929575c2dac5401.tar.xz eclipse.platform.ua-37eee2cc62cddb14867a08a73929575c2dac5401.zip |
Bug 370329 - GetContentUsingRemoteHelp randomly fails on JRE 7 due to
wrong test order
Diffstat (limited to 'org.eclipse.ua.tests')
3 files changed, 56 insertions, 2 deletions
diff --git a/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/org.eclipse.ua.tests/META-INF/MANIFEST.MF index b39564ec4..c2cbeb555 100644 --- a/org.eclipse.ua.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.ua.tests/META-INF/MANIFEST.MF @@ -26,3 +26,40 @@ Bundle-ClassPath: ua-tests.jar Import-Package: javax.servlet;version="2.4.0", javax.servlet.http;version="2.4.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Export-Package: org.eclipse.ua.tests, + org.eclipse.ua.tests.browser, + org.eclipse.ua.tests.browser.external, + org.eclipse.ua.tests.browser.other, + org.eclipse.ua.tests.browser.servlet, + org.eclipse.ua.tests.cheatsheet, + org.eclipse.ua.tests.cheatsheet.composite, + org.eclipse.ua.tests.cheatsheet.execution, + org.eclipse.ua.tests.cheatsheet.other, + org.eclipse.ua.tests.cheatsheet.parser, + org.eclipse.ua.tests.cheatsheet.performance, + org.eclipse.ua.tests.cheatsheet.util, + org.eclipse.ua.tests.help, + org.eclipse.ua.tests.help.criteria, + org.eclipse.ua.tests.help.dynamic, + org.eclipse.ua.tests.help.index, + org.eclipse.ua.tests.help.other, + org.eclipse.ua.tests.help.performance, + org.eclipse.ua.tests.help.preferences, + org.eclipse.ua.tests.help.remote, + org.eclipse.ua.tests.help.scope, + org.eclipse.ua.tests.help.search, + org.eclipse.ua.tests.help.toc, + org.eclipse.ua.tests.help.util, + org.eclipse.ua.tests.help.webapp, + org.eclipse.ua.tests.help.webapp.service, + org.eclipse.ua.tests.help.webextension, + org.eclipse.ua.tests.intro, + org.eclipse.ua.tests.intro.anchors, + org.eclipse.ua.tests.intro.contentdetect, + org.eclipse.ua.tests.intro.other, + org.eclipse.ua.tests.intro.parser, + org.eclipse.ua.tests.intro.performance, + org.eclipse.ua.tests.intro.util, + org.eclipse.ua.tests.plugin, + org.eclipse.ua.tests.util, + org.eclipse.ua.tests.browser diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java index 6f940ff8a..f806b9326 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. + * Copyright (c) 2009, 2012 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 @@ -13,14 +13,31 @@ package org.eclipse.ua.tests.help.remote; import java.net.URL; +import junit.framework.Test; import junit.framework.TestCase; import org.eclipse.help.internal.HelpPlugin; import org.eclipse.help.internal.base.BaseHelpSystem; import org.eclipse.help.internal.server.WebappManager; +import org.eclipse.test.OrderedTestSuite; public class GetContentUsingRemoteHelp extends TestCase { + + public static Test suite() { + return new OrderedTestSuite(GetContentUsingRemoteHelp.class, new String[] { + "testContentNotFound", + "testContentFound", + "testContentFoundDe", + "testLocalBeatsRemote", + "testRemoteHelpPreferredPreference", + "testRemoteOrdering", + "testRemoteOrderingReversed", + "testRemoteUsedIfLocalUnavaliable" + }); + } + + private int mode; protected void setUp() throws Exception { diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/TocZipTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/TocZipTest.java index 7bf22b022..ad6ef36e0 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/TocZipTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/TocZipTest.java @@ -43,7 +43,7 @@ public class TocZipTest extends TestCase { * Verify that loose files override those in doc.zip * @throws IOException */ - public void testDocInZipAndBundle() throws IOException { + public void testXXXDocInZipAndBundle() throws IOException { final String path = "/org.eclipse.ua.tests/data/help/manual/dz2.html"; String contents = readPage(path); assertFalse(contents.indexOf("dz2 from doc.zip") > -1); |