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

diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomizationESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomizationESTest.java
deleted file mode 100644
index 2f0a1c85ae..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomizationESTest.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Feb 22 09:34:38 GMT 2017
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import java.sql.Timestamp;
-import java.time.Instant;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.mock.java.time.MockInstant;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
-public class AllottedResourceCustomizationESTest extends AllottedResourceCustomizationESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelVersion("T2<n67gDL");
-      String string0 = allottedResourceCustomization0.getModelVersion();
-      assertEquals("T2<n67gDL", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelUuid("/jt");
-      String string0 = allottedResourceCustomization0.getModelUuid();
-      assertEquals("/jt", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelName("Pf");
-      String string0 = allottedResourceCustomization0.getModelName();
-      assertEquals("Pf", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelInvariantUuid("");
-      String string0 = allottedResourceCustomization0.getModelInvariantUuid();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelInstanceName("modelName=null,modelVersion=null,version=null,modelUuid=null,modelInvariantUuid=null,modelCustomizationUuid=null,modelInstanceName=null,description=null,modelInstanceName=null,created=null");
-      String string0 = allottedResourceCustomization0.getModelInstanceName();
-      assertEquals("modelName=null,modelVersion=null,version=null,modelUuid=null,modelInvariantUuid=null,modelCustomizationUuid=null,modelInstanceName=null,description=null,modelInstanceName=null,created=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelCustomizationUuid("(;CXN3pGApF720T|Z");
-      String string0 = allottedResourceCustomization0.getModelCustomizationUuid();
-      assertEquals("(;CXN3pGApF720T|Z", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setDescription("Pf");
-      String string0 = allottedResourceCustomization0.getDescription();
-      assertEquals("Pf", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setDescription("");
-      String string0 = allottedResourceCustomization0.getDescription();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      Instant instant0 = MockInstant.now();
-      Timestamp timestamp0 = Timestamp.from(instant0);
-      allottedResourceCustomization0.setCreated(timestamp0);
-      Timestamp timestamp1 = allottedResourceCustomization0.getCreated();
-      assertEquals(320000000, timestamp1.getNanos());
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getModelUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.toString();
-      assertEquals("modelName=null,modelVersion=null,version=null,modelUuid=null,modelInvariantUuid=null,modelCustomizationUuid=null,modelInstanceName=null,description=null,modelInstanceName=null,created=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelUuid("");
-      String string0 = allottedResourceCustomization0.getModelUuid();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getModelCustomizationUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getModelVersion();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      Timestamp timestamp0 = new Timestamp(0L);
-      allottedResourceCustomization0.setCreated(timestamp0);
-      Timestamp timestamp1 = allottedResourceCustomization0.getCreated();
-      assertEquals(0, timestamp1.getNanos());
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getModelInstanceName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelVersion("");
-      String string0 = allottedResourceCustomization0.getModelVersion();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getDescription();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelName("");
-      String string0 = allottedResourceCustomization0.getModelName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelInstanceName("");
-      String string0 = allottedResourceCustomization0.getModelInstanceName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getModelName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      String string0 = allottedResourceCustomization0.getModelInvariantUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelInvariantUuid("JxwW-uj$dU[pMX`|;GM");
-      String string0 = allottedResourceCustomization0.getModelInvariantUuid();
-      assertEquals("JxwW-uj$dU[pMX`|;GM", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      Timestamp timestamp0 = allottedResourceCustomization0.getCreated();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
-      allottedResourceCustomization0.setModelCustomizationUuid("");
-      String string0 = allottedResourceCustomization0.getModelCustomizationUuid();
-      assertEquals("", string0);
-  }
-}