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

diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/adapter/TimestampXMLAdapterESTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/adapter/TimestampXMLAdapterESTest.java
deleted file mode 100644
index ea3238916e..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/adapter/TimestampXMLAdapterESTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Dec 14 15:14:31 GMT 2016
- */
-
-package org.openecomp.mso.requestsdb.adapter;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-import java.sql.Timestamp;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.requestsdb.adapter.TimestampXMLAdapter;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class TimestampXMLAdapterESTest extends TimestampXMLAdapterESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      TimestampXMLAdapter timestampXMLAdapter0 = new TimestampXMLAdapter();
-      Long long0 = new Long((-3027L));
-      Timestamp timestamp0 = timestampXMLAdapter0.unmarshal(long0);
-      Long long1 = timestampXMLAdapter0.marshal(timestamp0);
-      assertTrue(long1.equals((Object)long0));
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      TimestampXMLAdapter timestampXMLAdapter0 = new TimestampXMLAdapter();
-      Long long0 = new Long(861L);
-      Timestamp timestamp0 = timestampXMLAdapter0.unmarshal(long0);
-      Long long1 = timestampXMLAdapter0.marshal(timestamp0);
-      assertEquals(861L, (long)long1);
-  }
-
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      TimestampXMLAdapter timestampXMLAdapter0 = new TimestampXMLAdapter();
-      try { 
-        timestampXMLAdapter0.marshal((Timestamp) null);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.requestsdb.adapter.TimestampXMLAdapter", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test3()  throws Throwable  {
-      TimestampXMLAdapter timestampXMLAdapter0 = new TimestampXMLAdapter();
-      Timestamp timestamp0 = timestampXMLAdapter0.unmarshal((Long) null);
-      Long long0 = timestampXMLAdapter0.marshal(timestamp0);
-      assertEquals(0L, (long)long0);
-  }
-
-  @Test(timeout = 4000)
-  public void test4()  throws Throwable  {
-      TimestampXMLAdapter timestampXMLAdapter0 = new TimestampXMLAdapter();
-      Long long0 = new Long(497L);
-      Timestamp timestamp0 = timestampXMLAdapter0.unmarshal(long0);
-      Long long1 = timestampXMLAdapter0.marshal(timestamp0);
-      assertEquals(497L, (long)long1);
-  }
-}