Merge branch 'master' of https://github.com/GMUEClab/ecj

.gitignore

@@ -2,6 +2,10 @@ ecj/nbproject
 ecj/nb-configuration.xml
 ecj/nbactions.xml
 ecj/target/
+.idea/
+ecj.iml
+ecj/src/main/resources/ec/app/mona/0-MonaLisaOut.png
+ecj/src/main/resources/ec/app/mona/1-MonaLisaOut.png
 *.stat
 *.aux
 *.idx

ecj/README.md

@@ -30,7 +30,7 @@ The easiest way to build ECJ is to run the Maven `package` target:
 mvn clean package
 ```
 
-This will build ECJ and run its test suite, after automatically installing 
+This will build ECJ and run its unit test suite, after automatically installing 
 ECJ's dependencies into your local Maven repository, downloading packages 
 from Maven's central repository as needed.
 
@@ -44,6 +44,12 @@ Take ECJ for a test drive by running one if its example apps:
 java -jar target/ecj-xx.jar -from app/tutorial3/tutorial3.params
 ```
 
+If you would like to run ECJ's (slightly expensive) sytem test suite,
+you can use the following Maven profile:
+
+```
+mvn test -PSystemTests
+```
 
 ## Building ECJ with the Makefile
 

ecj/pom.xml

@@ -6,6 +6,44 @@
     <version>26</version>
     <packaging>jar</packaging>
 
+    <profiles>
+      <profile>
+	<!-- The default profile excludes the SystemTest suite (becaue
+	     it's expensive). -->
+	<id>UnitTests</id>
+	<activation>
+	  <activeByDefault>true</activeByDefault>
+	</activation>
+	<properties>
+	  <tests.excludedGroups>ec.test.SystemTest</tests.excludedGroups>
+	</properties>
+      </profile>
+
+      <profile>
+	<!-- This profile executes the SystemTest suite, but not the
+	     other tests. -->
+	<id>SystemTests</id>
+	<properties>
+	  <!-- No test groups are excluded. -->
+	  <tests.excludedGroups></tests.excludedGroups>
+	</properties>
+	<build>
+	  <plugins>
+	    <plugin>
+	      <groupId>org.apache.maven.plugins</groupId>
+	      <artifactId>maven-surefire-plugin</artifactId>
+	      <version>2.12.4</version>
+	      <configuration>
+		<!-- We only run the SystemTest group (and no other
+		     tests). -->
+		<groups>ec.test.SystemTest</groups>
+	      </configuration>
+	    </plugin>
+	  </plugins>
+	</build>
+      </profile>
+    </profiles>
+
     <repositories>
       <repository>
 	<id>local-repo</id>
@@ -103,9 +141,10 @@
 	  <artifactId>maven-surefire-plugin</artifactId>
 	  <version>2.12.4</version>
 	  <configuration>
+	    <excludedGroups>${tests.excludedGroups}</excludedGroups>
 	    <excludes>
-	      <exclude>ec/app/AppsTest.java</exclude>
-	      <exclude>ec/app/SPEA2AppsTest.java</exclude>
+	      <!-- XXX Temporary exclusion of failing tests -->
+	      <exclude>ec/co/ant/*.java</exclude>
 	    </excludes>
 	  </configuration>
 	</plugin>

ecj/src/test/java/ec/app/AppsTest.java

@@ -24,6 +24,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.junit.experimental.categories.Category;
+import ec.test.SystemTest;
+
 
 /**
  * "Smoke tests" that run every example parameter file for a couple generations
@@ -32,6 +35,7 @@
  * @author Eric O. Scott
  */
 @RunWith(Parameterized.class)
+@Category(SystemTest.class)
 public class AppsTest
 {
 

ecj/src/test/java/ec/app/SPEA2AppsTest.java

@@ -17,12 +17,15 @@
 import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import org.junit.experimental.categories.Category;
+import ec.test.SystemTest;
 
 /**
  * Custom system tests to supplement the automatic harness given by AppsTest.
  * 
  * @author Eric O. Scott
  */
+@Category(SystemTest.class)
 public class SPEA2AppsTest
 {
 

ecj/src/test/java/ec/test/SystemTest.java

@@ -0,0 +1,4 @@
+package ec.test;
+
+/** Defined the JUnit Category that we use to annotate system tests. */
+public interface SystemTest {}