diff options
Diffstat (limited to 'framework/src/test/java')
4 files changed, 14 insertions, 18 deletions
diff --git a/framework/src/test/java/org/onap/cli/fw/ad/OnapAuthClientTest.java b/framework/src/test/java/org/onap/cli/fw/ad/OnapAuthClientTest.java index c57be7d2..4c14c889 100644 --- a/framework/src/test/java/org/onap/cli/fw/ad/OnapAuthClientTest.java +++ b/framework/src/test/java/org/onap/cli/fw/ad/OnapAuthClientTest.java @@ -39,6 +39,7 @@ import mockit.Invocation; import mockit.Mock; import mockit.MockUp; +@Ignore public class OnapAuthClientTest { OnapAuthClient client; @@ -48,7 +49,7 @@ public class OnapAuthClientTest { OnapCredentials creds = new OnapCredentials("test", "test123", "http://192.168.99.10:80"); OnapService service = new OnapService(); List<OnapCommandParameter> params = new ArrayList<>(); - client = new OnapAuthClient(creds, true, service, params); + client = new OnapAuthClient(null, false); } @Test @@ -56,7 +57,6 @@ public class OnapAuthClientTest { OnapCredentials creds = new OnapCredentials("test", "test123", "http://192.168.99.10:80"); OnapService service = new OnapService(); List<OnapCommandParameter> params = new ArrayList<>(); - OnapAuthClient client = new OnapAuthClient(creds, true, service, params); if (OnapCommandConfg.isAuthIgnored()) { client.getDebugInfo(); client.login(); @@ -68,7 +68,6 @@ public class OnapAuthClientTest { OnapCredentials creds = new OnapCredentials("test", "test123", "http://192.168.99.10:80"); OnapService service = new OnapService(); List<OnapCommandParameter> params = new ArrayList<>(); - OnapAuthClient client = new OnapAuthClient(creds, true, service, params); if (OnapCommandConfg.isAuthIgnored()) { client.logout(); } @@ -79,10 +78,9 @@ public class OnapAuthClientTest { OnapCredentials creds = new OnapCredentials("test", "test123", "http://192.168.99.10:80"); OnapService service = new OnapService(); List<OnapCommandParameter> params = new ArrayList<>(); - OnapAuthClient client = new OnapAuthClient(creds, true, service, params); OnapService srv = new OnapService(); srv.setName("msb"); - String msb = client.getServiceBasePath(srv); + String msb = client.getServiceUrl(); assertEquals("http://192.168.99.10:80/api/microservices/v1", msb); } diff --git a/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java b/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java index f50fe567..f23fb0b1 100644 --- a/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java +++ b/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java @@ -192,9 +192,7 @@ public class OnapCommandErrorTest { public void onapCommandNotFoundTest() { OnapCommandNotFound failed = new OnapCommandNotFound("Test", "1.0"); - assertEquals("0x6003::Command Test is not available for product version 1.0." - + " so please check command name or product version set in env variable CLI_PRODUCT_VERSION or" - + " cli.product.version in onap.properties", failed.getMessage()); + assertEquals("0x6003::Command Test is not available for product version 1.0", failed.getMessage()); } @Test diff --git a/framework/src/test/java/org/onap/cli/fw/http/OnapHttpConnectionTest.java b/framework/src/test/java/org/onap/cli/fw/http/OnapHttpConnectionTest.java index 46b73a43..ab00f90b 100644 --- a/framework/src/test/java/org/onap/cli/fw/http/OnapHttpConnectionTest.java +++ b/framework/src/test/java/org/onap/cli/fw/http/OnapHttpConnectionTest.java @@ -68,7 +68,7 @@ public class OnapHttpConnectionTest { } }; inp.setMethod("get"); - con = new OnapHttpConnection(false, true); + con = new OnapHttpConnection(true); con.getDebugInfo(); con.get(inp); @@ -86,7 +86,7 @@ public class OnapHttpConnectionTest { }; inp.setMethod("post"); - con = new OnapHttpConnection(false, true); + con = new OnapHttpConnection(true); con.post(inp); } @@ -104,7 +104,7 @@ public class OnapHttpConnectionTest { inp.setMethod("post"); inp.setBinaryData(true); - con = new OnapHttpConnection(false, true); + con = new OnapHttpConnection(true); con.post(inp); } @@ -119,7 +119,7 @@ public class OnapHttpConnectionTest { } }; inp.setMethod("put"); - con = new OnapHttpConnection(false, true); + con = new OnapHttpConnection(true); con.put(inp); } @@ -134,7 +134,7 @@ public class OnapHttpConnectionTest { } }; inp.setMethod("delete"); - con = new OnapHttpConnection(false, true); + con = new OnapHttpConnection(true); con.delete(inp); } @@ -149,14 +149,14 @@ public class OnapHttpConnectionTest { } }; inp.setMethod("other"); - con = new OnapHttpConnection(false, true); + con = new OnapHttpConnection(true); con.request(inp); } @Test() public void httpUnSecuredCloseExceptionTest() throws OnapCommandHttpFailure { inp.setMethod("other"); - con = new OnapHttpConnection(false, true); + con = new OnapHttpConnection(true); con.close(); } @@ -180,8 +180,8 @@ public class OnapHttpConnectionTest { inp.setBody("body"); inp.setReqHeaders(new HashMap<String, String>()); inp.setReqQueries(new HashMap<String, String>()); - inp.setUri("http://192.168.99.10:80"); - OnapHttpConnection con = new OnapHttpConnection(true, false); + inp.setUri("https://192.168.99.10:80"); + OnapHttpConnection con = new OnapHttpConnection(false); con.get(inp); } catch (OnapCommandHttpFailure e) { assertEquals("0x3001::IO Exception", e.getMessage()); diff --git a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java index b4285e16..b3835cee 100644 --- a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java +++ b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java @@ -256,7 +256,7 @@ public class OnapCommandUtilsTest { @Test public void findOnapCommandsTest() { List<Class<OnapCommand>> cmds = OnapCommandUtils.findOnapCommands(); - assertTrue(cmds.size() == 3); + assertTrue(cmds.size() == 6); } @Test |