From 7c57239a9ccc5ae1d33873e62b9798fafb66b360 Mon Sep 17 00:00:00 2001 From: "Kajur, Harish (vk250x)" Date: Sun, 1 Mar 2020 18:53:25 -0500 Subject: [PATCH] Change the mockito to use one version Issue-ID: AAI-2806 Change-Id: I23dc5efa936d9efe2ecf326064ae5e5046764339 Signed-off-by: Kajur, Harish (vk250x) --- aai-aaf-auth/pom.xml | 2 +- aai-annotations/pom.xml | 2 +- aai-auth/pom.xml | 2 +- aai-common-docker/aai-common-images/pom.xml | 4 +- aai-common-docker/aai-haproxy-image/pom.xml | 4 +- aai-common-docker/pom.xml | 2 +- aai-core/pom.xml | 2 +- aai-els-onap-logging/pom.xml | 2 +- aai-parent/pom.xml | 4 +- aai-rest/pom.xml | 2 +- aai-schema-abstraction/pom.xml | 2 +- .../aai/schemaif/oxm/OxmSchemaProviderTest.java | 68 +++++++++++----------- aai-schema-ingest/pom.xml | 2 +- aai-utils/pom.xml | 2 +- pom.xml | 2 +- version.properties | 2 +- 16 files changed, 52 insertions(+), 52 deletions(-) diff --git a/aai-aaf-auth/pom.xml b/aai-aaf-auth/pom.xml index af2745a0..7601c2fb 100644 --- a/aai-aaf-auth/pom.xml +++ b/aai-aaf-auth/pom.xml @@ -6,7 +6,7 @@ org.onap.aai.aai-common aai-parent - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT ../aai-parent/pom.xml aai-aaf-auth diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index a44ed7cf..8f4c8f6f 100644 --- a/aai-annotations/pom.xml +++ b/aai-annotations/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.aai-common aai-parent - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT ../aai-parent/pom.xml aai-annotations diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml index da41861f..9b3fc71d 100644 --- a/aai-auth/pom.xml +++ b/aai-auth/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.aai-common aai-parent - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT ../aai-parent/pom.xml aai-auth diff --git a/aai-common-docker/aai-common-images/pom.xml b/aai-common-docker/aai-common-images/pom.xml index a40cb8e2..ce5754fc 100644 --- a/aai-common-docker/aai-common-images/pom.xml +++ b/aai-common-docker/aai-common-images/pom.xml @@ -25,11 +25,11 @@ org.onap.aai.aai-common aai-common-docker - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT aai-common-images - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT pom aai-aai-common-images Contains dockerfiles for aai-common images (alpine and ubuntu based). diff --git a/aai-common-docker/aai-haproxy-image/pom.xml b/aai-common-docker/aai-haproxy-image/pom.xml index 6068df6d..e63b4c0f 100644 --- a/aai-common-docker/aai-haproxy-image/pom.xml +++ b/aai-common-docker/aai-haproxy-image/pom.xml @@ -25,11 +25,11 @@ org.onap.aai.aai-common aai-common-docker - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT aai-haproxy-image - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT pom aai-aai-haproxy-image Contains dockerfiles for aai-haproxy image. diff --git a/aai-common-docker/pom.xml b/aai-common-docker/pom.xml index 79633bfe..39018d5c 100644 --- a/aai-common-docker/pom.xml +++ b/aai-common-docker/pom.xml @@ -26,7 +26,7 @@ org.onap.aai.aai-common aai-parent - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT ../aai-parent/pom.xml diff --git a/aai-core/pom.xml b/aai-core/pom.xml index 3d757ecc..a8725eed 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -28,7 +28,7 @@ limitations under the License. org.onap.aai.aai-common aai-parent - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT ../aai-parent/pom.xml aai-core diff --git a/aai-els-onap-logging/pom.xml b/aai-els-onap-logging/pom.xml index 85e30069..4235b0fd 100644 --- a/aai-els-onap-logging/pom.xml +++ b/aai-els-onap-logging/pom.xml @@ -6,7 +6,7 @@ org.onap.aai.aai-common aai-parent - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT ../aai-parent/pom.xml aai-els-onap-logging diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml index fbc013fc..ae8e8c78 100644 --- a/aai-parent/pom.xml +++ b/aai-parent/pom.xml @@ -27,7 +27,7 @@ limitations under the License. org.onap.aai.aai-common aai-common - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT aai-parent aai-parent @@ -101,7 +101,7 @@ limitations under the License. 1.7.25 1.2.17 1.10.19 - 2.15.0 + 1.10.19 4.1.43.Final 4.0.56.Final 3.1 diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml index c8a2ca1e..18b74149 100644 --- a/aai-rest/pom.xml +++ b/aai-rest/pom.xml @@ -29,7 +29,7 @@ org.onap.aai.aai-common aai-parent - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT ../aai-parent/pom.xml aai-rest diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml index 1bbd9fe1..a59d21d3 100644 --- a/aai-schema-abstraction/pom.xml +++ b/aai-schema-abstraction/pom.xml @@ -28,7 +28,7 @@ org.onap.aai.aai-common aai-parent - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT ../aai-parent/pom.xml diff --git a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java index 6c7364ae..6cfb5a7d 100644 --- a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java +++ b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java @@ -30,14 +30,14 @@ import java.util.Set; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.runners.MockitoJUnitRunner; import org.onap.aai.schemaif.SchemaProviderException; import org.onap.aai.schemaif.definitions.EdgeSchema; import org.onap.aai.schemaif.definitions.PropertySchema; import org.onap.aai.schemaif.definitions.VertexSchema; import org.onap.aai.schemaif.definitions.types.DataType.Type; -@RunWith(MockitoJUnitRunner.Silent.class) +@RunWith(MockitoJUnitRunner.class) public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { @Test @@ -49,15 +49,15 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { VertexSchema vertSchema = schemaProvider.getVertexSchema("pserver", schemaProvider.getLatestSchemaVersion()); System.out.println(vertSchema.toString()); - EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", + EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", "cloud-region", "zone", schemaProvider.getLatestSchemaVersion()); System.out.println(edgeSchema.toString()); - + // Validate vertex schema assertTrue(vertSchema.getName().equals("pserver")); assertTrue(vertSchema.getAnnotationValue("nameProps").equals("pserver-name2")); assertTrue(vertSchema.getAnnotationValue("dependentOn") == null); - + PropertySchema propSchema = vertSchema.getPropertySchema("hostname"); assertTrue(propSchema.getName().equals("hostname")); assertTrue(propSchema.getDefaultValue().equals("")); @@ -66,7 +66,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0); Object obj = propSchema.validateValue("somestring"); assertTrue(obj instanceof String); - + propSchema = vertSchema.getPropertySchema("in-maint"); assertTrue(propSchema.getName().equals("in-maint")); assertTrue(propSchema.getDefaultValue().equals("false")); @@ -79,8 +79,8 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { obj = propSchema.validateValue("false"); assertTrue(obj instanceof Boolean); assertTrue(propSchema.getDataType().validateValue("badValue") == null); - - + + propSchema = vertSchema.getPropertySchema("aai-node-type"); assertTrue(propSchema.getName().equals("aai-node-type")); assertTrue(propSchema.getDefaultValue().equals("")); @@ -88,7 +88,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(!propSchema.isKey()); assertTrue(propSchema.isReserved()); assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0); - + propSchema = vertSchema.getPropertySchema("pserver-id"); assertTrue(propSchema.getName().equals("pserver-id")); assertTrue(propSchema.getDefaultValue().equals("")); @@ -96,7 +96,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(!propSchema.isReserved()); assertTrue(propSchema.isKey()); assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0); - + propSchema = vertSchema.getPropertySchema("number-of-cpus"); assertTrue(propSchema.getName().equals("number-of-cpus")); assertTrue(propSchema.getAnnotationValue("source-of-truth-type").equals("openstack")); @@ -107,7 +107,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(obj instanceof Integer); assertTrue(propSchema.getDataType().validateValue("5.5") == null); assertTrue(propSchema.getDataType().validateValue("xyz") == null); - + // Validate edge schema assertTrue(edgeSchema.getName().equals("org.onap.relationships.inventory.LocatedIn")); assertTrue(edgeSchema.getSource().equals("cloud-region")); @@ -115,7 +115,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(edgeSchema.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_ONE)); assertTrue(edgeSchema.getAnnotationValue("contains-other-v").equals("NONE")); assertTrue(edgeSchema.getPropertySchema("prevent-delete").getDataType().getType().equals(Type.STRING)); - + // Validate 'dependentOn' annotation vertSchema = schemaProvider.getVertexSchema("tenant", schemaProvider.getLatestSchemaVersion()); assertTrue(vertSchema.getAnnotationValue("dependentOn").equals("cloud-region")); @@ -128,19 +128,19 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(false); } } - + @Test public void testAdjacentEdges() throws SchemaProviderException { try { OxmSchemaProvider schemaProvider = new OxmSchemaProvider(); schemaProvider.loadSchema(); - Set edgeSchemaList = + Set edgeSchemaList = schemaProvider.getAdjacentEdgeSchema("snapshot", schemaProvider.getLatestSchemaVersion()); - + // Validate edge schema assertTrue(edgeSchemaList.size() == 2); - + for (EdgeSchema es : edgeSchemaList) { System.out.println(es.toString()); if (es.getName().equals("org.onap.relationships.inventory.BelongsTo")) { @@ -166,15 +166,15 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(false); } } - + @Test public void testValidSourceTargetEdge() throws SchemaProviderException { try { OxmSchemaProvider schemaProvider = new OxmSchemaProvider(); schemaProvider.loadSchema(); - Set edgeSchemaList = - schemaProvider.getEdgeSchemaForSourceTarget("service-instance", "customer", + Set edgeSchemaList = + schemaProvider.getEdgeSchemaForSourceTarget("service-instance", "customer", schemaProvider.getLatestSchemaVersion()); // Validate edge schema @@ -183,14 +183,14 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(edgeSchemaList.iterator().next().getSource().equals("service-instance")); assertTrue(edgeSchemaList.iterator().next().getTarget().equals("customer")); assertTrue(edgeSchemaList.iterator().next().getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_MANY)); - - edgeSchemaList = - schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "complex", + + edgeSchemaList = + schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "complex", schemaProvider.getLatestSchemaVersion()); - + // Validate edge schema assertTrue(edgeSchemaList.size() == 2); - + for (EdgeSchema es : edgeSchemaList) { System.out.println(es.toString()); if (es.getName().equals("org.onap.relationships.inventory.FoundIn")) { @@ -207,11 +207,11 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(false); } } - - edgeSchemaList = - schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "bad-node", + + edgeSchemaList = + schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "bad-node", schemaProvider.getLatestSchemaVersion()); - + // Validate edge schema assertTrue(edgeSchemaList.size() == 0); } @@ -223,23 +223,23 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(false); } } - + @Test public void testInvalidVertexOrEdge() throws SchemaProviderException { try { OxmSchemaProvider schemaProvider = new OxmSchemaProvider(); schemaProvider.loadSchema(); - VertexSchema vertSchema = + VertexSchema vertSchema = schemaProvider.getVertexSchema("bad-node", schemaProvider.getLatestSchemaVersion()); assertTrue(vertSchema == null); - EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", + EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", "cloud-region", "bad-node", schemaProvider.getLatestSchemaVersion()); assertTrue(edgeSchema == null); - - Set edgeSchemaList = - schemaProvider.getAdjacentEdgeSchema("org.onap.nodes.bad-node", + + Set edgeSchemaList = + schemaProvider.getAdjacentEdgeSchema("org.onap.nodes.bad-node", schemaProvider.getLatestSchemaVersion()); assertTrue(edgeSchemaList.isEmpty()); } diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml index 5b545a08..e8ad5f9e 100644 --- a/aai-schema-ingest/pom.xml +++ b/aai-schema-ingest/pom.xml @@ -26,7 +26,7 @@ limitations under the License. org.onap.aai.aai-common aai-parent - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT ../aai-parent/pom.xml aai-schema-ingest diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml index dd901028..97d2f058 100644 --- a/aai-utils/pom.xml +++ b/aai-utils/pom.xml @@ -29,7 +29,7 @@ org.onap.aai.aai-common aai-parent - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT ../aai-parent/pom.xml aai-utils diff --git a/pom.xml b/pom.xml index b09d1718..9833fb80 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.onap.aai.aai-common aai-common - 1.6.7-SNAPSHOT + 1.6.8-SNAPSHOT pom aai-aai-common Contains all of the common code for resources and traversal repos diff --git a/version.properties b/version.properties index 95d9acb4..f7e7893b 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major_version=1 minor_version=6 -patch_version=7 +patch_version=8 base_version=${major_version}.${minor_version}.${patch_version} -- 2.16.6