diff options
author | ys9693 <ys9693@att.com> | 2020-01-19 13:50:02 +0200 |
---|---|---|
committer | Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-01-22 12:33:31 +0000 |
commit | 16a9fce0e104a38371a9e5a567ec611ae3fc7f33 (patch) | |
tree | 03a2aff3060ddb5bc26a90115805a04becbaffc9 /catalog-be/src/test/java/org/openecomp/sdc/be/info | |
parent | aa83a2da4f911c3ac89318b8e9e8403b072942e1 (diff) |
Catalog alignment
Issue-ID: SDC-2724
Signed-off-by: ys9693 <ys9693@att.com>
Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe
Diffstat (limited to 'catalog-be/src/test/java/org/openecomp/sdc/be/info')
20 files changed, 169 insertions, 162 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactAccessInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactAccessInfoTest.java deleted file mode 100644 index 03d305b6fe..0000000000 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactAccessInfoTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * 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========================================================= - * Modifications copyright (c) 2019 Nokia - * ================================================================================ - */ -package org.openecomp.sdc.be.info; - -import org.junit.Test; -import org.openecomp.sdc.be.resources.data.ESArtifactData; - -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; - -public class ArtifactAccessInfoTest { - - @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(ArtifactAccessInfo.class, hasValidGettersAndSetters()); - } - - @Test - public void testArtifactAccessInfoConstructorUsingESArtifactData() { - ArtifactAccessInfo artifactAccessInfo = new ArtifactAccessInfo(new ESArtifactData("anyId")); - assertThat(artifactAccessInfo.getId(), is("anyId")); - } - - @Test - public void testArtifactAccessInfoConstructorUsingServletContext() { - ArtifactAccessInfo artifactAccessInfo = new ArtifactAccessInfo("http://localhost/test"); - assertThat(artifactAccessInfo.getUrl(), is("http://localhost/test/resources/artifacts/")); - } - -}
\ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactAccessListTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactAccessListTest.java deleted file mode 100644 index ad73636482..0000000000 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactAccessListTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2018 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========================================================= - * Modifications copyright (c) 2019 Nokia - * ================================================================================ - */ -package org.openecomp.sdc.be.info; - -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - -import java.util.ArrayList; -import java.util.List; -import org.junit.Test; - -public class ArtifactAccessListTest { - - @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(ArtifactAccessList.class, hasValidGettersAndSetters()); - } - - @Test - public void testCtor() { - List<ArtifactAccessInfo> artifacts = new ArrayList<>(); - ArtifactAccessList artifactAccessList = new ArtifactAccessList(artifacts); - assertThat(artifactAccessList.getArtifacts(), is(artifacts)); - } - -}
\ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java index 2811c1535d..725c95c569 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java @@ -21,10 +21,6 @@ */ package org.openecomp.sdc.be.info; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -32,6 +28,10 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.openecomp.sdc.be.model.ArtifactDefinition; +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + @RunWith(MockitoJUnitRunner.Silent.class) public class ArtifactDefinitionInfoTest { diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTemplateInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTemplateInfoTest.java index 5991341502..721e929791 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTemplateInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTemplateInfoTest.java @@ -21,15 +21,15 @@ */ package org.openecomp.sdc.be.info; -import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import org.junit.Test; import java.util.LinkedList; import java.util.List; -import org.junit.Test; +import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; public class ArtifactTemplateInfoTest { diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/CreateAndAssotiateInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/CreateAndAssotiateInfoTest.java index 3b3d1f9556..4435dc8f4c 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/CreateAndAssotiateInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/CreateAndAssotiateInfoTest.java @@ -21,15 +21,15 @@ */ package org.openecomp.sdc.be.info; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; - import org.junit.Assert; import org.junit.Test; import org.openecomp.sdc.be.model.ComponentInstance; import org.openecomp.sdc.be.model.RequirementCapabilityRelDef; +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + public class CreateAndAssotiateInfoTest { @Test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusInfoTest.java index 9ff004e57f..46dce6ad61 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusInfoTest.java @@ -21,17 +21,18 @@ */ package org.openecomp.sdc.be.info; +import org.junit.Assert; +import org.junit.Test; +import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; +import org.openecomp.sdc.common.datastructure.AuditingFieldsKey; + +import java.util.HashMap; +import java.util.Map; + import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; -import java.util.HashMap; -import java.util.Map; -import org.junit.Assert; -import org.junit.Test; -import org.openecomp.sdc.common.datastructure.AuditingFieldsKey; -import org.openecomp.sdc.common.datastructure.ESTimeBasedEvent; public class DistributionStatusInfoTest { @@ -47,8 +48,8 @@ public class DistributionStatusInfoTest { } @Test - public void testCtorWithESTimeBasedEvent() { - ESTimeBasedEvent distributionStatusEvent = createESTimeBasedEvent(); + public void testCtorWithAuditingGenericEvent() { + AuditingGenericEvent distributionStatusEvent = createAuditingGenericEvent(); DistributionStatusInfo distributionStatusInfo = new DistributionStatusInfo(distributionStatusEvent); Assert.assertThat(distributionStatusInfo.getTimestamp(), is(AUDIT_DISTRIBUTION_STATUS_TIME)); Assert.assertThat(distributionStatusInfo.getOmfComponentID(), is(AUDIT_DISTRIBUTION_CONSUMER_ID)); @@ -66,8 +67,8 @@ public class DistributionStatusInfoTest { Assert.assertThat(distributionStatusInfo.getTimestamp(), is(AUDIT_DISTRIBUTION_STATUS_TIME)); } - private ESTimeBasedEvent createESTimeBasedEvent() { - ESTimeBasedEvent distributionStatusEvent = new ESTimeBasedEvent(); + private AuditingGenericEvent createAuditingGenericEvent() { + AuditingGenericEvent distributionStatusEvent = new AuditingGenericEvent(); Map<String, Object> fields = new HashMap<>(); fields.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_CONSUMER_ID.getDisplayName(), AUDIT_DISTRIBUTION_CONSUMER_ID); fields.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_STATUS_TIME.getDisplayName(), AUDIT_DISTRIBUTION_STATUS_TIME); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceInfoTest.java index d164f009f6..01040bce2c 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceInfoTest.java @@ -35,6 +35,104 @@ public class DistributionStatusOfServiceInfoTest { private static final String TIMESTAMP = "timestamp"; private static final String DISTRIBUTION_ID = "distributionID"; + private DistributionStatusOfServiceInfo createTestSubject() { + return new DistributionStatusOfServiceInfo(); + } + + @Test + public void testCtor() throws Exception { + new DistributionStatusOfServiceInfo("","","",""); + } + + + @Test + public void testGetDistributionID() throws Exception { + DistributionStatusOfServiceInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDistributionID(); + } + + + @Test + public void testSetDistributionID() throws Exception { + DistributionStatusOfServiceInfo testSubject; + String distributionID = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDistributionID(distributionID); + } + + + @Test + public void testGetTimestamp() throws Exception { + DistributionStatusOfServiceInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getTimestamp(); + } + + + @Test + public void testSetTimestamp() throws Exception { + DistributionStatusOfServiceInfo testSubject; + String timestamp = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setTimestamp(timestamp); + } + + + @Test + public void testGetUserId() throws Exception { + DistributionStatusOfServiceInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUserId(); + } + + + @Test + public void testSetUserId() throws Exception { + DistributionStatusOfServiceInfo testSubject; + String userId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUserId(userId); + } + + + @Test + public void testGetDeployementStatus() throws Exception { + DistributionStatusOfServiceInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDeployementStatus(); + } + + + @Test + public void testSetDeployementStatus() throws Exception { + DistributionStatusOfServiceInfo testSubject; + String deployementStatus = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDeployementStatus(deployementStatus); + } + + @Test public void shouldHaveValidDefaultConstructor() { assertThat(DistributionStatusOfServiceInfo.class, hasValidBeanConstructor()); @@ -48,11 +146,12 @@ public class DistributionStatusOfServiceInfoTest { @Test public void shouldTestWhetherTheDefaultConstructorCorrectlySetAllFields() { DistributionStatusOfServiceInfo distributionStatusOfServiceInfo = new DistributionStatusOfServiceInfo( - DISTRIBUTION_ID, TIMESTAMP, USER_ID, STATUS); + DISTRIBUTION_ID, TIMESTAMP, USER_ID, STATUS); assertThat(distributionStatusOfServiceInfo.getDistributionID(), is(DISTRIBUTION_ID)); assertThat(distributionStatusOfServiceInfo.getTimestamp(), is(TIMESTAMP)); assertThat(distributionStatusOfServiceInfo.getUserId(), is(USER_ID)); assertThat(distributionStatusOfServiceInfo.getDeployementStatus(), is(STATUS)); } + }
\ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusTest.java index 1b3633ca56..c9111bb1f4 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusTest.java @@ -21,12 +21,12 @@ */ package org.openecomp.sdc.be.info; +import org.junit.Test; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; -import org.junit.Test; - public class DistributionStatusTest { @Test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GenericArtifactQueryInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GenericArtifactQueryInfoTest.java index e814605a71..dce3e16145 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GenericArtifactQueryInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GenericArtifactQueryInfoTest.java @@ -19,15 +19,16 @@ */ package org.openecomp.sdc.be.info; +import org.junit.Test; + +import java.util.Collections; +import java.util.Set; + import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import java.util.Collections; -import java.util.Set; -import org.junit.Test; - public class GenericArtifactQueryInfoTest { private static final String ARTIFACT_UNIQUE_ID = "artifactId"; diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java index bc8041bfda..3c68e9ec89 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java @@ -21,16 +21,16 @@ */ package org.openecomp.sdc.be.info; -import java.util.ArrayList; -import java.util.List; -import org.junit.Test; - import com.google.code.beanmatchers.BeanMatchers; +import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition; import org.openecomp.sdc.be.datatypes.elements.GroupInstanceDataDefinition; import org.openecomp.sdc.be.model.GroupDefinition; import org.openecomp.sdc.be.model.GroupInstance; +import java.util.ArrayList; +import java.util.List; + import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/MergedArtifactInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/MergedArtifactInfoTest.java index 24676a263b..4d5ac9409f 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/MergedArtifactInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/MergedArtifactInfoTest.java @@ -21,18 +21,19 @@ */ package org.openecomp.sdc.be.info; -import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition; import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields; import org.openecomp.sdc.be.model.ArtifactDefinition; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + public class MergedArtifactInfoTest { private static final String NAME = "NAME"; diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/NodeTypeInfoToUpdateArtifactsTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/NodeTypeInfoToUpdateArtifactsTest.java index 388d63757b..987563276d 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/NodeTypeInfoToUpdateArtifactsTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/NodeTypeInfoToUpdateArtifactsTest.java @@ -21,17 +21,18 @@ */ package org.openecomp.sdc.be.info; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; +import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.ArtifactOperationEnum; +import org.openecomp.sdc.be.model.ArtifactDefinition; import java.util.Collections; import java.util.EnumMap; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.ArtifactOperationEnum; -import org.openecomp.sdc.be.model.ArtifactDefinition; + +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; public class NodeTypeInfoToUpdateArtifactsTest { diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/OperationalEnvInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/OperationalEnvInfoTest.java index 66c29a4cd1..3d51a4a74d 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/OperationalEnvInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/OperationalEnvInfoTest.java @@ -21,13 +21,13 @@ */ package org.openecomp.sdc.be.info; +import org.junit.Test; + import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; - public class OperationalEnvInfoTest { private static final String ID = "ID"; diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelatedToPropertyTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelatedToPropertyTest.java index 4e88950610..7017f79222 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelatedToPropertyTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelatedToPropertyTest.java @@ -21,12 +21,12 @@ */ package org.openecomp.sdc.be.info; +import org.junit.Test; + import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; - public class RelatedToPropertyTest { @Test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipDataTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipDataTest.java index 878666dc3a..37c0cb56ad 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipDataTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipDataTest.java @@ -21,12 +21,12 @@ */ package org.openecomp.sdc.be.info; +import org.junit.Test; + import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; - public class RelationshipDataTest { @Test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipListTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipListTest.java index ac657ddfff..0444e1f689 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipListTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipListTest.java @@ -19,12 +19,12 @@ */ package org.openecomp.sdc.be.info; +import org.junit.Test; + import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; - public class RelationshipListTest { @Test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipTest.java index 5266753655..e2326d49cd 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipTest.java @@ -21,12 +21,12 @@ */ package org.openecomp.sdc.be.info; +import org.junit.Test; + import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; - public class RelationshipTest { @Test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceInfoTest.java index 73a4bb0a44..25021a985c 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceInfoTest.java @@ -21,13 +21,14 @@ */ package org.openecomp.sdc.be.info; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; import java.util.Collections; import java.util.List; -import org.junit.Test; + +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; public class ServiceInfoTest { diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceVersionInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceVersionInfoTest.java index 6ea2b2a385..d7c9815da9 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceVersionInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceVersionInfoTest.java @@ -21,12 +21,12 @@ */ package org.openecomp.sdc.be.info; +import org.junit.Test; + import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; - public class ServiceVersionInfoTest { private static final String NAME = "NAME"; diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInfoTest.java index 101b72c5dd..e3f68835e5 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInfoTest.java @@ -21,9 +21,8 @@ */ package org.openecomp.sdc.be.info; -import org.junit.Test; - import com.google.code.beanmatchers.BeanMatchers; +import org.junit.Test; import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; import static org.hamcrest.MatcherAssert.assertThat; |