svn commit: r19292 - trunk: src/argouml-app src/argouml-app/tests/org/argouml tools/maven

Author: linus
Date: 2011-05-01 02:35:35-0700
New Revision: 19292

Modified:
   trunk/src/argouml-app/pom.xml
   trunk/src/argouml-app/tests/org/argouml/TestDependencies.java
   trunk/tools/maven/parentpom.xml

Log:
Maven configured to run tests one in each jvm.
Set properties for maven run tests.
Add maven set up to TestDependencies.

Modified: trunk/src/argouml-app/pom.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/pom.xml?view=diff&pathrev=19292&r1=19291&r2=19292
==============================================================================
--- trunk/src/argouml-app/pom.xml	(original)
+++ trunk/src/argouml-app/pom.xml	2011-05-01 02:35:35-0700
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.tigris.gef</groupId>
       <artifactId>gef</artifactId>
-      <version>0.13.2</version>
+      <version>0.13.3-1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>org.argouml</groupId>
       <artifactId>java-interfaces</artifactId>
-      <version>0.32</version>
+      <version>0.33.1</version>
       <type>jar</type>
       <scope>test</scope>
     </dependency>

Modified: trunk/src/argouml-app/tests/org/argouml/TestDependencies.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/TestDependencies.java?view=diff&pathrev=19292&r1=19291&r2=19292
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/TestDependencies.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/TestDependencies.java	2011-05-01 02:35:35-0700
@@ -77,22 +77,39 @@
     public static Test suite() {
         JDepend jdepend = new JDepend();
 
+        boolean directoryFound = false;
+
+        // For eclipse setup
         try {
 	    jdepend.addDirectory("build-eclipse");
+            directoryFound = true;
 	} catch (IOException e) {
 	    // Ignore if the directory does not exist.
 	    // This error will throw when running from the ant setup.
-	    System.out.println("Assuming running from ant!");
 	}
 
+        // For ant setup
 	try {
 	    jdepend.addDirectory("build/classes");
+            directoryFound = true;
 	} catch (IOException e) {
 	    // Ignore if the directory does not exist.
 	    // This error will throw when running from the Eclipse setup.
-	    System.out.println("Assuming running from Eclipse!");
 	}
         
+        // When running from maven
+	try {
+	    jdepend.addDirectory("target/classes");
+            directoryFound = true;
+	} catch (IOException e) {
+	    // Ignore if the directory does not exist.
+	    // This error will throw when running from the Eclipse setup.
+	}
+        
+        if (!directoryFound) {
+            System.out.println("Did not find directory with compiled classes");
+        }
+
         jdepend.analyze();
 
         TestSuite suite =

Modified: trunk/tools/maven/parentpom.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tools/maven/parentpom.xml?view=diff&pathrev=19292&r1=19291&r2=19292
==============================================================================
--- trunk/tools/maven/parentpom.xml	(original)
+++ trunk/tools/maven/parentpom.xml	2011-05-01 02:35:35-0700
@@ -56,6 +56,29 @@
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>always</forkMode>
+          <!-- systemPropertyValues does not work. Wrong version of maven? -->
+          <systemProperties>
+            <property>
+              <name>test.model.uml</name>
+              <value>../argouml-core-model-mdr/src/org/argouml/model/mdr/mof/01-02-15.xml</value>
+            </property>
+            <property>
+              <name>java.awt.headless</name>
+              <value>true</value>
+            </property>
+            <property>
+              <name>log4j.configuration</name>
+              <value>org/argouml/resource/default_console.lcf</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>2.5</version>
         <dependencies>

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2727571

To unsubscribe from this discussion, e-mail: [[email protected]].