Merge "Enable surefire unit testing"

3 files changed, 5 insertions, 24 deletions

diff --git a/pom.xml b/pom.xml
index f641ef502..eefdf04e9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.17</version>
                 <configuration>
-                    <skipTests>true</skipTests>
+                    <skipTests>false</skipTests>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestIsAvailable.java b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestIsAvailable.java
index 5b9423422..4dee2d61e 100644
--- a/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestIsAvailable.java
+++ b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestIsAvailable.java
@@ -367,25 +367,6 @@ public class TestIsAvailable {
     public void test011() throws Exception {
         String t = "011";
         log.info("============== isAvailable " + t + " ================================");
-        log.info("=== Test input validations - no speed in input");
-
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("tmp.resource-allocator.speed-unit", "Gbps");
-        ctx.setAttribute("tmp.resource-allocator.aic-site-id", "MTSNJA4LCP1");
-
-        try {
-            resourceAllocator.isAvailable("NetworkCapacity", null, null, ctx);
-        } catch (SvcLogicException e) {
-            Assert.assertTrue(e.getMessage().equals("tmp.resource-allocator.speed is required in ResourceAllocator"));
-            return;
-        }
-        Assert.fail("SvcLogicException expected");
-    }
-
-    @Test
-    public void test012() throws Exception {
-        String t = "012";
-        log.info("============== isAvailable " + t + " ================================");
         log.info("=== Test input validations - speed not a number in input");
 
         SvcLogicContext ctx = new SvcLogicContext();
@@ -403,8 +384,8 @@ public class TestIsAvailable {
     }
 
     @Test
-    public void test013() throws Exception {
-        String t = "013";
+    public void test012() throws Exception {
+        String t = "012";
         log.info("============== isAvailable " + t + " ================================");
         log.info("=== Test input validations - speed-unit missing in input");
 
diff --git a/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceTest.java b/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/ITCaseSqlResource.java
index 2d48ff3f4..f0ab60379 100644
--- a/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceTest.java
+++ b/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/ITCaseSqlResource.java
@@ -34,10 +34,10 @@ import org.slf4j.LoggerFactory;
 
 import junit.framework.TestCase;
 
-public class SqlResourceTest extends TestCase {
+public class ITCaseSqlResource extends TestCase {
 
 	private static final Logger LOG = LoggerFactory
-			.getLogger(SqlResourceTest.class);
+			.getLogger(ITCaseSqlResource.class);
 
 
 	public void testExists() {