aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerry Flood <jflood@att.com>2019-04-20 07:14:30 -0400
committerJerry Flood <jflood@att.com>2019-04-20 07:14:41 -0400
commitfafd5a1c3764ba9561aa951fe843dd4bf68c88c8 (patch)
tree4fb80f5b4bb543f57e0b0c1e6fbb01cd62208be7
parent266e8659ec80d22eaff56a7306fcef33c3e8b190 (diff)
Resolve failsafe plugin naming convention
updated IT*.java naming to It*.java Issue-ID: OPTFRA-474 Change-Id: If96776af5b10fe712a5b72138af9d65b67bb271e Signed-off-by: Jerry Flood <jflood@att.com>
-rw-r--r--cmso-sonar/pom.xml12
-rw-r--r--cmso-sonar/src/test/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java (renamed from cmso-sonar/src/it/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java)2
-rw-r--r--cmso-sonar/src/test/resources/integration.properties (renamed from cmso-sonar/src/it/resources/integration.properties)0
3 files changed, 12 insertions, 2 deletions
diff --git a/cmso-sonar/pom.xml b/cmso-sonar/pom.xml
index 3f0815f..b5d22d8 100644
--- a/cmso-sonar/pom.xml
+++ b/cmso-sonar/pom.xml
@@ -88,10 +88,20 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/It*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
- <testSourceDirectory>${project.basedir}/src/it/java</testSourceDirectory>
+ <includes>
+ <include>**/It*.java</include>
+ </includes>
<skipITs>${skipIntegrationTests}</skipITs>
</configuration>
</plugin>
diff --git a/cmso-sonar/src/it/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java b/cmso-sonar/src/test/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java
index d6eccb3..aa3779a 100644
--- a/cmso-sonar/src/it/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java
+++ b/cmso-sonar/src/test/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java
@@ -34,7 +34,7 @@ public class ItFullIntegrationTest {
@Test
public void runTest() throws IOException {
- InputStream is = new FileInputStream(new File("src/it/resources/integration.properties"));
+ InputStream is = new FileInputStream(new File("src/test/resources/integration.properties"));
env.load(is);
Process process = null;
try {
diff --git a/cmso-sonar/src/it/resources/integration.properties b/cmso-sonar/src/test/resources/integration.properties
index 48957a0..48957a0 100644
--- a/cmso-sonar/src/it/resources/integration.properties
+++ b/cmso-sonar/src/test/resources/integration.properties