aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/java/org
diff options
context:
space:
mode:
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2017-09-19 18:24:06 +0200
committerDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2017-09-19 18:24:06 +0200
commit2b15edd224cc6dcff90e170959102eb1a1bb1a50 (patch)
tree4d43f647565300b70015f4366a0416c98ca40e15 /src/test/java/org
parenteaea5ad06aa510cbf36bb95c920932ab6de0e6de (diff)
Removal of useless files & bugfix
Removal of DCAE useless files, and bugfixes SDC calls(+CldsDAO bug), and insertion of the search engine for Model Properties window in UI Change-Id: Ia68117bb917807eaf8e8e317f391f90b6d948135 Issue-ID: CLAMP-54 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src/test/java/org')
-rw-r--r--src/test/java/org/onap/clamp/clds/it/DcaeIT.java62
-rw-r--r--src/test/java/org/onap/clamp/clds/it/SdcIT.java16
2 files changed, 9 insertions, 69 deletions
diff --git a/src/test/java/org/onap/clamp/clds/it/DcaeIT.java b/src/test/java/org/onap/clamp/clds/it/DcaeIT.java
deleted file mode 100644
index 4f0ebb4e2..000000000
--- a/src/test/java/org/onap/clamp/clds/it/DcaeIT.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-
-package org.onap.clamp.clds.it;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.clamp.clds.AbstractIT;
-import org.onap.clamp.clds.client.req.DcaeReq;
-import org.onap.clamp.clds.model.CldsEvent;
-import org.onap.clamp.clds.model.prop.ModelProperties;
-import org.onap.clamp.clds.util.ResourceFileUtil;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * Test DCAE API in org.onap.clamp.ClampDesigner.client package - replicate DCAE
- * Delegates in test.
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application-no-camunda.properties")
-public class DcaeIT extends AbstractIT {
-
- @Test
- public void testDcaeReq() throws Exception {
- String modelProp = ResourceFileUtil.getResourceAsString("example/modelProp.json");
- String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnProp.json");
- String modelName = "example-model";
- String controlName = "ClosedLoop-FRWL-SIG-1582f840-2881-11e6-b4ec-005056a9d756";
-
- ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT, true, modelBpmnProp,
- modelProp);
- String dcaeReq = DcaeReq.format(refProp, prop);
-
- System.out.println("dcaeReq=" + dcaeReq);
- System.out.println("dcaeUrl=" + System.getProperty("CLDS_DCAE_URL") + "/" + controlName);
- }
-
-}
diff --git a/src/test/java/org/onap/clamp/clds/it/SdcIT.java b/src/test/java/org/onap/clamp/clds/it/SdcIT.java
index 025420ff1..8883af254 100644
--- a/src/test/java/org/onap/clamp/clds/it/SdcIT.java
+++ b/src/test/java/org/onap/clamp/clds/it/SdcIT.java
@@ -26,6 +26,7 @@ package org.onap.clamp.clds.it;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+
import org.onap.clamp.clds.AbstractIT;
import org.onap.clamp.clds.client.SdcCatalogServices;
import org.onap.clamp.clds.client.req.SdcReq;
@@ -46,7 +47,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@TestPropertySource(locations = "classpath:application-no-camunda.properties")
public class SdcIT extends AbstractIT {
@Autowired
- private RefProp refProp;
+ private RefProp refProp;
@Autowired
private SdcCatalogServices sdcCatalogServices;
@@ -63,13 +64,14 @@ public class SdcIT extends AbstractIT {
String modelName = "example-model06";
String controlName = "ClosedLoop-FRWL-SIG04-1582f840-test-test-1234-005056a9d756";
String docText = ResourceFileUtil.getResourceAsString("example/templateProp.json");
- ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT, true, modelBpmnProp,
- modelProp);
+ ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT,
+ true, modelBpmnProp, modelProp);
String blueprint = SdcReq.formatBlueprint(refProp, prop, docText);
System.out.println("blueprint=" + blueprint);
- // assertEquals(blueprint, "");
+ //assertEquals(blueprint, "");
}
+
@Test
public void testTcaBlueprint() throws Exception {
String modelProp = ResourceFileUtil.getResourceAsString("example/modelPropForPolicy.json");
@@ -77,10 +79,10 @@ public class SdcIT extends AbstractIT {
String modelName = "example-model06";
String controlName = "ClosedLoop-FRWL-SIG04-1582f840-test-test-1234-005056a9d756";
String docText = ResourceFileUtil.getResourceAsString("example/templatePropForTca.json");
- ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT, true, modelBpmnProp,
- modelProp);
+ ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT,
+ true, modelBpmnProp, modelProp);
String blueprint = SdcReq.formatBlueprint(refProp, prop, docText);
System.out.println("blueprint=" + blueprint);
- // assertEquals(blueprint, "");
+ //assertEquals(blueprint, "");
}
}