summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGitelman, Tal (tg851x) <tg851x@intl.att.com>2018-03-19 17:05:55 +0200
committerMichael Lando <ml636r@att.com>2018-03-19 16:06:16 +0000
commita5ce6e4de3dacfac916cfc3b3270a0d7f190b632 (patch)
treebf1b58594eeeba222a62d6651a2e61e01ed2fd08
parente0662081be935579d431d6c591a508cc05718b1d (diff)
Align current csit testing - fix CSIT tests
Change-Id: I63e1af740ca281da404231bb3bff67f4c94541e1 Issue-ID: SDC-1097 Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
-rw-r--r--.gitignore2
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java2
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 9c445a8b31..0bef7c0143 100644
--- a/.gitignore
+++ b/.gitignore
@@ -259,3 +259,5 @@ sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites/*
*normatives.tar.gz
/openecomp-ui/yarn.lock
+
+/openecomp-ui/yarn.lock
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
index f6cb50c5c2..0dce2a3cd9 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
@@ -2857,7 +2857,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
String value = null;
List<GetInputValueDataDefinition> getInputs = null;
boolean isValidate = true;
- if (propertyInfo.getValue() != null) {
+ if (null != propertyInfo && propertyInfo.getValue() != null) {
getInputs = propertyInfo.getGet_input();
isValidate = getInputs == null || getInputs.isEmpty();
if (isValidate) {
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java
index 5f8eeca911..599ce006fa 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java
@@ -81,8 +81,6 @@ public class ResourceRestUtils extends BaseRestUtils {
String calculateMD5 = GeneralUtility.calculateMD5Base64EncodedByString(userBodyJson);
headersMap.put(HttpHeaderEnum.Content_MD5.getValue(), calculateMD5);
HttpRequest http = new HttpRequest();
- // System.out.println(url);
- // System.out.println(userBodyJson);
RestResponse createResourceResponse = http.httpSendPost(url, userBodyJson, headersMap);
if (createResourceResponse.getErrorCode() == STATUS_CODE_CREATED) {
resourceDetails.setUUID(ResponseParser.getUuidFromResponse(createResourceResponse));