1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 0 insertions, 38 deletions

diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/ASDCControllerSingletonESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/ASDCControllerSingletonESTest.java
deleted file mode 100644
index 9ca02e218a..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/ASDCControllerSingletonESTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:38:29 GMT 2016
- */
-
-package org.openecomp.mso.asdc;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.PrivateAccess;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class ASDCControllerSingletonESTest extends ASDCControllerSingletonESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      ASDCControllerSingleton aSDCControllerSingleton0 = new ASDCControllerSingleton();
-      PrivateAccess.callMethod((Class<ASDCControllerSingleton>) ASDCControllerSingleton.class, aSDCControllerSingleton0, "setWorking", (Object) true, (Class<?>) boolean.class);
-      aSDCControllerSingleton0.periodicControllerTask();
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      ASDCControllerSingleton aSDCControllerSingleton0 = new ASDCControllerSingleton();
-      Object object0 = PrivateAccess.callMethod((Class<ASDCControllerSingleton>) ASDCControllerSingleton.class, aSDCControllerSingleton0, "terminate");
-      assertNull(object0);
-  }
-
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      ASDCControllerSingleton aSDCControllerSingleton0 = new ASDCControllerSingleton();
-      aSDCControllerSingleton0.periodicControllerTask();
-  }
-}