Fix failing unit test 32/96732/1
authorvasraz <vasyl.razinkov@est.tech>
Tue, 8 Oct 2019 15:44:09 +0000 (16:44 +0100)
committerVasyl Razinkov <vasyl.razinkov@est.tech>
Tue, 8 Oct 2019 15:45:16 +0000 (15:45 +0000)
Issue-ID: SDC-2609
Change-Id: Ibf411a8d10af858ee2f42f9b4b565b81fee33ebe
Signed-off-by: vasraz <vasyl.razinkov@est.tech>
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/CassandraClientTest.java

index 606d59e..b691654 100644 (file)
@@ -7,9 +7,9 @@
  * 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.
@@ -28,141 +28,147 @@ import fj.data.Either;
 import mockit.Deencapsulation;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.tinkerpop.gremlin.structure.T;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.be.utils.CassandraTestHelper;
 import org.openecomp.sdc.be.utils.DAOConfDependentTest;
 
 public class CassandraClientTest extends DAOConfDependentTest {
 
-       private CassandraClient createTestSubject() {
-               return new CassandraClient();
-       }
-
-       @Test
-       public void testSetLocalDc() throws Exception {
-               CassandraClient testSubject;
-               Cluster.Builder clusterBuilder = null;
-
-               Builder mock = Mockito.mock(Cluster.Builder.class);
-               Mockito.when(mock.withLoadBalancingPolicy(Mockito.any())).thenReturn(new Builder());
-               // default test
-               testSubject = createTestSubject();
-               Deencapsulation.invoke(testSubject, "setLocalDc", new Object[] { Cluster.Builder.class });
-
-               ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig()
-                               .setLocalDataCenter("mock");
-
-               testSubject = createTestSubject();
-               Deencapsulation.invoke(testSubject, "setLocalDc", mock);
-       }
-
-       @Test
-       public void testEnableSsl() throws Exception {
-               CassandraClient testSubject;
-               Cluster.Builder clusterBuilder = null;
-
-               Builder mock = Mockito.mock(Cluster.Builder.class);
-               Mockito.when(mock.withSSL()).thenReturn(new Builder());
-
-               ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setSsl(false);
-               // default test
-               testSubject = createTestSubject();
-               Deencapsulation.invoke(testSubject, "enableSsl", mock);
-
-               ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setSsl(true);
-               // default test
-               testSubject = createTestSubject();
-               Deencapsulation.invoke(testSubject, "enableSsl", mock);
-               ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setTruststorePath(null);
-               ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig()
-                               .setTruststorePassword(null);
-               Deencapsulation.invoke(testSubject, "enableSsl", mock);
-       }
-
-       @Test
-       public void testEnableAuthentication() throws Exception {
-               CassandraClient testSubject;
-               Builder mock = Mockito.mock(Cluster.Builder.class);
-               Mockito.when(mock.withCredentials(Mockito.any(), Mockito.any())).thenReturn(new Builder());
-
-               // default test
-               testSubject = createTestSubject();
-               Deencapsulation.invoke(testSubject, "enableAuthentication", Cluster.Builder.class);
-
-               ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setAuthenticate(true);
-               Deencapsulation.invoke(testSubject, "enableAuthentication", mock);
-               ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setUsername(null);
-               ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setPassword(null);
-               Deencapsulation.invoke(testSubject, "enableAuthentication", mock);
-       }
-
-       @Test
-       public void testConnect() throws Exception {
-               CassandraClient testSubject;
-               String keyspace = "";
-               Either<ImmutablePair<Session, MappingManager>, CassandraOperationStatus> result;
-
-               // default test
-               testSubject = createTestSubject();
-               result = testSubject.connect(keyspace);
-       }
-
-       @Test
-       public void testSave() throws Exception {
-               CassandraClient testSubject;
-               T entity = null;
-               Class<T> clazz = null;
-               MappingManager manager = null;
-               CassandraOperationStatus result;
-
-               // default test
-               testSubject = createTestSubject();
-               result = testSubject.save(entity, clazz, manager);
-       }
-
-       @Test
-       public void testGetById() throws Exception {
-               CassandraClient testSubject;
-               String id = "";
-               Class<T> clazz = null;
-               MappingManager manager = null;
-               Either<T, CassandraOperationStatus> result;
-
-               // default test
-               testSubject = createTestSubject();
-               result = testSubject.getById(id, clazz, manager);
-       }
-
-       @Test
-       public void testDelete() throws Exception {
-               CassandraClient testSubject;
-               String id = "";
-               Class<T> clazz = null;
-               MappingManager manager = null;
-               CassandraOperationStatus result;
-
-               // default test
-               testSubject = createTestSubject();
-               result = testSubject.delete(id, clazz, manager);
-       }
-
-       @Test
-       public void testIsConnected() throws Exception {
-               CassandraClient testSubject;
-               boolean result;
-
-               // default test
-               testSubject = createTestSubject();
-               result = testSubject.isConnected();
-       }
-
-       @Test
-       public void testCloseClient() throws Exception {
-               CassandraClient testSubject;
-
-               // default test
-               testSubject = createTestSubject();
-               testSubject.closeClient();
-       }
+    private CassandraClient createTestSubject() {
+        return new CassandraClient();
+    }
+
+    @BeforeClass
+    public static void startServer() {
+        CassandraTestHelper.startServer();
+    }
+
+    @Test
+    public void testSetLocalDc() throws Exception {
+        CassandraClient testSubject;
+
+        Builder mock = Mockito.mock(Cluster.Builder.class);
+        Mockito.when(mock.withLoadBalancingPolicy(Mockito.any())).thenReturn(new Builder());
+        // default test
+        testSubject = createTestSubject();
+        Deencapsulation.invoke(testSubject, "setLocalDc", new Object[]{Cluster.Builder.class});
+
+        ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig()
+            .setLocalDataCenter("mock");
+
+        testSubject = createTestSubject();
+        Deencapsulation.invoke(testSubject, "setLocalDc", mock);
+    }
+
+    @Test
+    public void testEnableSsl() throws Exception {
+        CassandraClient testSubject;
+        Cluster.Builder clusterBuilder = null;
+
+        Builder mock = Mockito.mock(Cluster.Builder.class);
+        Mockito.when(mock.withSSL()).thenReturn(new Builder());
+
+        ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setSsl(false);
+        // default test
+        testSubject = createTestSubject();
+        Deencapsulation.invoke(testSubject, "enableSsl", mock);
+
+        ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setSsl(true);
+        // default test
+        testSubject = createTestSubject();
+        Deencapsulation.invoke(testSubject, "enableSsl", mock);
+        ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setTruststorePath(null);
+        ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig()
+            .setTruststorePassword(null);
+        Deencapsulation.invoke(testSubject, "enableSsl", mock);
+    }
+
+    @Test
+    public void testEnableAuthentication() throws Exception {
+        CassandraClient testSubject;
+        Builder mock = Mockito.mock(Cluster.Builder.class);
+        Mockito.when(mock.withCredentials(Mockito.any(), Mockito.any())).thenReturn(new Builder());
+
+        // default test
+        testSubject = createTestSubject();
+        Deencapsulation.invoke(testSubject, "enableAuthentication", Cluster.Builder.class);
+
+        ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setAuthenticate(true);
+        Deencapsulation.invoke(testSubject, "enableAuthentication", mock);
+        ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setUsername(null);
+        ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setPassword(null);
+        Deencapsulation.invoke(testSubject, "enableAuthentication", mock);
+    }
+
+    @Test
+    public void testConnect() throws Exception {
+        CassandraClient testSubject;
+        String keyspace = "";
+        Either<ImmutablePair<Session, MappingManager>, CassandraOperationStatus> result;
+
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.connect(keyspace);
+    }
+
+    @Test
+    public void testSave() throws Exception {
+        CassandraClient testSubject;
+        T entity = null;
+        Class<T> clazz = null;
+        MappingManager manager = null;
+        CassandraOperationStatus result;
+
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.save(entity, clazz, manager);
+    }
+
+    @Test
+    public void testGetById() throws Exception {
+        CassandraClient testSubject;
+        String id = "";
+        Class<T> clazz = null;
+        MappingManager manager = null;
+        Either<T, CassandraOperationStatus> result;
+
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.getById(id, clazz, manager);
+    }
+
+    @Test
+    public void testDelete() throws Exception {
+        CassandraClient testSubject;
+        String id = "";
+        Class<T> clazz = null;
+        MappingManager manager = null;
+        CassandraOperationStatus result;
+
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.delete(id, clazz, manager);
+    }
+
+    @Test
+    public void testIsConnected() throws Exception {
+        CassandraClient testSubject;
+        boolean result;
+
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.isConnected();
+    }
+
+    @Test
+    public void testCloseClient() throws Exception {
+        CassandraClient testSubject;
+
+        // default test
+        testSubject = createTestSubject();
+        testSubject.closeClient();
+    }
 }