Correcting or skipping tests

These tests seem to be designed to timeout and fail. The
resulting exception is either caught or put as an expectation of
the test. The tests do not actually test anything and are causing
30 minutes of build delay.

Change-Id: I177839c0f08f2c4bd8895e0626f49476b4ed7e85
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-276

2 files changed, 33 insertions, 26 deletions

diff --git a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/DBServiceTest.java b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/DBServiceTest.java
index 5ca6ec3f6..52fe27310 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/DBServiceTest.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/DBServiceTest.java
@@ -26,6 +26,7 @@ package org.openecomp.appc.artifact.handler.dbservices;
 
 import java.nio.charset.Charset;
 import org.json.JSONObject;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.openecomp.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
@@ -43,9 +44,9 @@ public class DBServiceTest {
         dbService.saveArtifacts(ctx, internalVersion);
     }
 
-    @Test(expected = Exception.class)
+    @Test
     public void testSaveArtifactsException() throws Exception {
-        DBService dbService = DBService.initialise();
+        MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
         int internalVersion = 1;
@@ -62,9 +63,9 @@ public class DBServiceTest {
     }
 
 
-    @Test(expected = Exception.class)
+    @Test
     public void testLogDataException() throws Exception {
-        DBService dbService = DBService.initialise();
+        MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
         String prefix = "test";
@@ -81,9 +82,9 @@ public class DBServiceTest {
         dbService.processConfigActionDg(ctx, isUpdate);
     }
 
-    @Test(expected = Exception.class)
+    @Test
     public void testProcessConfigActionDgException() throws Exception {
-        DBService dbService = DBService.initialise();
+        MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
         boolean isUpdate = true;
@@ -100,9 +101,9 @@ public class DBServiceTest {
         dbService.getModelDataInformationbyArtifactName(artifactName);
     }
 
-    @Test(expected = Exception.class)
+    @Test
     public void testGetModelDataInformationbyArtifactNameException() throws Exception {
-        DBService dbService = DBService.initialise();
+        MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
         String artifactName = "test";
@@ -120,9 +121,9 @@ public class DBServiceTest {
         dbService.updateYangContents(ctx, artifactId, yangContents);
     }
 
-    @Test(expected = Exception.class)
+    @Test
     public void testUpdateYangContentsException() throws Exception {
-        DBService dbService = DBService.initialise();
+        MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
         String artifactName = "test";
@@ -145,9 +146,9 @@ public class DBServiceTest {
     }
 
 
-    @Test(expected = Exception.class)
+    @Test
     public void testInsertProtocolReferenceException() throws Exception {
-        DBService dbService = DBService.initialise();
+        MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
         String vnfType = "testVnf";
@@ -167,9 +168,9 @@ public class DBServiceTest {
         dbService.processDownloadDgReference(ctx, isUpdate);
     }
 
-    @Test(expected = Exception.class)
+    @Test
     public void testprocessDpwnloadDGReferenceException() throws Exception {
-        DBService dbService = DBService.initialise();
+        MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
         boolean isUpdate = true;
@@ -185,9 +186,9 @@ public class DBServiceTest {
         dbService.processVnfcReference(ctx, isUpdate);
     }
 
-    @Test(expected = Exception.class)
+    @Test
     public void testProcessVnfcReferenceException() throws Exception {
-        DBService dbService = DBService.initialise();
+        MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
         boolean isUpdate = true;
@@ -203,9 +204,9 @@ public class DBServiceTest {
         dbService.processDeviceAuthentication(ctx, isUpdate);
     }
 
-    @Test(expected = Exception.class)
+    @Test
     public void testProcessDeviceAuthenticationException() throws Exception {
-        DBService dbService = DBService.initialise();
+        MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
         boolean isUpdate = true;
@@ -221,9 +222,9 @@ public class DBServiceTest {
         dbService.processDeviceInterfaceProtocol(ctx, isUpdate);
     }
 
-    @Test(expected = Exception.class)
+    @Test
     public void testProcessDeviceInterfaceProtocolException() throws Exception {
-        DBService dbService = DBService.initialise();
+        MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
         boolean isUpdate = true;
@@ -240,9 +241,9 @@ public class DBServiceTest {
         dbService.processSdcReferences(ctx, isUpdate);
     }
 
-    @Test(expected = Exception.class)
+    @Ignore
     public void testProcessSdcReferencesException() throws Exception {
-        DBService dbService = DBService.initialise();
+        MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
         boolean isUpdate = true;
@@ -258,9 +259,9 @@ public class DBServiceTest {
         dbService.isArtifactUpdateRequired(ctx, db);
     }
 
-    @Test(expected = Exception.class)
+    @Test
     public void testIsArtifactUpdateRequiredExcetion() throws Exception {
-        DBService dbService = DBService.initialise();
+        MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
         String db = "db";
@@ -277,9 +278,9 @@ public class DBServiceTest {
         dbService.getArtifactID(ctx, db);
     }
 
-    @Test(expected = Exception.class)
+    @Test
     public void testgetArtifactIDException() throws Exception {
-        DBService dbService = DBService.initialise();
+        MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
         String db = "db";
diff --git a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/node/ArtifactHandlerNodeTest.java b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/node/ArtifactHandlerNodeTest.java
index 895aabe24..870c2fab1 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/node/ArtifactHandlerNodeTest.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/node/ArtifactHandlerNodeTest.java
@@ -32,6 +32,7 @@ import java.util.Properties;
 import org.apache.commons.io.IOUtils;
 import org.json.JSONObject;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.powermock.reflect.Whitebox;
@@ -69,6 +70,7 @@ public class ArtifactHandlerNodeTest {
         ah.processArtifact(inParams, ctx);
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
     public void testStoreReferenceData() throws Exception {
         MockArtifactHandlerNode ah = new MockArtifactHandlerNode();
@@ -121,6 +123,7 @@ public class ArtifactHandlerNodeTest {
         assertTrue(true);
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
     public void testGetArtifactIDException() throws Exception {
         ArtifactHandlerNode ah = new ArtifactHandlerNode();
@@ -128,6 +131,7 @@ public class ArtifactHandlerNodeTest {
         Whitebox.invokeMethod(ah, "getArtifactID", yFileName);
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
     public void testStoreUpdateSdcArtifacts() throws Exception {
         ArtifactHandlerNode ah = new ArtifactHandlerNode();
@@ -137,6 +141,7 @@ public class ArtifactHandlerNodeTest {
         Whitebox.invokeMethod(ah, "storeUpdateSdcArtifacts", postData);
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
     public void testUpdateStoreArtifacts() throws Exception {
         MockArtifactHandlerNode ah = new MockArtifactHandlerNode();
@@ -157,6 +162,7 @@ public class ArtifactHandlerNodeTest {
         Whitebox.invokeMethod(ah, "cleanArtifactInstanceData", ctx);
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
     public void testUpdateYangContents() throws Exception {
         MockArtifactHandlerNode ah = new MockArtifactHandlerNode();