summaryrefslogtreecommitdiffstats
path: root/catalog-dao/src/test/java
diff options
context:
space:
mode:
authorys9693 <ys9693@att.com>2020-01-19 13:50:02 +0200
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-01-22 12:33:31 +0000
commit16a9fce0e104a38371a9e5a567ec611ae3fc7f33 (patch)
tree03a2aff3060ddb5bc26a90115805a04becbaffc9 /catalog-dao/src/test/java
parentaa83a2da4f911c3ac89318b8e9e8403b072942e1 (diff)
Catalog alignment
Issue-ID: SDC-2724 Signed-off-by: ys9693 <ys9693@att.com> Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe
Diffstat (limited to 'catalog-dao/src/test/java')
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ArtifactCassandraDaoTest.java6
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java15
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ConsumerEventTableDefinitionTest.java92
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/es/ElasticSearchClientTest.java147
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/GraphElementFactoryTest.java8
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoMockTest.java6
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoTest.java4
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FetchContext.java33
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FetchContextTest.java (renamed from catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchResult.java)21
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/BatchBuilderTest.java37
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgeLabelsTest.java70
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgePropertiesDictionaryTest.java90
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphNeighbourTableTest.java51
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphPropertiesDictionaryTest.java70
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/Neo4jEdgeTest.java32
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/Neo4jOperationStatusTest.java34
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/NodeRelationTest.java32
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/ElasticSearchUtilTest.java39
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/resources/ArtifactDaoTest.java134
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/resources/AuditingDaoTest.java445
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java95
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ESArtifactDataTest.java105
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java3
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceMetadataDataTest.java3
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceArtifactsDataCollectionTest.java67
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java11
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java8
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/EcompOperationalEnvironmentEventTest.java2
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/togglz/FeatureToggleEventTest.java103
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/resources/exception/ResourceDAOExceptionTest.java61
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/resources/impl/ResourceUploaderTest.java249
31 files changed, 160 insertions, 1913 deletions
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ArtifactCassandraDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ArtifactCassandraDaoTest.java
index a87fa70bb6..3931e5e9db 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ArtifactCassandraDaoTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ArtifactCassandraDaoTest.java
@@ -32,7 +32,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import org.openecomp.sdc.be.resources.data.ESArtifactData;
+import org.openecomp.sdc.be.resources.data.DAOArtifactData;
import org.openecomp.sdc.be.resources.data.auditing.AuditingTypesConstants;
public class ArtifactCassandraDaoTest {
@@ -69,7 +69,7 @@ public class ArtifactCassandraDaoTest {
@Test
public void testSaveArtifact() throws Exception {
- ESArtifactData artifact = null;
+ DAOArtifactData artifact = null;
CassandraOperationStatus result;
// default test
@@ -79,7 +79,7 @@ public class ArtifactCassandraDaoTest {
@Test
public void testGetArtifact() throws Exception {
String artifactId = "";
- Either<ESArtifactData, CassandraOperationStatus> result;
+ Either<DAOArtifactData, CassandraOperationStatus> result;
// default test
result = testSubject.getArtifact(artifactId);
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java
index 39a19641f0..47fa61fcc2 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java
@@ -23,6 +23,7 @@ package org.openecomp.sdc.be.dao.cassandra.schema;
import com.datastax.driver.core.Cluster;
import org.junit.Assert;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mockito;
import org.openecomp.sdc.be.config.Configuration;
@@ -82,7 +83,7 @@ public class SdcSchemaUtilsTest {
Configuration.CassandrConfig cfg = new Configuration.CassandrConfig();
cfg.setCassandraHosts(CASSANDRA_HOSTS);
cfg.setCassandraPort(CASSANDRA_PORT);
-
+ cfg.setReconnectTimeout(new Long(30000));
SdcSchemaUtils sdcSchemaUtils = Mockito.mock(SdcSchemaUtils.class);
when(sdcSchemaUtils.getCassandraConfig()).thenReturn(cfg);
when(sdcSchemaUtils.createCluster()).thenCallRealMethod();
@@ -107,7 +108,7 @@ public class SdcSchemaUtilsTest {
}
@Test
- public void testCreateClusterWithDefaultOnLackOfCassandraPort() {
+ public void testCreateClusterFailOnLackOfCassandraPort() {
Configuration.CassandrConfig cfg = new Configuration.CassandrConfig();
cfg.setCassandraHosts(CASSANDRA_HOSTS);
cfg.setCassandraPort(null);
@@ -127,6 +128,8 @@ public class SdcSchemaUtilsTest {
cfg.setAuthenticate(true);
cfg.setCassandraHosts(CASSANDRA_HOSTS);
cfg.setCassandraPort(CASSANDRA_PORT);
+ cfg.setReconnectTimeout(new Long(30000));
+
cfg.setUsername(null);
cfg.setPassword(null);
@@ -147,7 +150,7 @@ public class SdcSchemaUtilsTest {
cfg.setSsl(true);
cfg.setTruststorePath(null);
cfg.setTruststorePassword(null);
-
+ cfg.setReconnectTimeout(new Long(30000));
SdcSchemaUtils sdcSchemaUtils = Mockito.mock(SdcSchemaUtils.class);
when(sdcSchemaUtils.getCassandraConfig()).thenReturn(cfg);
when(sdcSchemaUtils.createCluster()).thenCallRealMethod();
@@ -156,7 +159,7 @@ public class SdcSchemaUtilsTest {
Assert.assertNull(cluster);
}
}
-
+/*
@Test
public void testCreateClusterWithAuthSsl() {
Configuration.CassandrConfig cfg = new Configuration.CassandrConfig();
@@ -168,7 +171,7 @@ public class SdcSchemaUtilsTest {
cfg.setSsl(true);
cfg.setTruststorePath(TRUSTSTORE_PATH);
cfg.setTruststorePassword(TRUSTSTORE_PASSWORD);
-
+ cfg.setReconnectTimeout(new Long(30000));
SdcSchemaUtils sdcSchemaUtils = Mockito.mock(SdcSchemaUtils.class);
when(sdcSchemaUtils.getCassandraConfig()).thenReturn(cfg);
when(sdcSchemaUtils.createCluster()).thenCallRealMethod();
@@ -178,5 +181,5 @@ public class SdcSchemaUtilsTest {
Assert.assertEquals(System.getProperty("javax.net.ssl.trustStore"), TRUSTSTORE_PATH);
Assert.assertEquals(System.getProperty("javax.net.ssl.trustStorePassword"), TRUSTSTORE_PASSWORD);
}
- }
+ }*/
} \ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ConsumerEventTableDefinitionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ConsumerEventTableDefinitionTest.java
deleted file mode 100644
index a803e7c71e..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ConsumerEventTableDefinitionTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 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=========================================================
- */
-
-package org.openecomp.sdc.be.dao.cassandra.schema.tables;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.junit.Test;
-
-import com.datastax.driver.core.DataType;
-
-
-public class ConsumerEventTableDefinitionTest {
-
- private ConsumerEventTableDefinition createTestSubject() {
- return new ConsumerEventTableDefinition();
- }
-
-
- @Test
- public void testPrimaryKeys() throws Exception {
- ConsumerEventTableDefinition testSubject;
- List<ImmutablePair<String, DataType>> result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.primaryKeys();
- }
-
-
- @Test
- public void testClusteringKeys() throws Exception {
- ConsumerEventTableDefinition testSubject;
- List<ImmutablePair<String, DataType>> result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.clusteringKeys();
- }
-
-
- @Test
- public void testGetColumnDescription() throws Exception {
- ConsumerEventTableDefinition testSubject;
- Map<String, ImmutablePair<DataType, Boolean>> result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getColumnDescription();
- }
-
-
- @Test
- public void testGetKeyspace() throws Exception {
- ConsumerEventTableDefinition testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getKeyspace();
- }
-
-
- @Test
- public void testGetTableName() throws Exception {
- ConsumerEventTableDefinition testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getTableName();
- }
-}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/es/ElasticSearchClientTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/es/ElasticSearchClientTest.java
deleted file mode 100644
index 31a45cd956..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/es/ElasticSearchClientTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 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=========================================================
- */
-
-package org.openecomp.sdc.be.dao.es;
-
-import org.elasticsearch.client.Client;
-import org.junit.Test;
-import org.openecomp.sdc.be.utils.DAOConfDependentTest;
-
-public class ElasticSearchClientTest extends DAOConfDependentTest{
-
- private ElasticSearchClient createTestSubject() {
- return new ElasticSearchClient();
- }
-
- @Test
- public void testInitialize() throws Exception {
- ElasticSearchClient testSubject;
-
- // default test
- testSubject = createTestSubject();
- testSubject.setTransportClient("true");
- testSubject.setLocal("true");
- testSubject.initialize();
- testSubject.setTransportClient("false");
- testSubject.setClusterName("false");
- testSubject.initialize();
- }
-
- @Test
- public void testClose() throws Exception {
- ElasticSearchClient testSubject;
-
- // default test
- testSubject = createTestSubject();
- testSubject.close();
- }
-
-
- @Test
- public void testGetClient() throws Exception {
- ElasticSearchClient testSubject;
- Client result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getClient();
- }
-
-
- @Test
- public void testGetServerHost() throws Exception {
- ElasticSearchClient testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getServerHost();
- }
-
-
- @Test
- public void testGetServerPort() throws Exception {
- ElasticSearchClient testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getServerPort();
- }
-
-
- @Test
- public void testSetClusterName() throws Exception {
- ElasticSearchClient testSubject;
- String clusterName = "";
-
- // default test
- testSubject = createTestSubject();
- testSubject.setClusterName(clusterName);
- }
-
-
- @Test
- public void testSetLocal() throws Exception {
- ElasticSearchClient testSubject;
- String strIsLocal = "";
-
- // test 1
- testSubject = createTestSubject();
- strIsLocal = null;
- testSubject.setLocal(strIsLocal);
-
- // test 2
- testSubject = createTestSubject();
- strIsLocal = "";
- testSubject.setLocal(strIsLocal);
-
- strIsLocal = "true";
- testSubject.setLocal(strIsLocal);
- }
-
-
- @Test
- public void testIsTransportClient() throws Exception {
- ElasticSearchClient testSubject;
- boolean result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.isTransportClient();
- }
-
-
- @Test
- public void testSetTransportClient() throws Exception {
- ElasticSearchClient testSubject;
- String strIsTransportclient = "";
-
- // test 1
- testSubject = createTestSubject();
- strIsTransportclient = null;
- testSubject.setTransportClient(strIsTransportclient);
-
- // test 2
- testSubject = createTestSubject();
- strIsTransportclient = "true";
- testSubject.setTransportClient(strIsTransportclient);
- }
-}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/GraphElementFactoryTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/GraphElementFactoryTest.java
index f1bf1570e9..931186d336 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/GraphElementFactoryTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/GraphElementFactoryTest.java
@@ -23,16 +23,24 @@ package org.openecomp.sdc.be.dao.graph;
import mockit.Deencapsulation;
import org.junit.Test;
import org.mockito.Mockito;
+import org.openecomp.sdc.be.config.ConfigurationManager;
import org.openecomp.sdc.be.dao.graph.datatype.GraphElementTypeEnum;
import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
+import org.openecomp.sdc.common.api.ConfigurationSource;
+import org.openecomp.sdc.common.impl.ExternalConfiguration;
+import org.openecomp.sdc.common.impl.FSConfigurationSource;
import java.util.HashMap;
import java.util.Map;
public class GraphElementFactoryTest {
+ private static ConfigurationSource configurationSource = new FSConfigurationSource(ExternalConfiguration.getChangeListener(),
+ "src/test/resources/config/catalog-dao");
+ private static ConfigurationManager configurationManager = new ConfigurationManager(configurationSource);
+
@Test
public void testCreateElement() throws Exception {
String label = "mock";
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoMockTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoMockTest.java
index 9d0cd6a204..f1bac6ce1f 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoMockTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoMockTest.java
@@ -372,7 +372,7 @@ public class JanusGraphDaoMockTest {
// default test
- result = testSubject.getParentVertecies(parentVertex, edgeLabel, parseFlag);
+ result = testSubject.getParentVertices(parentVertex, edgeLabel, parseFlag);
}
@Test
@@ -388,7 +388,7 @@ public class JanusGraphDaoMockTest {
JanusGraphVertex value2 = Mockito.mock(JanusGraphVertex.class);
Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
// default test
- result = Deencapsulation.invoke(testSubject, "getAdjacentVerticies",
+ result = Deencapsulation.invoke(testSubject, "getAdjacentVertices",
new Object[] { Vertex.class, EdgeLabelEnum.class, JsonParseFlagEnum.class, Direction.class });
}
@@ -402,7 +402,7 @@ public class JanusGraphDaoMockTest {
// default test
- result = testSubject.getChildrenVertecies(parentVertex, edgeLabel, parseFlag);
+ result = testSubject.getChildrenVertices(parentVertex, edgeLabel, parseFlag);
}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoTest.java
index 4b7c5bced6..2a3a4e8309 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoTest.java
@@ -256,7 +256,7 @@ public class JanusGraphDaoTest extends DAOConfDependentTest{
// default test
- result = dao.getParentVertecies(parentVertex, edgeLabel, parseFlag);
+ result = dao.getParentVertices(parentVertex, edgeLabel, parseFlag);
}
@Test
@@ -269,7 +269,7 @@ public class JanusGraphDaoTest extends DAOConfDependentTest{
// default test
- result = dao.getChildrenVertecies(parentVertex, edgeLabel, parseFlag);
+ result = dao.getChildrenVertices(parentVertex, edgeLabel, parseFlag);
}
@Test
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FetchContext.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FetchContext.java
deleted file mode 100644
index 4bddbc6314..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FetchContext.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 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=========================================================
- */
-
-package org.openecomp.sdc.be.dao.model;
-
-import org.junit.Test;
-
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class FetchContext {
- @Test
- public void shouldHaveValidGettersAndSetters(){
- assertThat(FetchContext.class, hasValidGettersAndSetters());
- }
-}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchResult.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FetchContextTest.java
index ac85e4df17..431f8ec129 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchResult.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FetchContextTest.java
@@ -2,14 +2,14 @@
* ============LICENSE_START=======================================================
* SDC
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2020 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.
@@ -20,14 +20,19 @@
package org.openecomp.sdc.be.dao.model;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Ignore;
import org.junit.Test;
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+//import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
import static org.hamcrest.MatcherAssert.assertThat;
-public class FacetedSearchResult {
- @Test
+public class FetchContextTest {
+ @Ignore
+ @Test
public void shouldHaveValidGettersAndSetters(){
- assertThat(FacetedSearchResult.class, hasValidGettersAndSetters());
+ //assertThat(FetchContextTest.class, hasValidGettersAndSetters());
+ assertTrue(false);
}
-}
+} \ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/BatchBuilderTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/BatchBuilderTest.java
deleted file mode 100644
index 65ce29b946..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/BatchBuilderTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 Nokia. 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=========================================================
- */
-package org.openecomp.sdc.be.dao.neo4j;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
-
-public class BatchBuilderTest {
-
- private GraphRelation graphElement = new GraphRelation();
-
- @Test
- public void shouldAddAndGetElement() {
- BatchBuilder builder = BatchBuilder.getBuilder();
- builder.add(graphElement);
- assertEquals(graphElement, builder.getElements().get(0));
- }
-} \ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgeLabelsTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgeLabelsTest.java
deleted file mode 100644
index 77aa66d55d..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgeLabelsTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 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=========================================================
- */
-
-package org.openecomp.sdc.be.dao.neo4j;
-
-import org.junit.Test;
-
-import java.util.List;
-
-public class GraphEdgeLabelsTest {
-
- private GraphEdgeLabels createTestSubject() {
- return GraphEdgeLabels.ADDITIONAL_INFORMATION;
- }
-
- @Test
- public void testGetProperty() throws Exception {
- GraphEdgeLabels testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getProperty();
- }
-
- @Test
- public void testSetProperty() throws Exception {
- GraphEdgeLabels testSubject;
- String property = "";
-
- // default test
- testSubject = createTestSubject();
- testSubject.setProperty(property);
- }
-
- @Test
- public void testGetAllProperties() throws Exception {
- List<String> result;
-
- // default test
- result = GraphEdgeLabels.getAllProperties();
- }
-
- @Test
- public void testGetByName() throws Exception {
- String property = "";
- GraphEdgeLabels result;
-
- // default test
- result = GraphEdgeLabels.getByName(property);
- result = GraphEdgeLabels.getByName("mock");
- }
-}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgePropertiesDictionaryTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgePropertiesDictionaryTest.java
deleted file mode 100644
index 3c34cc09a2..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgePropertiesDictionaryTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 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=========================================================
- */
-
-package org.openecomp.sdc.be.dao.neo4j;
-
-import org.junit.Test;
-
-import java.util.List;
-
-public class GraphEdgePropertiesDictionaryTest {
-
- private GraphEdgePropertiesDictionary createTestSubject() {
- return GraphEdgePropertiesDictionary.GET_INPUT_INDEX;
- }
-
- @Test
- public void testGetProperty() throws Exception {
- GraphEdgePropertiesDictionary testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getProperty();
- }
-
- @Test
- public void testSetProperty() throws Exception {
- GraphEdgePropertiesDictionary testSubject;
- String property = "";
-
- // default test
- testSubject = createTestSubject();
- testSubject.setProperty(property);
- }
-
- @Test
- public void testGetClazz() throws Exception {
- GraphEdgePropertiesDictionary testSubject;
- Class result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getClazz();
- }
-
- @Test
- public void testSetClazz() throws Exception {
- GraphEdgePropertiesDictionary testSubject;
- Class clazz = null;
-
- // default test
- testSubject = createTestSubject();
- testSubject.setClazz(clazz);
- }
-
- @Test
- public void testGetAllProperties() throws Exception {
- List<String> result;
-
- // default test
- result = GraphEdgePropertiesDictionary.getAllProperties();
- }
-
- @Test
- public void testGetByName() throws Exception {
- String property = "";
- GraphEdgePropertiesDictionary result;
-
- // default test
- result = GraphEdgePropertiesDictionary.getByName(property);
- result = GraphEdgePropertiesDictionary.getByName("mock");
- }
-}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphNeighbourTableTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphNeighbourTableTest.java
deleted file mode 100644
index 14d3f3aeb0..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphNeighbourTableTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 Nokia. 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=========================================================
- */
-package org.openecomp.sdc.be.dao.neo4j;
-
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-import org.openecomp.sdc.be.resources.data.ArtifactData;
-
-public class GraphNeighbourTableTest {
- @Test
- public void shouldHaveValidGettersAndSetters() {
- assertThat(GraphNeighbourTable.class, hasValidGettersAndSetters());
- }
-
- @Test
- public void shouldAddEdge() {
- GraphNeighbourTable graphNeighbourTable = new GraphNeighbourTable();
- NodeRelation directedEdge = new NodeRelation(1, 1, null);
- graphNeighbourTable.addEdge(directedEdge);
- assertEquals(directedEdge, graphNeighbourTable.getDirectedEdges().get(0));
- }
-
- @Test
- public void shouldAddNode() {
- GraphNeighbourTable graphNeighbourTable = new GraphNeighbourTable();
- ArtifactData node = new ArtifactData();
- int index = graphNeighbourTable.addNode(node);
- assertEquals(node, graphNeighbourTable.getNodes().get(0));
- assertEquals(index, 0);
- }
-} \ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphPropertiesDictionaryTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphPropertiesDictionaryTest.java
deleted file mode 100644
index b04811812a..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphPropertiesDictionaryTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 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=========================================================
- */
-
-package org.openecomp.sdc.be.dao.neo4j;
-
-import org.junit.Test;
-
-public class GraphPropertiesDictionaryTest {
-
- private GraphPropertiesDictionary createTestSubject() {
- return GraphPropertiesDictionary.ADDITIONAL_INFO_ID_TO_KEY;
- }
-
- @Test
- public void testGetProperty() throws Exception {
- GraphPropertiesDictionary testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getProperty();
- }
-
- @Test
- public void testGetClazz() throws Exception {
- GraphPropertiesDictionary testSubject;
- Class result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getClazz();
- }
-
- @Test
- public void testIsUnique() throws Exception {
- GraphPropertiesDictionary testSubject;
- boolean result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.isUnique();
- }
-
- @Test
- public void testIsIndexed() throws Exception {
- GraphPropertiesDictionary testSubject;
- boolean result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.isIndexed();
- }
-}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/Neo4jEdgeTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/Neo4jEdgeTest.java
deleted file mode 100644
index 664fed070f..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/Neo4jEdgeTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 Nokia. 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=========================================================
- */
-package org.openecomp.sdc.be.dao.neo4j;
-
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-
-public class Neo4jEdgeTest {
- @Test
- public void shouldHaveValidGettersAndSetters() {
- assertThat(Neo4jEdge.class, hasValidGettersAndSetters());
- }
-} \ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/Neo4jOperationStatusTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/Neo4jOperationStatusTest.java
deleted file mode 100644
index 837cf0baee..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/Neo4jOperationStatusTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 Nokia. 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=========================================================
- */
-package org.openecomp.sdc.be.dao.neo4j;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class Neo4jOperationStatusTest {
-
- @Test
- public void shouldPrintStatusInCorrectFormat() {
- String status = Neo4jOperationStatus.BAD_REQUEST
- .setMessage("A").setHelpErrorMsg("B").setOriginError("C").printError();
- assertEquals(status, "[BAD_REQUEST-C-B-A]");
- }
-} \ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/NodeRelationTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/NodeRelationTest.java
deleted file mode 100644
index 523c519617..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/NodeRelationTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 Nokia. 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=========================================================
- */
-package org.openecomp.sdc.be.dao.neo4j;
-
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-
-public class NodeRelationTest {
- @Test
- public void shouldHaveValidGettersAndSetters() {
- assertThat(NodeRelation.class, hasValidGettersAndSetters());
- }
-} \ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/ElasticSearchUtilTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/ElasticSearchUtilTest.java
deleted file mode 100644
index e3c6e90e2e..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/ElasticSearchUtilTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 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=========================================================
- */
-
-package org.openecomp.sdc.be.dao.utils;
-
-import org.elasticsearch.action.search.SearchResponse;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class ElasticSearchUtilTest {
-
- @Test
- public void testIsResponseEmpty() throws Exception {
- SearchResponse searchResponse = null;
- boolean result;
-
- // test 1
- searchResponse = null;
- result = ElasticSearchUtil.isResponseEmpty(searchResponse);
- Assert.assertEquals(true, result);
- }
-}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/ArtifactDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/ArtifactDaoTest.java
deleted file mode 100644
index dc65d5d236..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/ArtifactDaoTest.java
+++ /dev/null
@@ -1,134 +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=========================================================
- */
-
-package org.openecomp.sdc.be.resources;
-
-import fj.data.Either;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.openecomp.sdc.be.config.ConfigurationManager;
-import org.openecomp.sdc.be.dao.api.IGenericSearchDAO;
-import org.openecomp.sdc.be.dao.api.ResourceUploadStatus;
-import org.openecomp.sdc.be.dao.es.ElasticSearchClient;
-import org.openecomp.sdc.be.resources.api.IResourceUploader;
-import org.openecomp.sdc.be.resources.data.ESArtifactData;
-import org.openecomp.sdc.be.utils.DAOConfDependentTest;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
-import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
-import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
-
-import javax.annotation.Resource;
-
-import static org.junit.Assert.*;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:application-context-test.xml")
-@TestExecutionListeners(listeners = { DependencyInjectionTestExecutionListener.class,
- DirtiesContextTestExecutionListener.class, TransactionalTestExecutionListener.class }) // ,
- // CassandraUnitTestExecutionListener.class})
-public class ArtifactDaoTest extends DAOConfDependentTest {
- private static final String TEST_IMAGES_DIRECTORY = "src/test/resources/images";
-
- @Resource
- ElasticSearchClient esclient;
-
- @Resource(name = "resource-upload")
- private IResourceUploader daoUploader;
- ESArtifactData arData;
-
- @Resource(name = "resource-dao")
- private IGenericSearchDAO resourceDAO;
-
- private String nodeTypeVersion = "1.0.0";
-
- private static ConfigurationManager configurationManager;
-
- @Test
- public void testSaveNewArtifact() {
- // daoUploader = new ArtifactUploader(artifactDAO);
- if (daoUploader == null) {
- assertTrue(false);
- }
- String strData = "qweqwqweqw34e4wrwer";
-
- String myNodeType = "MyNewNodeType";
-
- ESArtifactData arData = new ESArtifactData("artifactNewMarina11", strData.getBytes());
-
- ResourceUploadStatus status = daoUploader.saveArtifact(arData, true);
-
- assertEquals(status, ResourceUploadStatus.OK);
-
- daoUploader.deleteArtifact(arData.getId());
-
- }
-
- @Test
- public void testGetArtifact() {
-
- String myNodeType = "MyNodeType";
-
- // resourceDAO.save(indexedNodeType);
- ESArtifactData arData = getArtifactData(myNodeType, nodeTypeVersion);
-
- ESArtifactData getData = null;
- Either<ESArtifactData, ResourceUploadStatus> getArtifactStatus = daoUploader
- .getArtifact(myNodeType + "- dassasd" + ":" + nodeTypeVersion + ":updatedArtifact");
- if (getArtifactStatus.isRight()) {
- daoUploader.saveArtifact(arData, true);
- getArtifactStatus = daoUploader.getArtifact(arData.getId());
- }
- assertNotNull(getArtifactStatus.left().value());
-
- }
-
-
- @Test
- public void testUpdateArtifact() {
- if (daoUploader == null) {
- fail();
- }
- ResourceUploadStatus status = ResourceUploadStatus.OK;
-
- String myNodeType = "MyUpdatedNodeType";
-
- ESArtifactData arData = getArtifactData(myNodeType, nodeTypeVersion);
- Either<ESArtifactData, ResourceUploadStatus> getArtifactStatus = daoUploader.getArtifact(arData.getId());
-
- if (!getArtifactStatus.isLeft())
- status = daoUploader.saveArtifact(arData, false);
-
- String payload1 = "new payloadjfdsgh";
- arData.setDataAsArray(payload1.getBytes());
-
- status = daoUploader.updateArtifact(arData);
-
- assertEquals(status, ResourceUploadStatus.OK);
- }
-
- private ESArtifactData getArtifactData(String componentName, String componentVersion) {
- String strData = "qweqwqweqw34e4wrwer";
-
- return new ESArtifactData("updatedArtifact", strData.getBytes());
- }
-}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/AuditingDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/AuditingDaoTest.java
deleted file mode 100644
index 919c69fce4..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/AuditingDaoTest.java
+++ /dev/null
@@ -1,445 +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=========================================================
- */
-
-package org.openecomp.sdc.be.resources;
-
-import fj.data.Either;
-import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.index.query.MatchAllQueryBuilder;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.openecomp.sdc.be.config.Configuration;
-import org.openecomp.sdc.be.config.Configuration.ElasticSearchConfig.IndicesTimeFrequencyEntry;
-import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.dao.es.ElasticSearchClient;
-import org.openecomp.sdc.be.dao.impl.AuditingDao;
-import org.openecomp.sdc.be.resources.data.auditing.*;
-import org.openecomp.sdc.be.utils.DAOConfDependentTest;
-import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
-import org.openecomp.sdc.common.datastructure.ESTimeBasedEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
-import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
-import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import static org.junit.Assert.*;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:application-context-test.xml")
-@TestExecutionListeners(listeners = { DependencyInjectionTestExecutionListener.class,
- DirtiesContextTestExecutionListener.class, TransactionalTestExecutionListener.class })
-public class AuditingDaoTest extends DAOConfDependentTest{
- private static Logger log = LoggerFactory.getLogger(AuditingDaoTest.class.getName());
- @Resource(name = "elasticsearch-client")
- private ElasticSearchClient esclient;
-
- @Resource(name = "auditingDao")
- private AuditingDao auditingDao;
-
- @After
- public void tearDown() {
- deleteOldIndexes();
- }
-
- @Before
- public void setup() {
- auditingDao.setConfigurationManager(configurationManager);
- deleteOldIndexes();
- }
-
- private void deleteOldIndexes() {
- DeleteIndexResponse deleteResponse = esclient.getClient().admin().indices()
- .prepareDelete(auditingDao.getIndexPrefix() + "*").execute().actionGet();
- if (!deleteResponse.isAcknowledged()) {
- log.debug("Couldn't delete old auditing indexes!");
- fail();
- }
- }
-
- // @Test
- public void testAddUpdateAdminEventMinute() {
-
- String timestamp = "2015-06-23 13:34:53.123";
-
- String creationPeriod = Constants.MINUTE;
- String expectedIndexName = auditingDao.getIndexPrefix() + "-2015-06-23-13-34";
- assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName).execute().actionGet()
- .isExists());
- Map<AuditingFieldsKey, Object> params = getUserAdminEventParams(timestamp);
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAdminEvent.class);
- params = getUserAccessEventParams(timestamp);
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAccessEvent.class);
- params = getResourceAdminEventParams(timestamp, "addResource");
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, ResourceAdminEvent.class);
- }
-
- // @Test
- public void testAddUpdateAdminEventYearly() {
-
- String timestamp = "2016-06-23 13:34:53.123";
- String creationPeriod = Constants.YEAR;
- String expectedIndexName = auditingDao.getIndexPrefix() + "-2016";
- assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName).execute().actionGet()
- .isExists());
- Map<AuditingFieldsKey, Object> params = getUserAdminEventParams(timestamp);
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAdminEvent.class);
- params = getUserAccessEventParams(timestamp);
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAccessEvent.class);
- params = getResourceAdminEventParams(timestamp, "addResource");
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, ResourceAdminEvent.class);
- }
-
- @Test
- public void testGetDistributionStatusEvent() {
-
- String timestamp1 = "2016-06-23 13:34:53.123";
- String creationPeriod = Constants.MONTH;
- String expectedIndexName1 = auditingDao.getIndexPrefix() + "-2016-06";
- assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName1).execute().actionGet()
- .isExists());
- Map<AuditingFieldsKey, Object> params = getDistributionStatusEventParams(timestamp1);
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName1, DistributionStatusEvent.class);
- String timestamp2 = "2015-06-23 13:34:53.123";
-
- String expectedIndexName2 = auditingDao.getIndexPrefix() + "-2015-06";
- assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName2).execute().actionGet()
- .isExists());
- Map<AuditingFieldsKey, Object> params2 = getDistributionStatusEventParams(timestamp2);
- testCreationPeriodScenario(params2, creationPeriod, expectedIndexName2, DistributionStatusEvent.class);
- Either<List<ESTimeBasedEvent>, ActionStatus> status = auditingDao.getListOfDistributionStatuses("123-456");
- assertEquals(2, status.left().value().size());
- }
-
- @Test
- public void testGetCountAdminEventMonthly() {
-
- String timestamp1 = "2016-06-23 13:34:53.123";
- String timestamp2 = "2015-06-23 13:34:53.123";
- String creationPeriod = Constants.MONTH;
- String expectedIndexName1 = auditingDao.getIndexPrefix() + "-2016-06";
- assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName1).execute().actionGet()
- .isExists());
- String expectedIndexName2 = auditingDao.getIndexPrefix() + "-2015-06";
- assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName2).execute().actionGet()
- .isExists());
-
- Map<AuditingFieldsKey, Object> params1 = getUserAdminEventParams(timestamp1);
- testCreationPeriodScenario(params1, creationPeriod, expectedIndexName1, UserAdminEvent.class);
- Map<AuditingFieldsKey, Object> params2 = getUserAdminEventParams(timestamp2);
- testCreationPeriodScenario(params2, creationPeriod, expectedIndexName2, UserAdminEvent.class);
-
- long count = auditingDao.count(UserAdminEvent.class, new MatchAllQueryBuilder());
- log.debug("Testing auditing count {}", count);
- assertEquals(2, count);
- }
-
- @Test
- public void testServiceDistributionStatuses() {
-
- String timestamp = "2016-06-23 13:34:53.123";
- String creationPeriod = Constants.MONTH;
- String expectedIndexName = auditingDao.getIndexPrefix() + "-2016-06";
- assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName).execute().actionGet()
- .isExists());
- Map<AuditingFieldsKey, Object> params = getUserAdminEventParams(timestamp);
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAdminEvent.class);
- params = getUserAccessEventParams(timestamp);
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAccessEvent.class);
- params = getResourceAdminEventParams(timestamp, "DRequest");
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, ResourceAdminEvent.class);
- params = getDistributionNotificationEventParams(timestamp);
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, DistributionNotificationEvent.class);
- Either<List<ESTimeBasedEvent>, ActionStatus> status = auditingDao
- .getServiceDistributionStatusesList("SeviceId");
- log.debug("Testing auditing count {}", status);
- }
-
- @Test
- public void testAddUpdateAdminEventMonthly() {
-
- String timestamp = "2016-06-23 13:34:53.123";
- String creationPeriod = Constants.MONTH;
- String expectedIndexName = auditingDao.getIndexPrefix() + "-2016-06";
- assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName).execute().actionGet()
- .isExists());
- Map<AuditingFieldsKey, Object> params = getUserAdminEventParams(timestamp);
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAdminEvent.class);
- params = getUserAccessEventParams(timestamp);
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAccessEvent.class);
- params = getResourceAdminEventParams(timestamp, "addResource");
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, ResourceAdminEvent.class);
- }
-
- @Test
- public void testGetFilteredResourceAdminAuditingEvents() {
- Map<AuditingFieldsKey, Object> filterMap = new HashMap<>();
- filterMap.put(AuditingFieldsKey.AUDIT_ACTION, new Object());
- Either<List<ESTimeBasedEvent>, ActionStatus> filteredResourceAdminAuditingEvents = auditingDao
- .getFilteredResourceAdminAuditingEvents(filterMap);
- }
-
- @Test
- public void testGetListOfDistributionByAction() {
- Either<List<ESTimeBasedEvent>, ActionStatus> filteredResourceAdminAuditingEvents = auditingDao
- .getListOfDistributionByAction("mock", "mock", "mock", AuditingGenericEvent.class);
- filteredResourceAdminAuditingEvents = auditingDao
- .getListOfDistributionByAction("mock", "mock", null, AuditingGenericEvent.class);
- }
-
- private SearchResponse testCreationPeriodScenario(Map<AuditingFieldsKey, Object> params, String creationPeriod,
- String expectedIndexName, Class<? extends AuditingGenericEvent> clazz) {
-
- String typeName = clazz.getSimpleName().toLowerCase();
- log.debug("Testing auditing type {}", typeName);
- setCreationPeriod(creationPeriod);
- ActionStatus saveUserAdminEvent = auditingDao.addRecord(params, typeName);
- assertEquals(ActionStatus.OK, saveUserAdminEvent);
- assertTrue(esclient.getClient().admin().indices().prepareExists(expectedIndexName).execute().actionGet()
- .isExists());
- MatchAllQueryBuilder matchAllQueryBuilder = new MatchAllQueryBuilder();
-
- SearchResponse searchResponse = esclient.getClient().prepareSearch(expectedIndexName).setTypes(typeName)
- .setQuery(matchAllQueryBuilder).execute().actionGet();
-
- SearchHits hits = searchResponse.getHits();
- assertEquals(1, hits.getTotalHits());
- log.debug("Checking that all expected fields are properly persisted");
- validateHitValues(params, hits.getAt(0));
- log.debug("testCreationPeriodScenario successful");
- return searchResponse;
- }
-
- private void validateHitValues(Map<AuditingFieldsKey, Object> params, SearchHit searchHit) {
- Map<String, Object> source = searchHit.getSource();
- log.debug("Hit source is {}", searchHit.sourceAsString());
- for (Entry<AuditingFieldsKey, Object> paramsEntry : params.entrySet()) {
- AuditingFieldsKey key = paramsEntry.getKey();
- log.debug("Testing auditing field {}", key.name());
- Object value = paramsEntry.getValue();
- // assertEquals(value, source.get(auditField2esField.get(key)));
- assertEquals(value, source.get(key.getDisplayName()));
- }
- }
-
- private void setCreationPeriod(String creationPeriod) {
- Configuration configuration = configurationManager.getConfiguration();
- List<IndicesTimeFrequencyEntry> indicesTimeFrequencyEntries = new ArrayList<>();
- IndicesTimeFrequencyEntry indicesTimeFrequencyEntry = new IndicesTimeFrequencyEntry();
- indicesTimeFrequencyEntry.setIndexPrefix("auditingevents");
- indicesTimeFrequencyEntry.setCreationPeriod(creationPeriod);
- configuration.getElasticSearch().setIndicesTimeFrequency(indicesTimeFrequencyEntries);
- }
-
- private Map<AuditingFieldsKey, Object> getUserAdminEventParams(String timestamp) {
-
- Map<AuditingFieldsKey, Object> params = new HashMap<>();
- String action = "updateUser";
- String modifierName = "moshe moshe";
- String modifierUid = "mosheUid";
- String userUid = "mosheUid";
- String userBeforeName = "moshe moshe";
- String userBeforeEmail = "moshe@moshe1.com";
- String userBeforeRole = "TESTER";
- String userAfterName = "moshe moshe";
- String userAfterEmail = "moshe@moshe2.com";
- String userAfterRole = "TESTER";
- String userStatus = "200";
- String userDesc = "OK";
-
- params.put(AuditingFieldsKey.AUDIT_ACTION, action);
- params.put(AuditingFieldsKey.AUDIT_MODIFIER_UID, modifierName + '(' + modifierUid + ')');
- params.put(AuditingFieldsKey.AUDIT_USER_UID, userUid);
- params.put(AuditingFieldsKey.AUDIT_USER_BEFORE,
- userUid + ", " + userBeforeName + ", " + userBeforeEmail + ", " + userBeforeRole);
- params.put(AuditingFieldsKey.AUDIT_USER_AFTER,
- userUid + ", " + userAfterName + ", " + userAfterEmail + ", " + userAfterRole);
- params.put(AuditingFieldsKey.AUDIT_STATUS, userStatus);
- params.put(AuditingFieldsKey.AUDIT_DESC, userDesc);
- params.put(AuditingFieldsKey.AUDIT_TIMESTAMP, timestamp);
-
- return params;
- }
-
- private Map<AuditingFieldsKey, Object> getUserAccessEventParams(String timestamp) {
-
- Map<AuditingFieldsKey, Object> params = new HashMap<>();
- String action = "userAccess";
- String userUid = "mosheUid";
- String userName = "moshe moshe";
- String userStatus = "200";
- String userDesc = "OK";
-
- params.put(AuditingFieldsKey.AUDIT_ACTION, action);
- params.put(AuditingFieldsKey.AUDIT_USER_UID, userName + '(' + userUid + ')');
- params.put(AuditingFieldsKey.AUDIT_STATUS, userStatus);
- params.put(AuditingFieldsKey.AUDIT_DESC, userDesc);
- params.put(AuditingFieldsKey.AUDIT_TIMESTAMP, timestamp);
-
- return params;
- }
-
- private Map<AuditingFieldsKey, Object> getResourceAdminEventParams(String timestamp, String action) {
-
- Map<AuditingFieldsKey, Object> params = new HashMap<>();
-
- String modifierName = "moshe moshe";
- String modifierUid = "mosheUid";
- String resourceName = "Centos";
- String resourceType = "Resource";
- String currState = "READY_FOR_CERTIFICATION";
- String prevState = "CHECKED_OUT";
- String currVersion = "1.1.4";
- String prevVersion = "1.1.3";
- String status = "200";
- String desc = "OK";
- String distributionId = "123-456";
- String serviceId = "SeviceId";
-
- params.put(AuditingFieldsKey.AUDIT_ACTION, action);
- params.put(AuditingFieldsKey.AUDIT_MODIFIER_NAME, modifierName);
- params.put(AuditingFieldsKey.AUDIT_MODIFIER_UID, modifierUid);
- params.put(AuditingFieldsKey.AUDIT_RESOURCE_NAME, resourceName);
- params.put(AuditingFieldsKey.AUDIT_RESOURCE_TYPE, resourceType);
- params.put(AuditingFieldsKey.AUDIT_RESOURCE_CURR_STATE, currState);
- params.put(AuditingFieldsKey.AUDIT_RESOURCE_PREV_STATE, prevState);
- params.put(AuditingFieldsKey.AUDIT_RESOURCE_CURR_VERSION, currVersion);
- params.put(AuditingFieldsKey.AUDIT_RESOURCE_PREV_VERSION, prevVersion);
- params.put(AuditingFieldsKey.AUDIT_STATUS, status);
- params.put(AuditingFieldsKey.AUDIT_DESC, desc);
- params.put(AuditingFieldsKey.AUDIT_TIMESTAMP, timestamp);
- params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID, distributionId);
- params.put(AuditingFieldsKey.AUDIT_SERVICE_INSTANCE_ID, serviceId);
-
- return params;
- }
-
- private Map<AuditingFieldsKey, Object> getDistributionStatusEventParams(String timestamp) {
-
- Map<AuditingFieldsKey, Object> params = new HashMap<>();
- String action = "DStatus";
- String modifierName = "moshe moshe";
- String modifierUid = "mosheUid";
- String topicName = "Centos";
- String serviceId = "SeviceId";
- String resourceUrl = "resourceUrl";
- String distributionId = "123-456";
-
- String status = "200";
- String desc = "OK";
-
- params.put(AuditingFieldsKey.AUDIT_DESC, desc);
- params.put(AuditingFieldsKey.AUDIT_TIMESTAMP, timestamp);
- params.put(AuditingFieldsKey.AUDIT_STATUS, status);
- params.put(AuditingFieldsKey.AUDIT_ACTION, action);
- params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID, distributionId);
- params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_CONSUMER_ID, modifierUid);
- params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_TOPIC_NAME, topicName);
- params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_RESOURCE_URL, resourceUrl);
- params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_STATUS_TIME, timestamp);
- params.put(AuditingFieldsKey.AUDIT_SERVICE_INSTANCE_ID, serviceId);
-
- return params;
- }
-
- // @Test
- public void getListOfDistributionByActionTest() {
-
- String timestamp = "2016-06-23 13:34:53.123";
- String distributionId = "123-456";
-
- String creationPeriod = Constants.MONTH;
- String expectedIndexName = auditingDao.getIndexPrefix() + "-2016-06";
- assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName).execute().actionGet()
- .isExists());
-
- Map<AuditingFieldsKey, Object> params = getResourceAdminEventParams(timestamp, "DRequest");
- params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID, distributionId);
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, ResourceAdminEvent.class);
- params = getDistributionNotificationEventParams(timestamp);
- params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID, distributionId);
-
- testCreationPeriodScenario(params, creationPeriod, expectedIndexName, DistributionNotificationEvent.class);
-
- Either<List<ESTimeBasedEvent>, ActionStatus> distributionByAction = auditingDao
- .getListOfDistributionByAction(distributionId, "DRequest", "200", ResourceAdminEvent.class);
- assertTrue(distributionByAction.isLeft());
- assertFalse(distributionByAction.left().value().isEmpty());
-
- distributionByAction = auditingDao.getListOfDistributionByAction(distributionId, "DNotify", "200",
- DistributionNotificationEvent.class);
- assertTrue(distributionByAction.isLeft());
- assertFalse(distributionByAction.left().value().isEmpty());
-
- }
-
- private Map<AuditingFieldsKey, Object> getDistributionNotificationEventParams(String timestamp) {
-
- Map<AuditingFieldsKey, Object> params = new HashMap<>();
-
- String action = "DNotify";
- String modifierName = "moshe moshe";
- String modifierUid = "mosheUid";
- String resourceName = "Centos";
- String resourceType = "Resource";
-
- String currVersion = "1.1.4";
- String currState = "READY_FOR_CERTIFICATION";
- String status = "200";
- String desc = "OK";
- String did = "1027";
- String topicName = "Centos";
- String serviceId = "SeviceId";
- String requestId = "12364";
-
- params.put(AuditingFieldsKey.AUDIT_ACTION, action);
- params.put(AuditingFieldsKey.AUDIT_MODIFIER_NAME, requestId);
- params.put(AuditingFieldsKey.AUDIT_MODIFIER_UID, modifierUid);
- params.put(AuditingFieldsKey.AUDIT_MODIFIER_NAME, modifierName);
- params.put(AuditingFieldsKey.AUDIT_RESOURCE_NAME, resourceName);
- params.put(AuditingFieldsKey.AUDIT_RESOURCE_TYPE, resourceType);
- params.put(AuditingFieldsKey.AUDIT_RESOURCE_CURR_STATE, currState);
- params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_TOPIC_NAME, topicName);
- params.put(AuditingFieldsKey.AUDIT_RESOURCE_CURR_VERSION, currVersion);
- params.put(AuditingFieldsKey.AUDIT_STATUS, status);
- params.put(AuditingFieldsKey.AUDIT_DESC, desc);
- params.put(AuditingFieldsKey.AUDIT_TIMESTAMP, timestamp);
- params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID, did);
- params.put(AuditingFieldsKey.AUDIT_SERVICE_INSTANCE_ID, serviceId);
- return params;
- }
-
-}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java
deleted file mode 100644
index 591f118c7c..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 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=========================================================
- */
-
-package org.openecomp.sdc.be.resources.data;
-
-import org.junit.Test;
-import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-public class ConsumerDataTest {
-
- private ConsumerData createTestSubject() {
- return new ConsumerData();
- }
-
- @Test
- public void testCtor() throws Exception {
- new ConsumerData(new ConsumerDataDefinition());
- new ConsumerData(new HashMap<>());
- }
-
- @Test
- public void testGetUniqueIdKey() throws Exception {
- ConsumerData testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getUniqueIdKey();
- }
-
-
- @Test
- public void testGetUniqueId() throws Exception {
- ConsumerData testSubject;
- Object result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getUniqueId();
- }
-
-
- @Test
- public void testGetConsumerDataDefinition() throws Exception {
- ConsumerData testSubject;
- ConsumerDataDefinition result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getConsumerDataDefinition();
- }
-
-
- @Test
- public void testToGraphMap() throws Exception {
- ConsumerData testSubject;
- Map<String, Object> result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.toGraphMap();
- }
-
-
- @Test
- public void testToString() throws Exception {
- ConsumerData testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.toString();
- }
-}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ESArtifactDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ESArtifactDataTest.java
deleted file mode 100644
index 8dd407f506..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ESArtifactDataTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 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=========================================================
- */
-
-package org.openecomp.sdc.be.resources.data;
-
-import org.junit.Test;
-
-import java.nio.ByteBuffer;
-
-public class ESArtifactDataTest {
-
- private ESArtifactData createTestSubject() {
- return new ESArtifactData();
- }
-
- @Test
- public void testCtor() throws Exception {
- new ESArtifactData("mock");
- new ESArtifactData("mock", new byte[0]);
- }
-
- @Test
- public void testGetDataAsArray() throws Exception {
- ESArtifactData testSubject;
- byte[] result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getDataAsArray();
- }
-
- @Test
- public void testSetDataAsArray() throws Exception {
- ESArtifactData testSubject;
- byte[] data = new byte[] { ' ' };
-
- // test 1
- testSubject = createTestSubject();
- data = null;
- testSubject.setDataAsArray(data);
-
- // test 2
- testSubject = createTestSubject();
- data = new byte[] { ' ' };
- testSubject.setDataAsArray(data);
- }
-
- @Test
- public void testGetData() throws Exception {
- ESArtifactData testSubject;
- ByteBuffer result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getData();
- }
-
- @Test
- public void testSetData() throws Exception {
- ESArtifactData testSubject;
- ByteBuffer data = null;
-
- // test 1
- testSubject = createTestSubject();
- data = null;
- testSubject.setData(data);
- }
-
- @Test
- public void testGetId() throws Exception {
- ESArtifactData testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getId();
- }
-
- @Test
- public void testSetId() throws Exception {
- ESArtifactData testSubject;
- String id = "";
-
- // default test
- testSubject = createTestSubject();
- testSubject.setId(id);
- }
-}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java
index 2663125d7a..66b55b4302 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java
@@ -21,6 +21,7 @@
package org.openecomp.sdc.be.resources.data;
import org.junit.Test;
+import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionaryExtractor;
import org.openecomp.sdc.be.datatypes.elements.ProductMetadataDataDefinition;
import java.util.HashMap;
@@ -36,7 +37,7 @@ public class ProductMetadataDataTest {
@Test
public void testCtor() throws Exception {
new ProductMetadataData(new ProductMetadataDataDefinition());
- new ProductMetadataData(new HashMap<>());
+ new ProductMetadataData(new GraphPropertiesDictionaryExtractor(new HashMap<>()));
}
@Test
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceMetadataDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceMetadataDataTest.java
index faaa491bac..9723f24c51 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceMetadataDataTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceMetadataDataTest.java
@@ -21,6 +21,7 @@
package org.openecomp.sdc.be.resources.data;
import org.junit.Test;
+import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionaryExtractor;
import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition;
import java.util.HashMap;
@@ -35,7 +36,7 @@ public class ResourceMetadataDataTest {
@Test
public void testCtor() throws Exception {
new ResourceMetadataData(new ResourceMetadataDataDefinition());
- new ResourceMetadataData(new HashMap<>());
+ new ResourceMetadataData(new GraphPropertiesDictionaryExtractor(new HashMap<>()));
}
@Test
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceArtifactsDataCollectionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceArtifactsDataCollectionTest.java
deleted file mode 100644
index fd61d54b80..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceArtifactsDataCollectionTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 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=========================================================
- */
-
-package org.openecomp.sdc.be.resources.data;
-
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-
-public class ServiceArtifactsDataCollectionTest {
-
- private ServiceArtifactsDataCollection createTestSubject() {
- return new ServiceArtifactsDataCollection();
- }
-
-
- @Test
- public void testGetServiceArtifactDataMap() throws Exception {
- ServiceArtifactsDataCollection testSubject;
- Map<String, List<ESArtifactData>> result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getServiceArtifactDataMap();
- }
-
-
- @Test
- public void testSetServiceArtifactDataMap() throws Exception {
- ServiceArtifactsDataCollection testSubject;
- Map<String, List<ESArtifactData>> serviceArtifactDataMap = null;
-
- // default test
- testSubject = createTestSubject();
- testSubject.setServiceArtifactDataMap(serviceArtifactDataMap);
- }
-
-
- @Test
- public void testGetNodeTemplateArtifacts() throws Exception {
- ServiceArtifactsDataCollection testSubject;
- String nodeTemplateName = "";
- List<ESArtifactData> result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getNodeTemplateArtifacts(nodeTemplateName);
- }
-}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java
index 104c762d8c..ac51bfdaa6 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java
@@ -21,7 +21,12 @@
package org.openecomp.sdc.be.resources.data;
import org.junit.Test;
+import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionaryExtractor;
import org.openecomp.sdc.be.datatypes.components.ServiceMetadataDataDefinition;
+import org.openecomp.sdc.common.api.ConfigurationSource;
+import org.openecomp.sdc.common.impl.ExternalConfiguration;
+import org.openecomp.sdc.common.impl.FSConfigurationSource;
import java.util.HashMap;
import java.util.Map;
@@ -29,13 +34,17 @@ import java.util.Map;
public class ServiceMetadataDataTest {
+ private static ConfigurationSource configurationSource = new FSConfigurationSource(ExternalConfiguration.getChangeListener(),
+ "src/test/resources/config/catalog-dao");
+ private static ConfigurationManager configurationManager = new ConfigurationManager(configurationSource);
+
private ServiceMetadataData createTestSubject() {
return new ServiceMetadataData();
}
@Test
public void testCtor() throws Exception {
- new ServiceMetadataData(new HashMap());
+ new ServiceMetadataData(new GraphPropertiesDictionaryExtractor(new HashMap<>()));
new ServiceMetadataData(new ServiceMetadataDataDefinition());
}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java
index ec19b9a6ce..8cdbe3ec73 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java
@@ -117,7 +117,7 @@ public class DistributionStatusEventTest {
@Test
- public void testGetResoureURL() throws Exception {
+ public void testGetResourceURL() throws Exception {
DistributionStatusEvent testSubject;
String result;
@@ -128,13 +128,13 @@ public class DistributionStatusEventTest {
@Test
- public void testSetResoureURL() throws Exception {
+ public void testSetResourceURL() throws Exception {
DistributionStatusEvent testSubject;
- String resoureURL = "";
+ String resourceURL = "";
// default test
testSubject = createTestSubject();
- testSubject.setResoureURL(resoureURL);
+ testSubject.setResoureURL(resourceURL);
}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/EcompOperationalEnvironmentEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/EcompOperationalEnvironmentEventTest.java
index 1d99a01536..bbf8627e42 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/EcompOperationalEnvironmentEventTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/EcompOperationalEnvironmentEventTest.java
@@ -113,7 +113,7 @@ public class EcompOperationalEnvironmentEventTest {
// default test
testSubject = createTestSubject();
- testSubject.setOperational_environment_type(operationalEnvironmentType);
+ testSubject.setOperationalEnvironmentType(operationalEnvironmentType);
}
@Test
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/togglz/FeatureToggleEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/togglz/FeatureToggleEventTest.java
new file mode 100644
index 0000000000..53bf27d9f9
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/togglz/FeatureToggleEventTest.java
@@ -0,0 +1,103 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2020 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=========================================================
+ */
+
+package org.openecomp.sdc.be.resources.data.togglz;
+
+import org.junit.Test;
+import org.togglz.core.repository.FeatureState;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+public class FeatureToggleEventTest {
+ private final String strategyId = "123456";
+ private final String param1 = "param1";
+ private final String param1Value = "param1Value";
+ private final String param2 = "param2";
+ private final String param2Value = "param2Value";
+
+ @Test
+ public void createEventFromFeatureStateObject() {
+ final String param3 = "param3";
+ final String param3Value = "param3Value";
+ final String responseParams = "param3=param3Value,param1=param1Value,param2=param2Value";
+
+
+ FeatureState featureState = new FeatureState(ToggleableFeature.DEFAULT_FEATURE, true);
+ featureState.setStrategyId(strategyId)
+ .setParameter(param1, param1Value)
+ .setParameter(param2, param2Value)
+ .setParameter(param3, param3Value);
+
+ FeatureToggleEvent featureToggleEvent = new FeatureToggleEvent(featureState);
+ assertThat(featureToggleEvent.getEnabled(), is("true"));
+ assertThat(featureToggleEvent.getStrategyId(), is(strategyId));
+ assertThat(featureToggleEvent.getParameters(), is(responseParams));
+ }
+
+ @Test
+ public void createEventWhenStrategyIsNotSetAndStateIsFalse() {
+ FeatureState featureState = new FeatureState(ToggleableFeature.DEFAULT_FEATURE, false);
+
+ FeatureToggleEvent featureToggleEvent = new FeatureToggleEvent(featureState);
+ assertThat(featureToggleEvent.getEnabled(), is("false"));
+ assertThat(featureToggleEvent.getParameters(), isEmptyString());
+ assertThat(featureToggleEvent.getStrategyId(), isEmptyOrNullString());
+ }
+
+ @Test
+ public void getFeatureStateObjectFromEventWithNoParams() {
+ FeatureState featureState = new FeatureState(ToggleableFeature.DEFAULT_FEATURE, true);
+ FeatureToggleEvent featureToggleEvent = new FeatureToggleEvent(featureState);
+ FeatureState fromEvent = featureToggleEvent.getFeatureState();
+ assertThat(ToggleableFeature.DEFAULT_FEATURE, is(fromEvent.getFeature()));
+ assertThat(fromEvent.isEnabled(), is(true));
+ assertThat(fromEvent.getParameterMap().size(), is(0));
+ assertThat(fromEvent.getStrategyId(), nullValue());
+ }
+
+ @Test
+ public void getFeatureStateObjectFromEventWithParams() {
+ FeatureState featureState = new FeatureState(ToggleableFeature.DEFAULT_FEATURE, true);
+ featureState.setStrategyId(strategyId)
+ .setParameter(param1, param1Value)
+ .setParameter(param2, param2Value);
+ FeatureToggleEvent featureToggleEvent = new FeatureToggleEvent(featureState);
+ FeatureState fromEvent = featureToggleEvent.getFeatureState();
+ assertThat(fromEvent.getFeature(), is(ToggleableFeature.DEFAULT_FEATURE));
+ assertThat(fromEvent.isEnabled(), is(true));
+ assertThat(fromEvent.getStrategyId(), is(strategyId));
+ assertThat(fromEvent.getParameterMap().size(), is(2));
+ assertThat(fromEvent.getParameterMap().get(param1), is(param1Value));
+ assertThat(fromEvent.getParameterMap().get(param2), is(param2Value));
+ }
+
+ @Test
+ public void getFeatureStateObjectFromEventWhenStateIsWrong() {
+ FeatureState featureState = new FeatureState(ToggleableFeature.DEFAULT_FEATURE, true);
+ FeatureToggleEvent featureToggleEvent = new FeatureToggleEvent(featureState);
+ featureToggleEvent.setFeatureName("wrong");
+ assertThat(featureToggleEvent.getFeatureState(), nullValue());
+ }
+
+}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/exception/ResourceDAOExceptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/exception/ResourceDAOExceptionTest.java
deleted file mode 100644
index 4ea58818e1..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/exception/ResourceDAOExceptionTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 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=========================================================
- */
-
-package org.openecomp.sdc.be.resources.exception;
-
-import org.junit.Test;
-import org.openecomp.sdc.be.dao.api.ResourceUploadStatus;
-
-
-public class ResourceDAOExceptionTest {
-
- private ResourceDAOException createTestSubject() {
- return new ResourceDAOException("", null);
- }
-
- @Test
- public void testCtor() throws Exception {
- new ResourceDAOException("mock");
- new ResourceDAOException("mock", new Throwable());
- new ResourceDAOException(ResourceUploadStatus.ALREADY_EXIST, "mock");
- new ResourceDAOException(ResourceUploadStatus.ALREADY_EXIST, "mock", new Throwable());
- }
-
- @Test
- public void testGetStatus() throws Exception {
- ResourceDAOException testSubject;
- ResourceUploadStatus result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getStatus();
- }
-
-
- @Test
- public void testSetStatus() throws Exception {
- ResourceDAOException testSubject;
- ResourceUploadStatus status = null;
-
- // default test
- testSubject = createTestSubject();
- testSubject.setStatus(status);
- }
-}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/impl/ResourceUploaderTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/impl/ResourceUploaderTest.java
deleted file mode 100644
index 71e52f9df2..0000000000
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/impl/ResourceUploaderTest.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 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=========================================================
- */
-
-package org.openecomp.sdc.be.resources.impl;
-
-import fj.data.Either;
-import mockit.Deencapsulation;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.openecomp.sdc.be.dao.api.ICatalogDAO;
-import org.openecomp.sdc.be.dao.api.ResourceUploadStatus;
-import org.openecomp.sdc.be.resources.data.ESArtifactData;
-import org.openecomp.sdc.be.resources.exception.ResourceDAOException;
-import org.openecomp.sdc.be.utils.DAOConfDependentTest;
-
-public class ResourceUploaderTest extends DAOConfDependentTest{
-
- @InjectMocks
- ResourceUploader testSubject;
-
- @Mock
- ICatalogDAO resourceDAO;
-
- @Before
- public void setUpMocks() throws Exception {
- MockitoAnnotations.initMocks(this);
- }
-
- @Test
- public void testCtor() throws Exception {
- new ResourceUploader();
- ICatalogDAO resourcetDAO = Mockito.mock(ICatalogDAO.class);
- new ResourceUploader(resourcetDAO);
- }
-
- @Test
- public void testInit() throws Exception {
- // default test
- testSubject.init();
- }
-
- @Test
- public void testGetResourceDAO() throws Exception {
- ICatalogDAO result;
-
- // default test
- result = testSubject.getResourceDAO();
- }
-
- @Test
- public void testSetResourceDAO() throws Exception {
- ICatalogDAO resourceDAO = null;
-
- // default test
- testSubject.setResourceDAO(resourceDAO);
- }
-
- @Test
- public void testSaveArtifact() throws Exception {
- ESArtifactData artifactData = new ESArtifactData();
- artifactData.setId("mock");
- boolean isReload = false;
- ResourceUploadStatus result;
-
- Either<ESArtifactData, ResourceUploadStatus> value = Either.left(new ESArtifactData());
- Mockito.when(resourceDAO.getArtifact(Mockito.anyString())).thenReturn(value);
-
- // default test
- result = testSubject.saveArtifact(artifactData, isReload);
- }
-
- @Test
- public void testSaveArtifact2() throws Exception {
- ESArtifactData artifactData = new ESArtifactData();
- artifactData.setId("mock");
- boolean isReload = true;
- ResourceUploadStatus result;
-
- Either<ESArtifactData, ResourceUploadStatus> value = Either.left(new ESArtifactData());
- Mockito.when(resourceDAO.getArtifact(Mockito.anyString())).thenReturn(value);
-
- // default test
- result = testSubject.saveArtifact(artifactData, isReload);
- }
-
- @Test
- public void testSaveArtifactFailed() throws Exception {
- ESArtifactData artifactData = new ESArtifactData();
- artifactData.setId("mock");
- boolean isReload = false;
- ResourceUploadStatus result;
-
- Either<ESArtifactData, ResourceUploadStatus> value = Either.right(ResourceUploadStatus.ALREADY_EXIST);
- Mockito.when(resourceDAO.getArtifact(Mockito.anyString())).thenReturn(value);
-
- // default test
- result = testSubject.saveArtifact(artifactData, isReload);
- }
-
- @Test
- public void testSaveArtifactFailedException() throws Exception {
- ESArtifactData artifactData = new ESArtifactData();
- artifactData.setId("mock");
- boolean isReload = false;
- ResourceUploadStatus result;
-
- Either<ESArtifactData, ResourceUploadStatus> value = Either.right(ResourceUploadStatus.ALREADY_EXIST);
- Mockito.when(resourceDAO.getArtifact(Mockito.anyString())).thenReturn(value);
- Mockito.doThrow(new ResourceDAOException("mock")).when(resourceDAO).writeArtifact(Mockito.any());
-
- // default test
- result = testSubject.saveArtifact(artifactData, isReload);
- }
-
- @Test
- public void testSaveArtifactFailedDAONull() throws Exception {
- ESArtifactData artifactData = new ESArtifactData();
- boolean isReload = false;
- ResourceUploadStatus result;
-
- // default test
- ResourceUploader resourceUploader = new ResourceUploader(null);
- result = resourceUploader.saveArtifact(artifactData, isReload);
- }
-
- @Test
- public void testUpdateArtifact() throws Exception {
- ESArtifactData artifactUpdateData = new ESArtifactData();
- artifactUpdateData.setId("mock");
- ResourceUploadStatus result;
-
- Either<ESArtifactData, ResourceUploadStatus> value = Either.left(new ESArtifactData());
- Mockito.when(resourceDAO.getArtifact(Mockito.anyString())).thenReturn(value);
-
- // default test
- result = testSubject.updateArtifact(artifactUpdateData);
- }
-
- @Test
- public void testUpdateArtifactNotFound() throws Exception {
- ESArtifactData artifactUpdateData = new ESArtifactData();
- artifactUpdateData.setId("mock");
- ResourceUploadStatus result;
-
- Either<ESArtifactData, ResourceUploadStatus> value = Either.right(ResourceUploadStatus.NOT_EXIST);
- Mockito.when(resourceDAO.getArtifact(Mockito.anyString())).thenReturn(value);
-
- // default test
- result = testSubject.updateArtifact(artifactUpdateData);
- }
-
- @Test
- public void testUpdateArtifactException() throws Exception {
- ESArtifactData artifactUpdateData = new ESArtifactData();
- artifactUpdateData.setId("mock");
- ResourceUploadStatus result;
-
- Either<ESArtifactData, ResourceUploadStatus> value = Either.left(new ESArtifactData());
- Mockito.when(resourceDAO.getArtifact(Mockito.anyString())).thenReturn(value);
- Mockito.doThrow(new ResourceDAOException("mock")).when(resourceDAO).writeArtifact(Mockito.any());
-
- // default test
- result = testSubject.updateArtifact(artifactUpdateData);
- }
-
- @Test
- public void testUpdateArtifactDAONull() throws Exception {
- ESArtifactData artifactUpdateData = new ESArtifactData();
- ResourceUploadStatus result;
-
- // default test
- ResourceUploader resourceUploader = new ResourceUploader();
- result = resourceUploader.updateArtifact(artifactUpdateData);
- }
-
- @Test
- public void testGetArtifact() throws Exception {
- String id = "";
- Either<ESArtifactData, ResourceUploadStatus> result;
-
- // default test
- result = testSubject.getArtifact(id);
- }
-
- @Test
- public void testGetArtifactNull() throws Exception {
- String id = "";
- Either<ESArtifactData, ResourceUploadStatus> result;
-
- // default test
- ResourceUploader resourceUploader = new ResourceUploader();
- result = resourceUploader.getArtifact(id);
- }
-
- @Test
- public void testDeleteArtifact() throws Exception {
- String id = "";
-
- // default test
- testSubject.deleteArtifact(id);
- }
-
- @Test
- public void testUpdateArtifact_1() throws Exception {
- ESArtifactData artifactUpdateData = new ESArtifactData();
- ESArtifactData existData = new ESArtifactData();
- ResourceUploadStatus result;
-
- // default test
- result = Deencapsulation.invoke(testSubject, "updateArtifact",
- artifactUpdateData, existData);
- }
-
- @Test
- public void testUpdateData() throws Exception {
- ESArtifactData artifactUpdateData = new ESArtifactData();
- ESArtifactData existData = new ESArtifactData();
-
- // default test
- Deencapsulation.invoke(testSubject, "updateData", artifactUpdateData, existData);
- }
-
- @Test
- public void testDeleteAllArtifacts() throws Exception {
- // default test
- testSubject.deleteAllArtifacts();
- }
-}