summaryrefslogtreecommitdiffstats
path: root/framework/src/test
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-09-26 10:04:10 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-11-14 14:38:52 +0530
commit39f345954434553d10e0cea114e15e0521ec9471 (patch)
tree652c0dae69f8238c41f903d9697160e3b3ed2960 /framework/src/test
parent8e14f39a1c41a2b5bf793877926b312e4b6102d4 (diff)
Migrate onap-cli-schema into open-cli-schema
Issue-Id: CLI-66 Change-Id: I719719194bc5f21f4316380e606ce1a58f0f046c Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'framework/src/test')
-rw-r--r--framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java4
-rw-r--r--framework/src/test/java/org/onap/cli/fw/conf/OnapCommandConfgTest.java2
-rw-r--r--framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java2
-rw-r--r--framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml (renamed from framework/src/test/resources/onap-cli-schema/sample-test1-schema-http.yaml)0
-rw-r--r--framework/src/test/resources/sample-cmd-test-help.txt2
-rw-r--r--framework/src/test/resources/sample-test-schema-http.yaml2
-rw-r--r--framework/src/test/resources/sample-test-schema.yaml2
7 files changed, 7 insertions, 7 deletions
diff --git a/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java b/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java
index 4f5c95e2..d34f89c2 100644
--- a/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java
@@ -42,10 +42,10 @@ public class OnapCommandRegistrarTest {
}
private void createDir() {
- URL url = OnapCommandRegistrarTest.class.getClassLoader().getResource("onap-cli-schema");
+ URL url = OnapCommandRegistrarTest.class.getClassLoader().getResource("open-cli-schema");
if (url != null) {
String path = url.getPath();
- path = path.replaceFirst("onap-cli-schema", "data");
+ path = path.replaceFirst("open-cli-schema", "data");
File file = new File(path);
if (!file.exists()) {
file.mkdir();
diff --git a/framework/src/test/java/org/onap/cli/fw/conf/OnapCommandConfgTest.java b/framework/src/test/java/org/onap/cli/fw/conf/OnapCommandConfgTest.java
index 7d58a6f4..1a677707 100644
--- a/framework/src/test/java/org/onap/cli/fw/conf/OnapCommandConfgTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/conf/OnapCommandConfgTest.java
@@ -33,7 +33,7 @@ public class OnapCommandConfgTest {
@Test
public void isAuthIgnoredTest() throws IOException {
Properties prps = new Properties();
- prps.load(OnapCommandConfg.class.getClassLoader().getResourceAsStream("onap.properties"));
+ prps.load(OnapCommandConfg.class.getClassLoader().getResourceAsStream("open-cli.properties"));
boolean auth = OnapCommandConfg.isAuthIgnored();
Assert.assertTrue(auth == Boolean.valueOf(prps.getProperty("cli.ignore_auth")));
Assert.assertTrue(OnapCommandConfg.isCookiesBasedAuth() == Boolean
diff --git a/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java b/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java
index a8df9979..d8745989 100644
--- a/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java
@@ -55,7 +55,7 @@ public class ValidateSchemaTest {
protected void run() throws OnapCommandException {}
};
OnapCommandUtils.loadSchema(cmd,
- ValidateSchemaTest.class.getClassLoader().getResource("onap.properties").getFile(),
+ ValidateSchemaTest.class.getClassLoader().getResource("open-cli.properties").getFile(),
true, true);
}
diff --git a/framework/src/test/resources/onap-cli-schema/sample-test1-schema-http.yaml b/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml
index 21f863b6..21f863b6 100644
--- a/framework/src/test/resources/onap-cli-schema/sample-test1-schema-http.yaml
+++ b/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml
diff --git a/framework/src/test/resources/sample-cmd-test-help.txt b/framework/src/test/resources/sample-cmd-test-help.txt
index 3d3d2415..63b5decc 100644
--- a/framework/src/test/resources/sample-cmd-test-help.txt
+++ b/framework/src/test/resources/sample-cmd-test-help.txt
@@ -20,7 +20,7 @@ where,
default, it is read from environment variable
HOST_PASSWORD. Secured.
-m | --host-url Onap MSB url. It is of type URL. By default, it
- is read from environment variable ONAP_MSB_URL.
+ is read from environment variable OPEN_MSB_URL.
-h | --help Onap command help message. It is of type STRING.
By default, it is false.
-v | --version Onap command service version. It is of type
diff --git a/framework/src/test/resources/sample-test-schema-http.yaml b/framework/src/test/resources/sample-test-schema-http.yaml
index 87918792..9bfa2a53 100644
--- a/framework/src/test/resources/sample-test-schema-http.yaml
+++ b/framework/src/test/resources/sample-test-schema-http.yaml
@@ -1,7 +1,7 @@
open_cli_schema_version: 1.0
name: sample-create-http
description: Register microservice into Onap
-version: onap-1.0
+version: cli-1.0
service:
name: msb
version: v1
diff --git a/framework/src/test/resources/sample-test-schema.yaml b/framework/src/test/resources/sample-test-schema.yaml
index 98964a60..092e0e75 100644
--- a/framework/src/test/resources/sample-test-schema.yaml
+++ b/framework/src/test/resources/sample-test-schema.yaml
@@ -1,7 +1,7 @@
open_cli_schema_version: 1.0
name: sample-test
description: Onap sample command to test the command features
-version: onap-1.0
+version: cli-1.0
service:
name: sample
version: v1