[jbosstools-commits] JBoss Tools SVN: r22608 - in trunk/portlet/tests/org.jboss.tools.portlet.core.test: META-INF and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: dgolovin
Date: 2010-06-07 14:03:38 -0400 (Mon, 07 Jun 2010)
New Revision: 22608

Modified:
   trunk/portlet/tests/org.jboss.tools.portlet.core.test/META-INF/MANIFEST.MF
   trunk/portlet/tests/org.jboss.tools.portlet.core.test/pom.xml
   trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletPluginsLoadTest.java
Log:
https://jira.jboss.org/browse/JBDS-1202 problems running tests
fix test errors for portlet plug-in loading test





Modified: trunk/portlet/tests/org.jboss.tools.portlet.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.core.test/META-INF/MANIFEST.MF	2010-06-07 18:02:00 UTC (rev 22607)
+++ trunk/portlet/tests/org.jboss.tools.portlet.core.test/META-INF/MANIFEST.MF	2010-06-07 18:03:38 UTC (rev 22608)
@@ -6,5 +6,6 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.jboss.tools.tests;bundle-version="2.0.0",
  org.junit;bundle-version="3.8.2",
- org.jboss.tools.portlet.core;bundle-version="1.0.0"
+ org.jboss.tools.portlet.core;bundle-version="1.0.0",
+ org.eclipse.core.runtime;bundle-version="3.5.0"
 Export-Package: org.jboss.tools.portlet.core.test

Modified: trunk/portlet/tests/org.jboss.tools.portlet.core.test/pom.xml
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.core.test/pom.xml	2010-06-07 18:02:00 UTC (rev 22607)
+++ trunk/portlet/tests/org.jboss.tools.portlet.core.test/pom.xml	2010-06-07 18:03:38 UTC (rev 22608)
@@ -11,15 +11,4 @@
 	<artifactId>org.jboss.tools.portlet.core.test</artifactId> 
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>

Modified: trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletPluginsLoadTest.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletPluginsLoadTest.java	2010-06-07 18:02:00 UTC (rev 22607)
+++ trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletPluginsLoadTest.java	2010-06-07 18:03:38 UTC (rev 22608)
@@ -1,10 +1,16 @@
 package org.jboss.tools.portlet.core.test;
 
+import org.eclipse.core.runtime.Platform;
 import org.jboss.tools.tests.AbstractPluginsLoadTest;
 
 public class PortletPluginsLoadTest extends AbstractPluginsLoadTest {
 	
-	public void testPortlrtPlugisAreResolvedAndActivated() {
-		testBundlesAreLoadedFor("org.jboss.tools.portlet.feature");
+	public void testOrgJbossPortletCorePluginIsActivated() {
+		assertPluginResolved(Platform.getBundle("org.jboss.tools.portlet.core"));
 	}
+
+	public void testOrgJbossPortletUiPluginIsActivated() {
+		assertPluginResolved(Platform.getBundle("org.jboss.tools.portlet.ui"));
+	}
+
 }