Merge pull request #1521 from ISISComputingGroup/run_the_tests

Run the tests in the GUI

Author: FreddieAkeroyd

base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml

@@ -254,6 +254,8 @@
 		<module>../uk.ac.stfc.isis.ibex.dae.tests</module>
 		<module>../uk.ac.stfc.isis.ibex.ui.ioccontrol.tests</module>
 		<module>../uk.ac.stfc.isis.ibex.ui.graphing.tests</module>
+		<module>../uk.ac.stfc.isis.ibex.model.tests</module>
+		<module>../uk.ac.stfc.isis.ibex.logger.tests</module>
 	</modules>
 </project>
 

base/uk.ac.stfc.isis.ibex.model.tests/pom.xml

@@ -1,19 +1,46 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>uk.ac.stfc.isis.ibex.model.tests</groupId>
   <artifactId>uk.ac.stfc.isis.ibex.model.tests</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+  <parent>
+  	<groupId>CSS_ISIS</groupId>
+  	<version>1.0.0-SNAPSHOT</version>
+  	<relativePath>../uk.ac.stfc.isis.ibex.client.tycho.parent</relativePath>
+  	<artifactId>uk.ac.stfc.isis.ibex.client.tycho.parent</artifactId>
+  </parent>
   <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
-        <configuration>
-          <source/>
-          <target/>
-        </configuration>
-      </plugin>
-    </plugins>
+  	<pluginManagement>
+  		<plugins>
+  			<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+  			<plugin>
+  				<groupId>org.eclipse.m2e</groupId>
+  				<artifactId>lifecycle-mapping</artifactId>
+  				<version>1.0.0</version>
+  				<configuration>
+  					<lifecycleMappingMetadata>
+  						<pluginExecutions>
+  							<pluginExecution>
+  								<pluginExecutionFilter>
+  									<groupId>org.jacoco</groupId>
+  									<artifactId>
+  										jacoco-maven-plugin
+  									</artifactId>
+  									<versionRange>
+  										[0.7.4.201502262128,)
+  									</versionRange>
+  									<goals>
+  										<goal>prepare-agent</goal>
+  									</goals>
+  								</pluginExecutionFilter>
+  								<action>
+  									<ignore></ignore>
+  								</action>
+  							</pluginExecution>
+  						</pluginExecutions>
+  					</lifecycleMappingMetadata>
+  				</configuration>
+  			</plugin>
+  		</plugins>
+  	</pluginManagement>
   </build>
 </project>