[SDC-DIST] Upgrade asdc-controller to use client version 2.0.0

[so.git] / asdc-controller / src / test / java / org / onap / so / asdc / client / ASDCConfigurationTest.java

diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCConfigurationTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCConfigurationTest.java
index 16bd97b..c0e7d31 100644 (file)
--- a/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCConfigurationTest.java
+++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCConfigurationTest.java
@@ -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.
@@ -20,40 +20,37 @@
 
 package org.onap.so.asdc.client;
 
-
-
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-
 import javax.transaction.Transactional;
-
 import org.junit.Test;
 import org.onap.so.asdc.BaseTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * THis class tests the ASDC Controller by using the ASDC Mock CLient
- * 
+ *
  *
  */
 public class ASDCConfigurationTest extends BaseTest {
-       
+
     @Autowired
     private ASDCConfiguration config;
-    
+
     @Test
-       @Transactional
-       public void testInitASDCConfiguration() throws Exception {      
-               assertTrue("msopreist".equals(config.getUser()));
-               assertTrue("msoasdc-id-local".equals(config.getConsumerGroup()));
-               assertTrue("msoasdc-id-local".equals(config.getConsumerID()));
-               assertTrue("Pre-IST".equals(config.getEnvironmentName()));
-               assertTrue("localhost:8443".equals(config.getAsdcAddress()));
-               assertTrue("msopreist".equals(config.getPassword()));
-               assertTrue(config.getPollingInterval() == 30);
-               assertTrue(config.getPollingTimeout() == 30);
-               assertTrue(config.getRelevantArtifactTypes().size() == config.SUPPORTED_ARTIFACT_TYPES_LIST.size());
-               assertTrue(config.getWatchDogTimeout() == 1); 
-               assertTrue(config.isUseHttpsWithDmaap() == true);   
+    @Transactional
+    public void testInitASDCConfiguration() {
+        assertEquals("msopreist", config.getUser());
+        assertEquals("msoasdc-id-local", config.getConsumerGroup());
+        assertEquals("msoasdc-id-local", config.getConsumerID());
+        assertEquals("Pre-IST", config.getEnvironmentName());
+        assertEquals("localhost:8443", config.getSdcAddress());
+        assertEquals("msopreist", config.getPassword());
+        assertEquals(30, config.getPollingInterval());
+        assertEquals(30, config.getPollingTimeout());
+        assertEquals(config.getRelevantArtifactTypes().size(), ASDCConfiguration.SUPPORTED_ARTIFACT_TYPES_LIST.size());
+        assertEquals(1, config.getWatchDogTimeout());
+        assertTrue(config.isUseHttpsWithSDC());
     }
-    
+
 }