summaryrefslogtreecommitdiffstats
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java10
-rw-r--r--framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java12
-rw-r--r--framework/src/main/java/org/onap/cli/fw/utils/ProcessRunner.java19
-rw-r--r--framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java27
4 files changed, 26 insertions, 42 deletions
diff --git a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java
index f01f9a21..2e63b03e 100644
--- a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java
+++ b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java
@@ -50,11 +50,7 @@ public class OnapCommandArtifactStore {
private static boolean storeReady = false;
- private static SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.US);
-
- static {
- dateFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
- }
+ private SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.US);
private static String SEPARATOR = "__";
@@ -138,7 +134,7 @@ public class OnapCommandArtifactStore {
private static OnapCommandArtifactStore store = null;
private OnapCommandArtifactStore() {
-
+ this.dateFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
}
public static OnapCommandArtifactStore getStore() {
@@ -222,7 +218,7 @@ public class OnapCommandArtifactStore {
searchPattern += SEPARATOR;
- if (category != null && !namePattern.isEmpty()) {
+ if (category != null && !category.isEmpty()) {
searchPattern += category;
} else {
searchPattern += "*";
diff --git a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
index 71cd245f..4fc2508a 100644
--- a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
+++ b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
@@ -43,11 +43,7 @@ public class OnapCommandExecutionStore {
private static boolean storeReady = false;
- private static SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.US);
-
- static {
- dateFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
- }
+ private SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.US);
private static String SEPARATOR = "__";
@@ -170,7 +166,7 @@ public class OnapCommandExecutionStore {
private static OnapCommandExecutionStore store = null;
private OnapCommandExecutionStore() {
-
+ this.dateFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
}
public static OnapCommandExecutionStore getStore() {
@@ -306,9 +302,7 @@ public class OnapCommandExecutionStore {
for (String dir: dirs) {
list.add(this.makeExecution(dir));
}
- } catch (IOException e) {
- throw new OnapCommandExecutionFailed(e, "Failed to search the executions");
- } catch (InterruptedException e) {
+ } catch (Exception e) {
throw new OnapCommandExecutionFailed(e, "Failed to search the executions");
}
diff --git a/framework/src/main/java/org/onap/cli/fw/utils/ProcessRunner.java b/framework/src/main/java/org/onap/cli/fw/utils/ProcessRunner.java
index b373a913..9b896230 100644
--- a/framework/src/main/java/org/onap/cli/fw/utils/ProcessRunner.java
+++ b/framework/src/main/java/org/onap/cli/fw/utils/ProcessRunner.java
@@ -144,23 +144,4 @@ public class ProcessRunner {
public String getError() {
return this.error;
}
-
- public static void main(String[] args) {
- try {
- ProcessRunner pr = new ProcessRunner("dir", null);
- pr.run();
- System.out.println(pr.getOutput());
- System.out.println(pr.getError());
- System.out.println(pr.getExitCode());
-
- pr = new ProcessRunner(new String [] {"dir", "c:"}, null);
- pr.run();
- System.out.println(pr.getOutput());
- System.out.println(pr.getError());
- System.out.println(pr.getExitCode());
-
- } catch (InterruptedException | IOException e) {
- e.printStackTrace();
- }
- }
} \ No newline at end of file
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 69b718d4..df94d594 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
@@ -145,13 +145,6 @@ public class OnapCommandUtilsTest {
}
@Test
- public void replaceLineForSpecialValues_envVariable() {
- String replacedLine = OnapCommandUtils.replaceLineForSpecialValues("$s{env:USER}");
-
- assertEquals(System.getenv("USER"), replacedLine);
- }
-
- @Test
public void replaceLineForSpecialValues_multipleVariables() {
String replacedLine = OnapCommandUtils.replaceLineForSpecialValues("$s{A} $s{B}");
@@ -485,6 +478,26 @@ public class OnapCommandUtilsTest {
}
}
+ @Test
+ public void testProcessRunner() {
+ try {
+ ProcessRunner pr = new ProcessRunner("dir", null);
+ pr.run();
+ System.out.println(pr.getOutput());
+ System.out.println(pr.getError());
+ System.out.println(pr.getExitCode());
+
+ pr = new ProcessRunner(new String [] {"dir", "c:"}, null);
+ pr.run();
+ System.out.println(pr.getOutput());
+ System.out.println(pr.getError());
+ System.out.println(pr.getExitCode());
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
private void mockPrintMethodException() {
new MockUp<OnapCommandResult>() {
boolean isMock = true;