summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoir2012-02-07 08:37:12 (EST)
committerkmoir2012-02-07 08:37:12 (EST)
commit1cc2f365ac75105e58f7f2dadcb1fe7ff6764fb2 (patch)
treee6a53de75dc06a68cd70e7c8236e7af778c4c4d8
parent78942201284c85d2b95ee73cb689a76e91f0d567 (diff)
downloadeclipse.platform.ua-1cc2f365ac75105e58f7f2dadcb1fe7ff6764fb2.zip
eclipse.platform.ua-1cc2f365ac75105e58f7f2dadcb1fe7ff6764fb2.tar.gz
eclipse.platform.ua-1cc2f365ac75105e58f7f2dadcb1fe7ff6764fb2.tar.bz2
Bug 370719 - Test failure in
ContentDetectorTest.testNoSavedState(ContentDetectorTest.java:79)
-rw-r--r--org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/AllIntroTests.java4
-rw-r--r--org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/contentdetect/ContentDetectorTest.java19
2 files changed, 20 insertions, 3 deletions
diff --git a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/AllIntroTests.java b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/AllIntroTests.java
index 43eeb9a..6865c32 100644
--- a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/AllIntroTests.java
+++ b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/AllIntroTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 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
@@ -35,7 +35,7 @@ public class AllIntroTests extends TestSuite {
*/
public AllIntroTests() {
addTest(AllParserTests.suite());
- addTestSuite(ContentDetectorTest.class);
+ addTest(ContentDetectorTest.suite());
addTestSuite(ExtensionReorderingTest.class);
addTest(AllOtherTests.suite());
}
diff --git a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/contentdetect/ContentDetectorTest.java b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/contentdetect/ContentDetectorTest.java
index bb2e615..841a792 100644
--- a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/contentdetect/ContentDetectorTest.java
+++ b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/contentdetect/ContentDetectorTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * Copyright (c) 2007, 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
@@ -14,14 +14,31 @@ package org.eclipse.ua.tests.intro.contentdetect;
import java.util.HashSet;
import java.util.Set;
+import junit.framework.Test;
import junit.framework.TestCase;
+import org.eclipse.test.OrderedTestSuite;
+
import org.eclipse.ui.internal.intro.impl.model.ExtensionMap;
import org.eclipse.ui.internal.intro.universal.contentdetect.ContentDetectHelper;
import org.eclipse.ui.internal.intro.universal.contentdetect.ContentDetector;
public class ContentDetectorTest extends TestCase {
+ public static Test suite() {
+ return new OrderedTestSuite(ContentDetectorTest.class, new String[] {
+ "testContributorCount",
+ "testContributorSaveNoNames",
+ "testContributorSaveThreeContributors",
+ "testExtensionMapping",
+ "testExtensionMapSingleton",
+ "testForNewContent",
+ "testNoSavedState",
+ "testStartPage",
+ "testStateChanges"
+ });
+ }
+
public void testContributorCount() {
ContentDetectHelper helper = new ContentDetectHelper();
helper.saveExtensionCount(4);