Enable surefire unit testing

Issue-Id: CCSDK-67
Change-Id: I3d03ff1a3e312edd4af7ab69508760d2fe49be78
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

diff --git a/pom.xml b/pom.xml
index 3c01ec9..c0c6341 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
                                <artifactId>maven-surefire-plugin</artifactId>
                                <version>2.17</version>
                                <configuration>
-                                       <skipTests>true</skipTests>
+                                       <skipTests>false</skipTests>
                                </configuration>
                        </plugin>
                        <plugin>

diff --git a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/Dme2Test.java b/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/Dme2Test.java
index 48c32f4..9734654 100644 (file)
--- a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/Dme2Test.java
+++ b/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/Dme2Test.java
@@ -34,7 +34,7 @@ public class Dme2Test {
 
     @Test
     public void createInstarUrl() {
-        String instarUrl = "http://localhost:25055/service=sample.com/services/eim/v1/rest/version=1702.0/envContext=TEST/routeOffer=DEFAULT/subContext=/enterpriseConnection/getEnterpriseConnectionDetails/v1?dme2.password=fake&dme2.username=user@sample.com";
+        String instarUrl = "http://localhost:25055/service=sample.com/services/eim/v1/rest/version=1702.0/envContext=TEST/routeOffer=DEFAULT/subContext=/enterpriseConnection/getEnterpriseConnectionDetails/v1?dme2.password=fake&dme2.username=user@sample.com&dme2.allowhttpcode=true";
         DME2 dme = new DME2("user@sample.com", "fake", "TEST", "DEFAULT", new String[] { "http://localhost:25055" }, "common");
         String constructedUrl = dme.constructUrl("sample.com/services/eim/v1/rest", "1702.0", "/enterpriseConnection/getEnterpriseConnectionDetails/v1");
         assertEquals(instarUrl, constructedUrl);
@@ -42,7 +42,7 @@ public class Dme2Test {
 
     @Test
     public void createInstarUrlNoSubContext() {
-        String instarUrl = "http://localhost:25055/service=sample.com/services/eim/v1/rest/version=1702.0/envContext=TEST/routeOffer=DEFAULT?dme2.password=fake&dme2.username=user@sample.com";
+        String instarUrl = "http://localhost:25055/service=sample.com/services/eim/v1/rest/version=1702.0/envContext=TEST/routeOffer=DEFAULT?dme2.password=fake&dme2.username=user@sample.com&dme2.allowhttpcode=true";
         DME2 dme = new DME2("user@sample.com", "fake", "TEST", "DEFAULT", new String[] { "http://localhost:25055" }, "common");
         Map<String, String> parameters = new HashMap<String, String>();
         String constructedUrl = dme.constructUrl("sample.com/services/eim/v1/rest", "1702.0", parameters.get(null));
@@ -52,7 +52,7 @@ public class Dme2Test {
     @Test
     public void testRoundRobin() {
         String[] proxyHostNames = new String[] { "http://one:25055", "http://two:25055", "http://three:25055" };
-        String urlSuffix = "/service=sample.com/services/eim/v1/rest/version=1702.0/envContext=TEST/routeOffer=DEFAULT/subContext=/enterpriseConnection/getEnterpriseConnectionDetails/v1?dme2.password=fake&dme2.username=user@sample.com";
+        String urlSuffix = "/service=sample.com/services/eim/v1/rest/version=1702.0/envContext=TEST/routeOffer=DEFAULT/subContext=/enterpriseConnection/getEnterpriseConnectionDetails/v1?dme2.password=fake&dme2.username=user@sample.com&dme2.allowhttpcode=true";
         DME2 dme = new DME2("user@sample.com", "fake", "TEST", "DEFAULT", proxyHostNames, "common");
         String constructedUrl = dme.constructUrl("sample.com/services/eim/v1/rest", "1702.0", "/enterpriseConnection/getEnterpriseConnectionDetails/v1");
         assertEquals(proxyHostNames[0] + urlSuffix, constructedUrl);

diff --git a/sliPluginUtils/provider/src/test/resources/dme2.e2e.properties b/sliPluginUtils/provider/src/test/resources/dme2.e2e.properties
new file mode 100644 (file)
index 0000000..3734484
--- /dev/null
+++ b/sliPluginUtils/provider/src/test/resources/dme2.e2e.properties
@@ -0,0 +1,7 @@
+aafUserName=user@sample.com
+aafPassword=fake
+envContext=UAT
+routeOffer=UAT
+proxyUrl=http://sample.com:25055,http://sample.com:25055
+commonServiceVersion=1702.0
+partner=
\ No newline at end of file

diff --git a/sliPluginUtils/provider/src/test/resources/dme2.prod.properties b/sliPluginUtils/provider/src/test/resources/dme2.prod.properties
new file mode 100644 (file)
index 0000000..4326b00
--- /dev/null
+++ b/sliPluginUtils/provider/src/test/resources/dme2.prod.properties
@@ -0,0 +1,7 @@
+aafUserName=user@sample.com
+aafPassword=fake
+envContext=PROD
+routeOffer=
+proxyUrl=http://sample.com:25055,http://sample.com:25055
+commonServiceVersion=1.0
+partner=LPP_PROD
\ No newline at end of file