[jboss-svn-commits] JBL Code SVN: r34058 - in labs/jbossrules/trunk/drools-ant: src/test/java/org/drools/contrib and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: Rikkola
Date: 2010-07-20 06:45:04 -0400 (Tue, 20 Jul 2010)
New Revision: 34058

Modified:
   labs/jbossrules/trunk/drools-ant/pom.xml
   labs/jbossrules/trunk/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java
   labs/jbossrules/trunk/drools-ant/src/test/resources/DroolsAntTask.xml
Log:
Fixed paths for ant task unit test.

Modified: labs/jbossrules/trunk/drools-ant/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-ant/pom.xml	2010-07-20 10:23:15 UTC (rev 34057)
+++ labs/jbossrules/trunk/drools-ant/pom.xml	2010-07-20 10:45:04 UTC (rev 34058)
@@ -1,42 +1,58 @@
 <project>
-   <parent>
-      <artifactId>drools</artifactId>
-      <groupId>org.drools</groupId>
-      <version>5.1.0.SNAPSHOT</version>
-   </parent>
-   <modelVersion>4.0.0</modelVersion>
-   <artifactId>drools-ant</artifactId>
-   <name>Drools :: Ant Task</name>
-   <dependencies>
-      <dependency>
-         <groupId>org.drools</groupId>
-         <artifactId>drools-core</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.drools</groupId>
-         <artifactId>drools-verifier</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.drools</groupId>
-         <artifactId>drools-compiler</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.drools</groupId>
-         <artifactId>drools-decisiontables</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>ant</groupId>
-         <artifactId>ant</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>ant</groupId>
-         <artifactId>ant-nodeps</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>com.thoughtworks.xstream</groupId>
-         <artifactId>xstream</artifactId>
-         <scope>runtime</scope>
-      </dependency>
-   </dependencies>
-   <build />
+	<parent>
+		<artifactId>drools</artifactId>
+		<groupId>org.drools</groupId>
+		<version>5.1.0.SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>drools-ant</artifactId>
+	<name>Drools :: Ant Task</name>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.5</version>
+				<configuration>
+					<systemPropertyVariables>
+						<eclipsepath>./</eclipsepath>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>org.drools</groupId>
+			<artifactId>drools-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.drools</groupId>
+			<artifactId>drools-verifier</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.drools</groupId>
+			<artifactId>drools-compiler</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.drools</groupId>
+			<artifactId>drools-decisiontables</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>ant</groupId>
+			<artifactId>ant</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>ant</groupId>
+			<artifactId>ant-nodeps</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.thoughtworks.xstream</groupId>
+			<artifactId>xstream</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+	</dependencies>
 </project>

Modified: labs/jbossrules/trunk/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java
===================================================================
--- labs/jbossrules/trunk/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java	2010-07-20 10:23:15 UTC (rev 34057)
+++ labs/jbossrules/trunk/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java	2010-07-20 10:45:04 UTC (rev 34058)
@@ -26,6 +26,7 @@
 import org.drools.definition.KnowledgePackage;
 import org.drools.rule.Package;
 import org.drools.core.util.DroolsStreamUtils;
+import org.junit.Ignore;
 
 /**
  * DroolsAntTask test case
@@ -37,6 +38,15 @@
     }
 
     public void setUp() {
+
+        // Maven and eclipse need different paths
+        // When running in Maven the property is set.
+        String path = System.getProperty( "eclipsepath" );
+        if ( path == null ) {
+            System.setProperty( "eclipsepath",
+                                "../../../" );
+        }
+
         configureProject( "src/test/resources/DroolsAntTask.xml" );
     }
 

Modified: labs/jbossrules/trunk/drools-ant/src/test/resources/DroolsAntTask.xml
===================================================================
--- labs/jbossrules/trunk/drools-ant/src/test/resources/DroolsAntTask.xml	2010-07-20 10:23:15 UTC (rev 34057)
+++ labs/jbossrules/trunk/drools-ant/src/test/resources/DroolsAntTask.xml	2010-07-20 10:45:04 UTC (rev 34058)
@@ -1,10 +1,5 @@
 <project default="rules">
 	
-	<!-- Uncomment this for Maven Runner -->
-	<property name="eclipsepath"  value=""/>
-	<!-- Uncomment this for Eclipse Runner  -->
-	<!--<property name="eclipsepath"  value="../../../"/>  -->   
-	
 	<path id="cheese.classpath">
 		<pathelement location="${eclipsepath}lib/cheese.jar"/>
 	</path>