Improved test coverage.

Reorganized some of the tests due to comments

Issue-ID: SDC-2238

Change-Id: I6b3bcc674c792f3c5c06e851a2cfe2d92eead07c
Signed-off-by: James Guistwite <jguistwite@iconectiv.com>

3 files changed, 4 insertions, 42 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/src/test/java/org/openecomp/core/externaltesting/impl/ExternalTestingManagerImplTests.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/src/test/java/org/openecomp/core/externaltesting/impl/ExternalTestingManagerImplTest.java
index 2233f85ccf..04ddf6e2d4 100644
--- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/src/test/java/org/openecomp/core/externaltesting/impl/ExternalTestingManagerImplTests.java
+++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/src/test/java/org/openecomp/core/externaltesting/impl/ExternalTestingManagerImplTest.java
@@ -48,7 +48,7 @@ import java.nio.charset.Charset;
 import java.util.*;
 
 @RunWith(MockitoJUnitRunner.class)
-public class ExternalTestingManagerImplTests {
+public class ExternalTestingManagerImplTest {
 
   @Mock
   private RestTemplate restTemplate;
diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/src/test/java/org/openecomp/core/externaltesting/impl/ExternalTestingTestSuite.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/src/test/java/org/openecomp/core/externaltesting/impl/ExternalTestingTestSuite.java
index d9e4612774..6d464522b7 100644
--- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/src/test/java/org/openecomp/core/externaltesting/impl/ExternalTestingTestSuite.java
+++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/src/test/java/org/openecomp/core/externaltesting/impl/ExternalTestingTestSuite.java
@@ -21,8 +21,8 @@ import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-    ExternalTestingManagerImplTests.class,
-    ConfigurationTests.class
+    ExternalTestingManagerImplTest.class,
+    TestingAccessConfigTest.class
 })
 public class ExternalTestingTestSuite {
   // nothing to do - just a placeholder.
diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/src/test/java/org/openecomp/core/externaltesting/impl/ConfigurationTests.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/src/test/java/org/openecomp/core/externaltesting/impl/TestingAccessConfigTest.java
index 05fc9e3938..698133b08e 100644
--- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/src/test/java/org/openecomp/core/externaltesting/impl/ConfigurationTests.java
+++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/src/test/java/org/openecomp/core/externaltesting/impl/TestingAccessConfigTest.java
@@ -27,18 +27,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 
-public class ConfigurationTests {
-
-  @Test
-  public void testClientConfig() {
-    // a brain dead test of the setter and getter.
-    // future tests for more complex config to come.
-    ClientConfiguration cc = new ClientConfiguration();
-    cc.setEnabled(true);
-    Assert.assertTrue("client configuration setter", cc.isEnabled());
-    cc.setEnabled(false);
-    Assert.assertFalse("client configuration setter", cc.isEnabled());
-  }
+public class TestingAccessConfigTest {
 
   @Test
   public void testConfig() throws Exception {
@@ -50,31 +39,4 @@ public class ConfigurationTests {
     }
   }
 
-  @Test
-  public void testEndpointDefinition() {
-    RemoteTestingEndpointDefinition def = new RemoteTestingEndpointDefinition();
-    def.setId("vtp");
-    def.setEnabled(true);
-    def.setTitle("VTP");
-    def.setApiKey("FOOBARBAZ");
-    def.setUrl("http://example.com/vtptesting");
-    def.setScenarioFilter("c.*");
-
-    RemoteTestingEndpointDefinition def2 = new RemoteTestingEndpointDefinition();
-    def2.setId("vtp");
-    def2.setEnabled(true);
-    def2.setTitle("VTP");
-    def2.setUrl("http://example.com/vtptesting");
-    def2.setApiKey("FOOBARBAZ");
-    def2.setScenarioFilter("c.*");
-
-    Assert.assertEquals("code", "VTP", def.getTitle());
-    Assert.assertEquals("API keys equals", def.getApiKey(), def2.getApiKey());
-    Assert.assertEquals("code equals", def.getTitle(), def2.getTitle());
-    Assert.assertEquals("url equals", def.getUrl(), def2.getUrl());
-
-    boolean matches = def.getScenarioFilterPattern().matcher("certification").matches();
-    Assert.assertTrue("pattern", matches);
-
-  }
 }