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

diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatFilesESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatFilesESTest.java
deleted file mode 100644
index ceb7f3b57c..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatFilesESTest.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:17:06 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import java.sql.Timestamp;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.junit.runner.RunWith;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class HeatFilesESTest extends HeatFilesESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setVnfResourceId(1);
-      int int0 = heatFiles0.getVnfResourceId();
-      assertEquals(1, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setVnfResourceId((-1));
-      int int0 = heatFiles0.getVnfResourceId();
-      assertEquals((-1), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setId(1401);
-      int int0 = heatFiles0.getId();
-      assertEquals(1401, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setId((-356));
-      int int0 = heatFiles0.getId();
-      assertEquals((-356), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setFileName("~%Ab#a%tf");
-      String string0 = heatFiles0.getFileName();
-      assertEquals("~%Ab#a%tf", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setFileName("");
-      String string0 = heatFiles0.getFileName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setFileBody("M9]V'AWK/44+BD");
-      String string0 = heatFiles0.getFileBody();
-      assertEquals("M9]V'AWK/44+BD", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setFileBody("");
-      String string0 = heatFiles0.getFileBody();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setDescription("~%Ab#a%tf");
-      String string0 = heatFiles0.getDescription();
-      assertEquals("~%Ab#a%tf", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setDescription("");
-      String string0 = heatFiles0.getDescription();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      Timestamp timestamp0 = new Timestamp(0L);
-      heatFiles0.setCreated(timestamp0);
-      Timestamp timestamp1 = heatFiles0.getCreated();
-      assertEquals("1970-01-01 00:00:00.0", timestamp1.toString());
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcUuid("g$ vwC-q.`GT#b[<C");
-      String string0 = heatFiles0.getAsdcUuid();
-      assertEquals("g$ vwC-q.`GT#b[<C", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcUuid("");
-      String string0 = heatFiles0.getAsdcUuid();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcResourceName("");
-      String string0 = heatFiles0.getAsdcResourceName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcLabel("ID=0, description=null, fileName=null, fileBody=null, asdcResourceName=null, vnfResourceId=0");
-      String string0 = heatFiles0.getAsdcLabel();
-      assertEquals("ID=0, description=null, fileName=null, fileBody=null, asdcResourceName=null, vnfResourceId=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      Timestamp timestamp0 = new Timestamp(0L);
-      heatFiles0.setCreated(timestamp0);
-      String string0 = heatFiles0.toString();
-      assertEquals("ID=0, description=null, fileName=null, fileBody=null, asdcResourceName=null,created=1/1/70 12:00 AM, vnfResourceId=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcResourceName("ID=0, description=null, fileName=null, fileBody=null, asdcResourceName=null, vnfResourceId=0");
-      String string0 = heatFiles0.toString();
-      assertEquals("ID=0, description=null, fileName=null, fileBody=null,asdcResourceName=ID=0, description=null, fileName=null, fileBody=null, asdcResourceName=null, vnfResourceId=0, vnfResourceId=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setDescription(".");
-      String string0 = heatFiles0.toString();
-      assertEquals("ID=0, description=., fileName=null, fileBody=null, asdcResourceName=null, vnfResourceId=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcResourceName("+^hG");
-      String string0 = heatFiles0.getAsdcResourceName();
-      assertEquals("+^hG", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setFileName("");
-      String string0 = heatFiles0.toString();
-      assertEquals("ID=0, description=null,fileName=, fileBody=null, asdcResourceName=null, vnfResourceId=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      int int0 = heatFiles0.getVnfResourceId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      Timestamp timestamp0 = heatFiles0.getCreated();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      String string0 = heatFiles0.getDescription();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      Timestamp timestamp0 = new Timestamp(2247L);
-      heatFiles0.setCreated(timestamp0);
-      Timestamp timestamp1 = heatFiles0.getCreated();
-      assertEquals(247000000, timestamp1.getNanos());
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setFileBody("");
-      String string0 = heatFiles0.toString();
-      assertEquals("ID=0, description=null, fileName=null,fileBody=, asdcResourceName=null, vnfResourceId=0", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      String string0 = heatFiles0.getAsdcLabel();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test26()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      String string0 = heatFiles0.getFileName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test27()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      int int0 = heatFiles0.getId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test28()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      String string0 = heatFiles0.getFileBody();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test29()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      String string0 = heatFiles0.getAsdcResourceName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test30()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      String string0 = heatFiles0.getAsdcUuid();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test31()  throws Throwable  {
-      HeatFiles heatFiles0 = new HeatFiles();
-      heatFiles0.setAsdcLabel("");
-      String string0 = heatFiles0.getAsdcLabel();
-      assertEquals("", string0);
-  }
-}