aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/java
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2020-12-10 15:10:15 +0100
committerS�bastien Determe <sebastien.determe@intl.att.com>2021-01-05 16:08:56 +0000
commit025e65f581a5e659db81e8b987b88cc5ef221d31 (patch)
treec84f6d18afa1f06c4b02b1d7a4fd8b9e83386769 /src/test/java
parent6eb2caaf09c89e92ad65d2f55e792e92833b4ca9 (diff)
Align the clamp code on policy project
Inherit from the policy integration parent + fix all checkstyle issues detected by policy checkstyle (google) config Issue-ID: POLICY-2922 Change-Id: I616846bbda8bb0f6250a842c248836c40e1068cf Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'src/test/java')
-rw-r--r--src/test/java/org/onap/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java18
-rw-r--r--src/test/java/org/onap/clamp/clds/it/AuthorizationControllerItCase.java2
-rw-r--r--src/test/java/org/onap/clamp/clds/it/config/SdcControllersConfigurationItCase.java4
-rw-r--r--src/test/java/org/onap/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java3
-rw-r--r--src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java1
-rw-r--r--src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseTest.java1
-rw-r--r--src/test/java/org/onap/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java21
-rw-r--r--src/test/java/org/onap/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java1
-rw-r--r--src/test/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandlerTest.java1
-rw-r--r--src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateFieldTest.java8
-rw-r--r--src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java2
-rw-r--r--src/test/java/org/onap/clamp/clds/util/CryptoUtilsTest.java2
-rw-r--r--src/test/java/org/onap/clamp/clds/util/JsonUtilsTest.java1
-rw-r--r--src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java5
-rw-r--r--src/test/java/org/onap/clamp/loop/LoopToJsonTest.java1
-rw-r--r--src/test/java/org/onap/clamp/loop/PolicyComponentTest.java4
-rw-r--r--src/test/java/org/onap/clamp/loop/ServiceTest.java1
-rw-r--r--src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java2
-rw-r--r--src/test/java/org/onap/clamp/policy/microservice/MicroServicePayloadTest.java7
-rw-r--r--src/test/java/org/onap/clamp/policy/pdpgroup/PdpGroupTest.java2
-rw-r--r--src/test/java/org/onap/clamp/policy/pdpgroup/PolicyModelKeyTest.java14
21 files changed, 45 insertions, 56 deletions
diff --git a/src/test/java/org/onap/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java b/src/test/java/org/onap/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java
index 06df124ce..311244f48 100644
--- a/src/test/java/org/onap/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java
+++ b/src/test/java/org/onap/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java
@@ -44,15 +44,17 @@ import org.onap.clamp.clds.util.ResourceFileUtils;
public class SdcSingleControllerConfigurationTest {
/**
- * @param fileName file for sdc controller configuration.
+ * This method loads the SDC controller configuration from a file located in the resource folder.
+ *
+ * @param fileName file for sdc controller configuration.
* @param sdcControllerName sdc controller name.
* @return instance of SdcSingleControllerConfiguration.
*/
public static SdcSingleControllerConfiguration loadControllerConfiguration(String fileName,
- String sdcControllerName) {
+ String sdcControllerName) {
InputStreamReader streamReader = new InputStreamReader(ResourceFileUtils.getResourceAsStream(fileName),
- StandardCharsets.UTF_8);
+ StandardCharsets.UTF_8);
JsonObject jsonNode = JsonUtils.GSON.fromJson(streamReader, JsonObject.class);
return new SdcSingleControllerConfiguration(jsonNode, sdcControllerName);
@@ -61,7 +63,7 @@ public class SdcSingleControllerConfigurationTest {
@Test
public final void testTheInit() throws SdcParametersException, IOException {
SdcSingleControllerConfiguration sdcConfig = loadControllerConfiguration("clds/sdc-controller-config-TLS.json",
- "sdc-controller1");
+ "sdc-controller1");
assertEquals("User", sdcConfig.getUser());
assertEquals("ThePassword", sdcConfig.getPassword());
assertEquals("consumerGroup", sdcConfig.getConsumerGroup());
@@ -72,7 +74,7 @@ public class SdcSingleControllerConfigurationTest {
assertEquals(30, sdcConfig.getPollingTimeout());
assertThat(SdcSingleControllerConfiguration.SUPPORTED_ARTIFACT_TYPES_LIST)
- .hasSameSizeAs(sdcConfig.getRelevantArtifactTypes());
+ .hasSameSizeAs(sdcConfig.getRelevantArtifactTypes());
assertEquals("ThePassword", sdcConfig.getKeyStorePassword());
assertTrue(sdcConfig.activateServerTLSAuth());
assertThat(sdcConfig.getMsgBusAddress()).contains("localhost");
@@ -81,7 +83,7 @@ public class SdcSingleControllerConfigurationTest {
@Test(expected = SdcParametersException.class)
public final void testAllRequiredParameters() throws IOException {
SdcSingleControllerConfiguration sdcConfig = loadControllerConfiguration("clds/sdc-controller-config-TLS.json",
- "sdc-controller1");
+ "sdc-controller1");
// No exception should be raised
sdcConfig.testAllRequiredParameters();
sdcConfig = loadControllerConfiguration("clds/sdc-controller-config-bad.json", "sdc-controller1");
@@ -91,7 +93,7 @@ public class SdcSingleControllerConfigurationTest {
@Test
public final void testAllRequiredParametersEmptyEncrypted() throws IOException {
SdcSingleControllerConfiguration sdcConfig = loadControllerConfiguration(
- "clds/sdc-controller-config-empty-encrypted.json", "sdc-controller1");
+ "clds/sdc-controller-config-empty-encrypted.json", "sdc-controller1");
sdcConfig.testAllRequiredParameters();
assertNull(sdcConfig.getKeyStorePassword());
}
@@ -99,7 +101,7 @@ public class SdcSingleControllerConfigurationTest {
@Test
public final void testConsumerGroupWithNull() throws IOException {
SdcSingleControllerConfiguration sdcConfig = loadControllerConfiguration("clds/sdc-controller-config-NULL.json",
- "sdc-controller1");
+ "sdc-controller1");
assertTrue(sdcConfig.getConsumerGroup() == null);
}
}
diff --git a/src/test/java/org/onap/clamp/clds/it/AuthorizationControllerItCase.java b/src/test/java/org/onap/clamp/clds/it/AuthorizationControllerItCase.java
index 207e93684..48338f17c 100644
--- a/src/test/java/org/onap/clamp/clds/it/AuthorizationControllerItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/AuthorizationControllerItCase.java
@@ -121,7 +121,7 @@ public class AuthorizationControllerItCase {
@Test
public void testIsUserPermitted() {
- assertEquals(AuthorizationController.getPrincipalName(sc),"admin");
+ assertEquals(AuthorizationController.getPrincipalName(sc), "admin");
assertTrue(auth.isUserPermitted(new SecureServicePermission("permission-type-cl", "dev", "read")));
assertTrue(auth.isUserPermitted(new SecureServicePermission("permission-type-cl-manage", "dev", "DEPLOY")));
assertTrue(auth.isUserPermitted(
diff --git a/src/test/java/org/onap/clamp/clds/it/config/SdcControllersConfigurationItCase.java b/src/test/java/org/onap/clamp/clds/it/config/SdcControllersConfigurationItCase.java
index 0c08a2e36..cfdbe7753 100644
--- a/src/test/java/org/onap/clamp/clds/it/config/SdcControllersConfigurationItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/config/SdcControllersConfigurationItCase.java
@@ -25,10 +25,8 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import com.google.gson.JsonSyntaxException;
-
import java.io.IOException;
import java.util.Map;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.onap.clamp.clds.config.sdc.SdcControllersConfiguration;
@@ -45,7 +43,7 @@ import org.springframework.test.util.ReflectionTestUtils;
*/
@RunWith(SpringRunner.class)
@SpringBootTest
-@ActiveProfiles({"clamp-default","clamp-default-user","clamp-sdc-controller"})
+@ActiveProfiles({"clamp-default", "clamp-default-user", "clamp-sdc-controller"})
public class SdcControllersConfigurationItCase {
@Autowired
diff --git a/src/test/java/org/onap/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java b/src/test/java/org/onap/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
index a8c3e58d4..a3aa8b49b 100644
--- a/src/test/java/org/onap/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
@@ -33,7 +33,6 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
-
import org.assertj.core.api.Assertions;
import org.junit.Before;
import org.junit.Test;
@@ -58,7 +57,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
-@ActiveProfiles({"clamp-default","clamp-default-user","clamp-sdc-controller"})
+@ActiveProfiles({"clamp-default", "clamp-default-user", "clamp-sdc-controller"})
public class SdcSingleControllerItCase {
private static final String CSAR_ARTIFACT_NAME = "testArtifact.csar";
diff --git a/src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java b/src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java
index 50da40049..bd0c94d52 100644
--- a/src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java
+++ b/src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertEquals;
import java.util.HashSet;
import java.util.Set;
-
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.builder.ExchangeBuilder;
diff --git a/src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseTest.java b/src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseTest.java
index fc4872c3b..c5217fdc9 100644
--- a/src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseTest.java
+++ b/src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseTest.java
@@ -26,7 +26,6 @@ package org.onap.clamp.clds.model.dcae;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.TreeSet;
-
import org.junit.Test;
public class DcaeInventoryResponseTest {
diff --git a/src/test/java/org/onap/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java b/src/test/java/org/onap/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
index 560f54cf4..86b3497c6 100644
--- a/src/test/java/org/onap/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
+++ b/src/test/java/org/onap/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
@@ -25,7 +25,6 @@ package org.onap.clamp.clds.model.jsontype;
import static org.assertj.core.api.Assertions.assertThat;
import com.google.gson.JsonObject;
-
import org.hibernate.HibernateException;
import org.junit.Test;
import org.onap.clamp.dao.model.jsontype.JsonTypeDescriptor;
@@ -37,10 +36,10 @@ public class JsonTypeDescriptorTest {
@Test
public void testFromString() {
JsonObject object = new JsonObject();
- object.addProperty("one","oneValue");
+ object.addProperty("one", "oneValue");
JsonObject child = new JsonObject();
- child.addProperty("two","twoValue");
- object.add("child",child);
+ child.addProperty("two", "twoValue");
+ object.add("child", child);
JsonObject jsonResult = descriptor.fromString("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}");
@@ -53,10 +52,10 @@ public class JsonTypeDescriptorTest {
assertThat(res1).isNull();
JsonObject object = new JsonObject();
- object.addProperty("one","oneValue");
+ object.addProperty("one", "oneValue");
JsonObject child = new JsonObject();
- child.addProperty("two","twoValue");
- object.add("child",child);
+ child.addProperty("two", "twoValue");
+ object.add("child", child);
String res2 = descriptor.unwrap(object, String.class, null);
assertThat(res2.replace("\n", "").replace(" ", ""))
.isEqualTo("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}");
@@ -70,7 +69,7 @@ public class JsonTypeDescriptorTest {
@Test(expected = HibernateException.class)
public void testUnwrapExpectationThrown() {
JsonObject object = new JsonObject();
- object.addProperty("one","oneValue");
+ object.addProperty("one", "oneValue");
descriptor.unwrap(object, Integer.class, null);
}
@@ -81,10 +80,10 @@ public class JsonTypeDescriptorTest {
assertThat(res1).isNull();
JsonObject object = new JsonObject();
- object.addProperty("one","oneValue");
+ object.addProperty("one", "oneValue");
JsonObject child = new JsonObject();
- child.addProperty("two","twoValue");
- object.add("child",child);
+ child.addProperty("two", "twoValue");
+ object.add("child", child);
JsonObject res2 = descriptor.wrap("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}", null);
assertThat(res2).isEqualTo(object);
}
diff --git a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java b/src/test/java/org/onap/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
index 83b3dda01..a6b34f95d 100644
--- a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
+++ b/src/test/java/org/onap/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
@@ -27,7 +27,6 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import org.junit.Assert;
import org.junit.Test;
diff --git a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandlerTest.java b/src/test/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandlerTest.java
index f04e3fa3c..f2a9de7a0 100644
--- a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandlerTest.java
+++ b/src/test/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandlerTest.java
@@ -36,7 +36,6 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.commons.io.IOUtils;
import org.junit.Test;
import org.mockito.Mockito;
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateFieldTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateFieldTest.java
index 29f5a1da8..7f0047e4f 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateFieldTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateFieldTest.java
@@ -39,10 +39,10 @@ public class JsonTemplateFieldTest extends TestCase {
* Test fieldsEqual method.
*/
public void testFieldsEqualsMethod() {
- assertFalse(JsonTemplateField.fieldsEquals(field1,field3));
- assertFalse(JsonTemplateField.fieldsEquals(field1,field4));
- assertFalse(JsonTemplateField.fieldsEquals(field1,field5));
- assertTrue(JsonTemplateField.fieldsEquals(field1,field6));
+ assertFalse(JsonTemplateField.fieldsEquals(field1, field3));
+ assertFalse(JsonTemplateField.fieldsEquals(field1, field4));
+ assertFalse(JsonTemplateField.fieldsEquals(field1, field5));
+ assertTrue(JsonTemplateField.fieldsEquals(field1, field6));
}
/**
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
index 1d4ee4311..4fae89f09 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
@@ -46,7 +46,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = Application.class)
-@ActiveProfiles({"clamp-default","clamp-default-user","default-dictionary-elements"})
+@ActiveProfiles({"clamp-default", "clamp-default-user", "default-dictionary-elements"})
public class ToscaConverterWithDictionarySupportItCase {
@Autowired
diff --git a/src/test/java/org/onap/clamp/clds/util/CryptoUtilsTest.java b/src/test/java/org/onap/clamp/clds/util/CryptoUtilsTest.java
index f6054d538..42123aaf4 100644
--- a/src/test/java/org/onap/clamp/clds/util/CryptoUtilsTest.java
+++ b/src/test/java/org/onap/clamp/clds/util/CryptoUtilsTest.java
@@ -31,10 +31,8 @@ import static org.junit.Assert.assertNotNull;
import static org.mockito.ArgumentMatchers.eq;
import java.security.InvalidKeyException;
-
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
-
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang3.ArrayUtils;
import org.junit.Test;
diff --git a/src/test/java/org/onap/clamp/clds/util/JsonUtilsTest.java b/src/test/java/org/onap/clamp/clds/util/JsonUtilsTest.java
index bc2ec2122..a986c159d 100644
--- a/src/test/java/org/onap/clamp/clds/util/JsonUtilsTest.java
+++ b/src/test/java/org/onap/clamp/clds/util/JsonUtilsTest.java
@@ -30,7 +30,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import java.io.IOException;
-
import org.junit.Test;
public class JsonUtilsTest {
diff --git a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
index f986ca935..a9f8f4f5f 100644
--- a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
+++ b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
@@ -215,9 +215,8 @@ public class CsarInstallerItCase {
Mockito.when(notificationData.getServiceArtifacts()).thenReturn(serviceArtifactsList);
CsarHandler csarHandler = new CsarHandler(notificationData, "", "");
- csarHandler
- .setFilePath(Thread.currentThread().getContextClassLoader().getResource(CSAR_ARTIFACT_NAME_CDS).
- getFile());
+ csarHandler.setFilePath(Thread.currentThread().getContextClassLoader().getResource(CSAR_ARTIFACT_NAME_CDS)
+ .getFile());
Assert.assertEquals(csarHandler.getPolicyModelYaml(), Optional
.ofNullable(ResourceFileUtils.getResourceAsString("example/sdc/expected-result/policy-data.yaml")));
}
diff --git a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java b/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
index 1d6940f83..99c8f1ff9 100644
--- a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
+++ b/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
@@ -27,6 +27,7 @@ package org.onap.clamp.loop;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertNotNull;
+
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
diff --git a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
index 4d2bfe280..8afdd0583 100644
--- a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
+++ b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
@@ -23,6 +23,8 @@
package org.onap.clamp.loop;
+import static org.assertj.core.api.Assertions.assertThat;
+
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import java.io.IOException;
@@ -38,8 +40,6 @@ import org.onap.clamp.loop.template.PolicyModel;
import org.onap.clamp.policy.microservice.MicroServicePolicy;
import org.onap.clamp.policy.operational.OperationalPolicy;
-import static org.assertj.core.api.Assertions.assertThat;
-
public class PolicyComponentTest {
/**
diff --git a/src/test/java/org/onap/clamp/loop/ServiceTest.java b/src/test/java/org/onap/clamp/loop/ServiceTest.java
index 2b6fab8b6..7507d42e9 100644
--- a/src/test/java/org/onap/clamp/loop/ServiceTest.java
+++ b/src/test/java/org/onap/clamp/loop/ServiceTest.java
@@ -26,7 +26,6 @@ package org.onap.clamp.loop;
import static org.assertj.core.api.Assertions.assertThat;
import com.google.gson.JsonObject;
-
import org.junit.Test;
import org.onap.clamp.clds.util.JsonUtils;
import org.onap.clamp.loop.service.Service;
diff --git a/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java b/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
index 51b93767f..47afb91c4 100644
--- a/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
+++ b/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
@@ -45,7 +45,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class)
-@ActiveProfiles({"clamp-default","clamp-policy-controller"})
+@ActiveProfiles({"clamp-default", "clamp-policy-controller"})
public class PolicyEngineControllerTestItCase {
@Autowired
diff --git a/src/test/java/org/onap/clamp/policy/microservice/MicroServicePayloadTest.java b/src/test/java/org/onap/clamp/policy/microservice/MicroServicePayloadTest.java
index 0bfb6ece0..c43e62403 100644
--- a/src/test/java/org/onap/clamp/policy/microservice/MicroServicePayloadTest.java
+++ b/src/test/java/org/onap/clamp/policy/microservice/MicroServicePayloadTest.java
@@ -37,10 +37,11 @@ public class MicroServicePayloadTest {
public void testPayloadConstruction() throws IOException {
MicroServicePolicy policy = new MicroServicePolicy("testPolicy", new PolicyModel(
"onap.policies.monitoring.cdap.tca.hi.lo.app",
- ResourceFileUtils.getResourceAsString("tosca/tosca_example.yaml"),"1.0.0"), false,null,null, null,null);
+ ResourceFileUtils.getResourceAsString("tosca/tosca_example.yaml"), "1.0.0"), false, null, null, null,
+ null);
policy.setConfigurationsJson(JsonUtils.GSON.fromJson(
- ResourceFileUtils.getResourceAsString("tosca/micro-service-policy-properties.json"), JsonObject.class));
+ ResourceFileUtils.getResourceAsString("tosca/micro-service-policy-properties.json"), JsonObject.class));
JSONAssert.assertEquals(ResourceFileUtils.getResourceAsString("tosca/micro-service-policy-payload.json"),
- policy.createPolicyPayload(), false);
+ policy.createPolicyPayload(), false);
}
}
diff --git a/src/test/java/org/onap/clamp/policy/pdpgroup/PdpGroupTest.java b/src/test/java/org/onap/clamp/policy/pdpgroup/PdpGroupTest.java
index b6f7c5491..46980d19f 100644
--- a/src/test/java/org/onap/clamp/policy/pdpgroup/PdpGroupTest.java
+++ b/src/test/java/org/onap/clamp/policy/pdpgroup/PdpGroupTest.java
@@ -27,11 +27,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
-
import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
-
import org.junit.Test;
public class PdpGroupTest {
diff --git a/src/test/java/org/onap/clamp/policy/pdpgroup/PolicyModelKeyTest.java b/src/test/java/org/onap/clamp/policy/pdpgroup/PolicyModelKeyTest.java
index 413ce60ab..3befcf2d3 100644
--- a/src/test/java/org/onap/clamp/policy/pdpgroup/PolicyModelKeyTest.java
+++ b/src/test/java/org/onap/clamp/policy/pdpgroup/PolicyModelKeyTest.java
@@ -32,9 +32,9 @@ public class PolicyModelKeyTest {
@Test
public void testEqualsMethod() throws IOException {
- PolicyModelKey key1 = new PolicyModelKey("name1","1.0.0");
- PolicyModelKey key2 = new PolicyModelKey(null,"1.0.0");
- PolicyModelKey key3 = new PolicyModelKey("name1",null);
+ PolicyModelKey key1 = new PolicyModelKey("name1", "1.0.0");
+ PolicyModelKey key2 = new PolicyModelKey(null, "1.0.0");
+ PolicyModelKey key3 = new PolicyModelKey("name1", null);
assertThat(key1.equals(null)).isFalse();
assertThat(key1.equals("key2")).isFalse();
@@ -42,13 +42,13 @@ public class PolicyModelKeyTest {
assertThat(key2.equals(key1)).isFalse();
assertThat(key3.equals(key1)).isFalse();
- PolicyModelKey key4 = new PolicyModelKey("name2","1.0.0");
- PolicyModelKey key5 = new PolicyModelKey("name1","2.0.0");
+ PolicyModelKey key4 = new PolicyModelKey("name2", "1.0.0");
+ PolicyModelKey key5 = new PolicyModelKey("name1", "2.0.0");
assertThat(key1.equals(key4)).isFalse();
assertThat(key1.equals(key5)).isFalse();
- PolicyModelKey key6 = new PolicyModelKey("name(.*)","1.0.0");
- PolicyModelKey key7 = new PolicyModelKey("name1","1.0.0");
+ PolicyModelKey key6 = new PolicyModelKey("name(.*)", "1.0.0");
+ PolicyModelKey key7 = new PolicyModelKey("name1", "1.0.0");
assertThat(key1.equals(key6)).isTrue();
assertThat(key1.equals(key7)).isTrue();
}