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

diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateParamESTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateParamESTest.java
deleted file mode 100644
index f084204170..0000000000
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/beans/HeatTemplateParamESTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Mon Nov 14 08:22:57 GMT 2016
- */
-
-package org.openecomp.mso.db.catalog.beans;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-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 HeatTemplateParamESTest extends HeatTemplateParamESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setRequired(true);
-      boolean boolean0 = heatTemplateParam0.isRequired();
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setParamType("");
-      String string0 = heatTemplateParam0.getParamType();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setParamName("c_(T_3dD%");
-      String string0 = heatTemplateParam0.getParamName();
-      assertEquals("c_(T_3dD%", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setParamName("");
-      String string0 = heatTemplateParam0.getParamName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setParamAlias("Param=c_(T_3dD%,type=null,required=false,paramAlias=null");
-      String string0 = heatTemplateParam0.getParamAlias();
-      assertEquals("Param=c_(T_3dD%,type=null,required=false,paramAlias=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setParamAlias("");
-      String string0 = heatTemplateParam0.getParamAlias();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setId(10);
-      int int0 = heatTemplateParam0.getId();
-      assertEquals(10, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setId((-5343));
-      int int0 = heatTemplateParam0.getId();
-      assertEquals((-5343), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setHeatTemplateId(10);
-      int int0 = heatTemplateParam0.getHeatTemplateId();
-      assertEquals(10, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      String string0 = heatTemplateParam0.toString();
-      assertEquals("Param=null,type=null,required=false,paramAlias=null", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      int int0 = heatTemplateParam0.getHeatTemplateId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      String string0 = heatTemplateParam0.getParamType();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      String string0 = heatTemplateParam0.getParamAlias();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      boolean boolean0 = heatTemplateParam0.isRequired();
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setHeatTemplateId((-1));
-      int int0 = heatTemplateParam0.getHeatTemplateId();
-      assertEquals((-1), int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      int int0 = heatTemplateParam0.getId();
-      assertEquals(0, int0);
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      String string0 = heatTemplateParam0.getParamName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      HeatTemplateParam heatTemplateParam0 = new HeatTemplateParam();
-      heatTemplateParam0.setParamType("(pA6");
-      String string0 = heatTemplateParam0.getParamType();
-      assertEquals("(pA6", string0);
-  }
-}