disable platform intro test until universal intro stabilizes

3 files changed, 5 insertions, 6 deletions

diff --git a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/parser/AllParserTests.java b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/parser/AllParserTests.java
index 3778fa968..fc727b468 100644
--- a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/parser/AllParserTests.java
+++ b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/parser/AllParserTests.java
@@ -29,7 +29,8 @@ public class AllParserTests extends TestSuite {
 	 * Constructs a new test suite.
 	 */
 	public AllParserTests() {
-		addTest(PlatformTest.suite());
+		// re-enable once universal welcome stabilizes
+		//addTest(PlatformTest.suite());
 		addTest(ValidTest.suite());
 	}
 }
diff --git a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/parser/PlatformTest.java b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/parser/PlatformTest.java
index cff996c56..7c4ed8668 100644
--- a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/parser/PlatformTest.java
+++ b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/parser/PlatformTest.java
@@ -21,7 +21,6 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.ua.tests.intro.util.IntroModelSerializer;
 import org.eclipse.ua.tests.intro.util.IntroModelSerializerTest;
@@ -50,13 +49,12 @@ public class PlatformTest extends TestCase {
 	 * Test the platform's parsed intro content.
 	 */
 	public void testModel() {
-		final String INTRO_CONFIG_ID = "intro";		
+		final String INTRO_CONFIG_ID = "org.eclipse.ui.intro.universalConfig";		
 		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.ui.intro.config");
 		IConfigurationElement element = null;
 		for (int i=0;i<elements.length;++i) {
 			if (elements[i] != null) {
-				IExtension ext = elements[i].getDeclaringExtension();
-				if (INTRO_CONFIG_ID.equals(ext.getSimpleIdentifier())) {
+				if (INTRO_CONFIG_ID.equals(elements[i].getAttribute("id"))) {
 					element = elements[i];
 				}
 			}
diff --git a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializerTest.java b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializerTest.java
index 8a9c6c8b8..00a955d98 100644
--- a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializerTest.java
+++ b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializerTest.java
@@ -86,7 +86,7 @@ public class IntroModelSerializerTest extends TestCase {
 		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.ui.intro.config");
 		for (int i=0;i<elements.length;++i) {
 			String id = elements[i].getAttribute("id");
-			if ("org.eclipse.platform.introConfig".equals(id)) {
+			if ("org.eclipse.ui.intro.universalConfig".equals(id)) {
 				String pluginRoot = ResourceFinder.findFile(UserAssistanceTestPlugin.getDefault(), "/").toString().substring("file:".length());
 
 				IntroModelRoot model = ExtensionPointManager.getInst().getModel(id);