[jbosstools-commits] JBoss Tools SVN: r22154 - in trunk/common/tests: org.jboss.tools.common.model.ui.test and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: dgolovin
Date: 2010-05-17 20:18:47 -0400 (Mon, 17 May 2010)
New Revision: 22154

Modified:
   trunk/common/tests/org.jboss.tools.common.model.test/pom.xml
   trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml
Log:
fix for null pointer exceptions in tests:
model.test
model.ui.test

reason was new tycho version 0.9.0-SHAPSHOT, it doesn't use source folder when starting tests plug-in. and test plug-in are deployed as jar instead of being unpacked. fixed by configuring plug-in  to deploy test plug-ins unpacked 


Modified: trunk/common/tests/org.jboss.tools.common.model.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.model.test/pom.xml	2010-05-17 22:28:46 UTC (rev 22153)
+++ trunk/common/tests/org.jboss.tools.common.model.test/pom.xml	2010-05-18 00:18:47 UTC (rev 22154)
@@ -1,14 +1,29 @@
 <project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion> 
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
 	<parent>
-	  <relativePath>../../../parent-pom.xml</relativePath>
-	  <groupId>org.jboss.tools</groupId>
-	  <artifactId>org.jboss.tools.parent.pom</artifactId>
-	  <version>0.0.1-SNAPSHOT</version>
+		<relativePath>../../../parent-pom.xml</relativePath>
+		<groupId>org.jboss.tools</groupId>
+		<artifactId>org.jboss.tools.parent.pom</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools</groupId>
-	<artifactId>org.jboss.tools.common.model.test</artifactId> 
+	<artifactId>org.jboss.tools.common.model.test</artifactId>
 	<version>3.1.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.sonatype.tycho</groupId>
+				<artifactId>maven-osgi-test-plugin</artifactId>
+				<configuration>
+					<explodedBundles>
+						<bundle>org.jboss.tools.common.model.test</bundle>
+					</explodedBundles>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml	2010-05-17 22:28:46 UTC (rev 22153)
+++ trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml	2010-05-18 00:18:47 UTC (rev 22154)
@@ -1,14 +1,29 @@
 <project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion> 
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
 	<parent>
-	  <relativePath>../../../parent-pom.xml</relativePath>
-	  <groupId>org.jboss.tools</groupId>
-	  <artifactId>org.jboss.tools.parent.pom</artifactId>
-	  <version>0.0.1-SNAPSHOT</version>
+		<relativePath>../../../parent-pom.xml</relativePath>
+		<groupId>org.jboss.tools</groupId>
+		<artifactId>org.jboss.tools.parent.pom</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools</groupId>
-	<artifactId>org.jboss.tools.common.model.ui.test</artifactId> 
+	<artifactId>org.jboss.tools.common.model.ui.test</artifactId>
 	<version>3.1.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.sonatype.tycho</groupId>
+				<artifactId>maven-osgi-test-plugin</artifactId>
+				<configuration>
+					<explodedBundles>
+						<bundle>org.jboss.tools.common.model.ui.test</bundle>
+					</explodedBundles>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>