X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fit%2FPolicyClientIT.java;h=22abb13d206a75dc1aec53c2dd3dfbe0ed43393c;hb=bc25b72025a7b92c2b1bb7a3f0cfcd9ddedba001;hp=c57ddbfd6ccb61e662c819b5e9cb8050533e42ce;hpb=608120c4b86ebf23713e14609d12883c0540e661;p=clamp.git

diff --git a/src/test/java/org/onap/clamp/clds/it/PolicyClientIT.java b/src/test/java/org/onap/clamp/clds/it/PolicyClientIT.java
index c57ddbfd..22abb13d 100644
--- a/src/test/java/org/onap/clamp/clds/it/PolicyClientIT.java
+++ b/src/test/java/org/onap/clamp/clds/it/PolicyClientIT.java
@@ -35,13 +35,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.clamp.clds.AbstractIT;
 import org.onap.clamp.clds.client.req.OperationalPolicyReq;
-import org.onap.clamp.clds.client.req.StringMatchPolicyReq;
 import org.onap.clamp.clds.client.req.TcaMPolicyReq;
 import org.onap.clamp.clds.model.CldsEvent;
 import org.onap.clamp.clds.model.prop.ModelProperties;
 import org.onap.clamp.clds.model.prop.Policy;
 import org.onap.clamp.clds.model.prop.PolicyChain;
-import org.onap.clamp.clds.model.prop.StringMatch;
 import org.onap.clamp.clds.model.prop.Tca;
 import org.onap.clamp.clds.util.ResourceFileUtil;
 import org.onap.policy.api.AttributeType;
@@ -74,24 +72,6 @@ public class PolicyClientIT extends AbstractIT {
         controlName = "ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf";
     }
 
-    private void createUpdateStringMatch(String actionCd) throws Exception {
-        ModelProperties prop = new ModelProperties(modelName, controlName, actionCd, false, modelBpmnProp, modelProp);
-        StringMatch stringMatch = prop.getType(StringMatch.class);
-        if (stringMatch.isFound()) {
-            String stringMatchPolicyRequestUuid = UUID.randomUUID().toString();
-
-            String policyJson = StringMatchPolicyReq.format(refProp, prop);
-            String correctValue = ResourceFileUtil.getResourceAsString("expected/stringmatch.json");
-            JSONAssert.assertEquals(policyJson, correctValue, true);
-            String responseMessage = "";
-            try {
-                responseMessage = policyClient.sendMicroServiceInJson(policyJson, prop, stringMatchPolicyRequestUuid);
-            } catch (Exception e) {
-                assertTrue(e.getMessage().contains("Policy send failed: PE500 "));
-            }
-        }
-    }
-
     private void createUpdateOperationalPolicy(String actionCd) throws Exception {
         ModelProperties prop = new ModelProperties(modelName, controlName, actionCd, false, modelBpmnProp, modelProp);
         Policy policy = prop.getType(Policy.class);
@@ -123,21 +103,6 @@ public class PolicyClientIT extends AbstractIT {
         }
     }
 
-    private void deleteStringMatchPolicy(String actionCd) throws Exception {
-        ModelProperties prop = new ModelProperties(modelName, controlName, actionCd, false, modelBpmnProp, modelProp);
-
-        StringMatch stringMatch = prop.getType(StringMatch.class);
-        if (stringMatch.isFound()) {
-            prop.setCurrentModelElementId(stringMatch.getId());
-            String responseMessage = "";
-            try {
-                responseMessage = policyClient.deleteMicrosService(prop);
-            } catch (Exception e) {
-                assertTrue(e.getMessage().contains("Policy delete failed: PE500 "));
-            }
-        }
-    }
-
     private void deleteOperationalPolicy(String actionCd) throws Exception {
         ModelProperties prop = new ModelProperties(modelName, controlName, actionCd, false, modelBpmnProp, modelProp);
 
@@ -166,19 +131,6 @@ public class PolicyClientIT extends AbstractIT {
         }
     }
 
-    // @Test
-    /**
-     * Temporarily disabled Test.
-     */
-    public void testCreateUpdateDeleteStringMatchPolicy() throws Exception {
-
-        createUpdateStringMatch(CldsEvent.ACTION_SUBMIT);
-
-        TimeUnit.SECONDS.sleep(20);
-
-        deleteStringMatchPolicy(CldsEvent.ACTION_DELETE);
-    }
-
     // @Test
     /**
      * Temporarily disabled Test.