summaryrefslogtreecommitdiffstats
path: root/vnf-sdk-function-test/src
diff options
context:
space:
mode:
authorMurali-P <murali.p@huawei.com>2017-04-06 09:44:36 +0530
committerMurali-P <murali.p@huawei.com>2017-04-06 09:44:36 +0530
commit5b735385b8c5a4163e62326182127c00040574d6 (patch)
tree611519bcb812b4bfe15f55386e7fbe40a47ec52b /vnf-sdk-function-test/src
parent9478fb474be09b01d088a4831e207e24b769d164 (diff)
Clear static checks-2
Resolved:VNFSDK-21 Change-Id: Ic9be66de339d39a9ad0f5f2e6cc2e52df76f2e3c Signed-off-by: Murali-P <murali.p@huawei.com>
Diffstat (limited to 'vnf-sdk-function-test/src')
-rw-r--r--vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/TaskExecution.java3
-rw-r--r--vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/constants/ApplicationConstants.java3
-rw-r--r--vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/Environment.java36
-rw-r--r--vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/resource/CommonManager.java6
-rw-r--r--vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/resource/CommonManagerTest.java2
-rw-r--r--vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/TaskExecutionTest.java6
6 files changed, 26 insertions, 30 deletions
diff --git a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/TaskExecution.java b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/TaskExecution.java
index f5d4711..3f044bb 100644
--- a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/TaskExecution.java
+++ b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/TaskExecution.java
@@ -106,7 +106,7 @@ public class TaskExecution {
}
}
- public void executeRobotScript(UUID envId, UUID executeId, String frameworktype) {
+ public void executeRobotScript(UUID envId, UUID executeId ) {
String nl = File.separator;
String curDir = System.getProperty(ApplicationConstants.USER_DIR);
@@ -193,7 +193,6 @@ public class TaskExecution {
}
// Form the variables for the upload, transfer and execute command
- String scriptDirName = new File(dirPath).getName();
mapValues.put("SCRIPT_DIR", dirPath);
String robotvariables = "";
diff --git a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/constants/ApplicationConstants.java b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/constants/ApplicationConstants.java
index 6db2ba3..7fcd5f7 100644
--- a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/constants/ApplicationConstants.java
+++ b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/constants/ApplicationConstants.java
@@ -18,6 +18,9 @@ package org.openo.vnfsdk.functest.constants;
public class ApplicationConstants {
+ private ApplicationConstants() {
+ }
+
public static final String USER_DIR = "user.dir";
public static final String ROBOT = "robot";
public static final String ROBOT_SPACE = "robot ";
diff --git a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/Environment.java b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/Environment.java
index 52113b6..b63e49b 100644
--- a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/Environment.java
+++ b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/externalservice/entity/Environment.java
@@ -19,51 +19,49 @@ package org.openo.vnfsdk.functest.externalservice.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
public class Environment {
-
- @JsonProperty("RemoteIp")
- private String RemoteIp;
- @JsonProperty("UserName")
- private String UserName;
+ @JsonProperty("remoteIp")
+ private String remoteIp;
- @JsonProperty("Password")
- private String Password;
+ @JsonProperty("userName")
+ private String userName;
- @JsonProperty("Path")
- private String Path;
+ @JsonProperty("password")
+ private String password;
+
+ @JsonProperty("path")
+ private String path;
public String getRemoteIp() {
- return RemoteIp;
+ return remoteIp;
}
public void setRemoteIp(String remoteIp) {
- RemoteIp = remoteIp;
+ this.remoteIp = remoteIp;
}
public String getUserName() {
- return UserName;
+ return userName;
}
public void setUserName(String userName) {
- UserName = userName;
+ this.userName = userName;
}
public String getPassword() {
- return Password;
+ return password;
}
public void setPassword(String password) {
- Password = password;
+ this.password = password;
}
public String getPath() {
- return Path;
+ return path;
}
public void setPath(String path) {
- Path = path;
+ this.path = path;
}
-
-
}
diff --git a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/resource/CommonManager.java b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/resource/CommonManager.java
index 25f4072..c867b4d 100644
--- a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/resource/CommonManager.java
+++ b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/resource/CommonManager.java
@@ -21,7 +21,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.List;
import java.util.StringTokenizer;
import java.util.UUID;
import java.util.concurrent.Callable;
@@ -169,8 +168,7 @@ public class CommonManager {
try {
final UUID envUUID = UUID.fromString(functestEnvId);
- final UUID uploadUUID = UUID.fromString(uploadId);
-
+
// generate UUID for execute
final UUID executeUUID = UUID.randomUUID();
@@ -180,7 +178,7 @@ public class CommonManager {
@Override
public Integer call() throws Exception {
- new TaskExecution().executeRobotScript(envUUID, executeUUID, frameworktype);
+ new TaskExecution().executeRobotScript(envUUID, executeUUID );
return 0;
}
});
diff --git a/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/resource/CommonManagerTest.java b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/resource/CommonManagerTest.java
index e4f59f2..a6fa27f 100644
--- a/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/resource/CommonManagerTest.java
+++ b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/resource/CommonManagerTest.java
@@ -52,7 +52,7 @@ public class CommonManagerTest {
try {
String jsonInput =
- "{\"RemoteIp\":\"192.168.4.47\",\"UserName\":\"root\",\"Password\":\"root123\", \"Path\":\"/src/test/resources\"}";
+ "{\"remoteIp\":\"192.168.4.47\",\"userName\":\"root\",\"password\":\"root123\", \"path\":\"/src/test/resources\"}";
response = commonManger.setEnvironment(jsonInput);
assertNotNull(response);
} catch(Exception e) {
diff --git a/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/TaskExecutionTest.java b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/TaskExecutionTest.java
index 31bc533..27d86bf 100644
--- a/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/TaskExecutionTest.java
+++ b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/TaskExecutionTest.java
@@ -44,9 +44,7 @@ public class TaskExecutionTest {
private String path = "src\\test\\resources";
private UUID envId = UUID.randomUUID();
private UUID executeId = UUID.randomUUID();
- private String frameworkType = "robotframework";
-
-
+
@Before
public void setUp() {
testExecution = new TaskExecution();
@@ -75,7 +73,7 @@ public class TaskExecutionTest {
}
};
try {
- testExecution.executeRobotScript(envId, executeId, frameworkType );
+ testExecution.executeRobotScript(envId, executeId );
} catch( Exception e ) {
e.printStackTrace();
}