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

4 files changed, 24 insertions, 3 deletions

diff --git a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestConfigResourceNode.java b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestConfigResourceNode.java
index ee4db30b8..4fe01b3ae 100644
--- a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestConfigResourceNode.java
+++ b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestConfigResourceNode.java
@@ -27,6 +27,7 @@ package org.openecomp.appc.data.services.db;
 import java.util.HashMap;
 import java.util.Map;
 import static org.junit.Assert.assertFalse;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.openecomp.appc.data.services.AppcDataServiceConstant;
 import org.openecomp.appc.data.services.node.ConfigResourceNode;
@@ -35,6 +36,7 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 
 public class TestConfigResourceNode {
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
     public void testgetConfigFileReferenc() throws SvcLogicException {
         SvcLogicContext ctx = new SvcLogicContext();
@@ -44,8 +46,8 @@ public class TestConfigResourceNode {
         dbService.getConfigFileReference(map, ctx);
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
-
     public void testgetTemplate() throws SvcLogicException {
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
@@ -59,6 +61,7 @@ public class TestConfigResourceNode {
 
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
     public void testgetVnfcReference() throws SvcLogicException {
         SvcLogicContext ctx = new SvcLogicContext();
@@ -69,6 +72,7 @@ public class TestConfigResourceNode {
         dbService.getVnfcReference(map, ctx);
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
     public void testgetSmmChainKeyFiles() throws SvcLogicException {
         SvcLogicContext ctx = new SvcLogicContext();
@@ -80,8 +84,8 @@ public class TestConfigResourceNode {
         dbService.getSmmChainKeyFiles(map, ctx);
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
-
     public void testgetDownloadConfigTemplateByVnf() throws SvcLogicException {
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");    
@@ -92,6 +96,7 @@ public class TestConfigResourceNode {
 
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
     public void testgetCommonConfigInfo() throws SvcLogicException {
         SvcLogicContext ctx = new SvcLogicContext();
@@ -102,6 +107,7 @@ public class TestConfigResourceNode {
 
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
     public void testupdateUploadConfigss() throws SvcLogicException {
         SvcLogicContext ctx = new SvcLogicContext();
@@ -112,6 +118,7 @@ public class TestConfigResourceNode {
 
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
     public void testgetConfigFilesByVnfVmNCategory() throws SvcLogicException {
         SvcLogicContext ctx = new SvcLogicContext();
@@ -124,6 +131,7 @@ public class TestConfigResourceNode {
         node.getConfigFilesByVnfVmNCategory(inParams, ctx);
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
     public void testsaveConfigTransactionLog() throws SvcLogicException {
         SvcLogicContext ctx = new SvcLogicContext();
@@ -137,6 +145,7 @@ public class TestConfigResourceNode {
 
     }
 
+    @Ignore("Test is taking 60 seconds")
     @Test(expected = Exception.class)
     public void testsaveConfigBlock() throws SvcLogicException {
         SvcLogicContext ctx = new SvcLogicContext();
diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlDBServiceTest.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlDBServiceTest.java
index fa297734b..079f65668 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlDBServiceTest.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlDBServiceTest.java
@@ -32,6 +32,7 @@ import java.util.Map;
 

 import org.junit.Assert;

 import org.junit.Before;

+import org.junit.Ignore;

 import org.junit.Test;

 import org.junit.runner.RunWith;

 import org.mockito.Mock;

@@ -102,6 +103,7 @@ QueryStatus dblibSvc ;
 	}

 

 	

+	@Ignore("Test is taking 60 seconds")

 	@Test(expected=Exception.class)

 	public final void testGetDesignTimeFlowModel() throws Exception {

 		SvcLogicContext localContext = new SvcLogicContext();

@@ -114,6 +116,7 @@ QueryStatus dblibSvc ;
 

 	}

 

+	@Ignore("Test is taking 60 seconds")

 	@Test(expected=Exception.class)

 	public final void testLoadSequenceIntoDB() throws SvcLogicException {

 		  

@@ -146,6 +149,7 @@ QueryStatus dblibSvc ;
 

 	}

 

+	@Ignore("Test is taking 60 seconds")

 	@Test(expected=Exception.class)

 	public final void testGetDependencyInfo() throws SvcLogicException {

 		SvcLogicContext localContext = new SvcLogicContext();

@@ -155,6 +159,7 @@ QueryStatus dblibSvc ;
 		

 	}

 

+	@Ignore("Test is taking 60 seconds")

 	@Test(expected=Exception.class)

 	public final void testGetCapabilitiesData() throws SvcLogicException {

 		SvcLogicContext localContext = new SvcLogicContext();

diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlNodeTest.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlNodeTest.java
index 6bb1cb2a4..e53ec249e 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlNodeTest.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlNodeTest.java
@@ -37,6 +37,7 @@ import org.junit.After;
 import org.junit.AfterClass;

 import org.junit.Before;

 import org.junit.BeforeClass;

+import org.junit.Ignore;

 import org.junit.Test;

 import org.mockito.Mock;

 import org.mockito.Mockito;

@@ -64,6 +65,7 @@ public class FlowControlNodeTest {
 	{

 		FlowControlDBService dbservice = FlowControlDBService.initialise();

 	}

+	@Ignore("Test is taking 60 seconds")

 	@Test(expected=Exception.class)

 	public final void testProcessFlow() throws Exception {

 		SvcLogicContext  ctx = new SvcLogicContext();

@@ -105,7 +107,8 @@ public class FlowControlNodeTest {
 		Whitebox.invokeMethod(f, "getInventoryInfo", ctx, vnfid);

 		

 	}

-		@Test(expected=Exception.class)

+	@Ignore("Test is taking 60 seconds")

+	@Test(expected=Exception.class)

 	public void testprocessFlowSequence() throws Exception 

 	{

 		Map<String, String> inparams = new HashMap<String,String>();

@@ -143,6 +146,7 @@ public class FlowControlNodeTest {
 	Whitebox.invokeMethod(f, "collectInputParams",ctx, transaction);

 	

 	}

+	@Ignore("Test is taking 60 seconds")

 	@Test(expected=Exception.class)

 	public void testgetDependencyInfo() throws Exception

 	{

diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestFlowExecutorNode.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestFlowExecutorNode.java
index ba1cd67a2..45896a4d0 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestFlowExecutorNode.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestFlowExecutorNode.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.Properties;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.openecomp.appc.flow.controller.node.FlowControlNode;
 import org.openecomp.appc.flow.controller.utils.FlowControllerConstants;
@@ -61,6 +62,8 @@ public class TestFlowExecutorNode {
                 }
 
 	}
+            
+    @Ignore("Test is taking 60 seconds")
 	@Test(expected=Exception.class)
 	public void testFlowExecutorNode() throws Exception {