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, 35 deletions

diff --git a/common/src/test/java/org/openecomp/mso/properties/MsoJsonPropertiesESTest.java b/common/src/test/java/org/openecomp/mso/properties/MsoJsonPropertiesESTest.java
deleted file mode 100644
index 0243c13c7f..0000000000
--- a/common/src/test/java/org/openecomp/mso/properties/MsoJsonPropertiesESTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 09:04:39 GMT 2016
- */
-
-package org.openecomp.mso.properties;
-
-import static org.evosuite.runtime.EvoAssertions.verifyException;
-import static org.junit.Assert.fail;
-
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
-public class MsoJsonPropertiesESTest {
-
-  @Ignore
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      MsoJsonProperties msoJsonProperties0 = null;
-      try {
-        msoJsonProperties0 = new MsoJsonProperties();
-        fail("Expecting exception: VerifyError");
-
-      } catch(VerifyError e) {
-         //
-         // (class: org/codehaus/jackson/map/MapperConfig, method: <clinit> signature: ()V) Bad type in putfield/putstatic
-         //
-         verifyException("org.codehaus.jackson.map.ObjectMapper", e);
-      }
-  }
-}