summaryrefslogtreecommitdiffstats
path: root/src/test/java/org/onap/dcae/controller
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/java/org/onap/dcae/controller')
-rw-r--r--src/test/java/org/onap/dcae/controller/ConfigCbsSourceTest.java (renamed from src/test/java/org/onap/dcae/controller/ConfigCBSSourceTest.java)22
-rw-r--r--src/test/java/org/onap/dcae/controller/ConfigFilesFacadeTest.java23
-rw-r--r--src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java88
-rw-r--r--src/test/java/org/onap/dcae/controller/ConfigParsingTest.java23
-rw-r--r--src/test/java/org/onap/dcae/controller/EnvPropertiesReaderTest.java5
-rw-r--r--src/test/java/org/onap/dcae/controller/EnvPropsTest.java15
6 files changed, 77 insertions, 99 deletions
diff --git a/src/test/java/org/onap/dcae/controller/ConfigCBSSourceTest.java b/src/test/java/org/onap/dcae/controller/ConfigCbsSourceTest.java
index b34d393..2c42e9e 100644
--- a/src/test/java/org/onap/dcae/controller/ConfigCBSSourceTest.java
+++ b/src/test/java/org/onap/dcae/controller/ConfigCbsSourceTest.java
@@ -17,6 +17,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.dcae.controller;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
@@ -33,21 +34,21 @@ import org.junit.Test;
import org.onap.dcae.WiremockBasedTest;
-public class ConfigCBSSourceTest extends WiremockBasedTest {
+public class ConfigCbsSourceTest extends WiremockBasedTest {
@Test
public void shouldReturnValidAppConfiguration() {
// given
- String sampleConfigForVES = "{\"collector.rcc.service.port\": 8080}";
+ String sampleConfigForVes = "{\"collector.rcc.service.port\": 8080}";
- stubConsulToReturnLocalAddressOfCBS();
- stubCBSToReturnAppConfig(sampleConfigForVES);
+ stubConsulToReturnLocalAddressOfCbs();
+ stubCbsToReturnAppConfig(sampleConfigForVes);
// when
Try<JSONObject> actual = tryToGetConfig();
// then
- assertThat(actual.get().toString()).isEqualTo(new JSONObject(sampleConfigForVES).toString());
+ assertThat(actual.get().toString()).isEqualTo(new JSONObject(sampleConfigForVes).toString());
}
@Test
@@ -115,10 +116,10 @@ public class ConfigCBSSourceTest extends WiremockBasedTest {
@Test
- public void shouldReturnFailureOnFailureToCommunicateWithCBS() {
+ public void shouldReturnFailureOnFailureToCommunicateWithCbs() {
// given
stubFor(get(urlEqualTo("/v1/catalog/service/CBSName"))
- .willReturn(aResponse().withStatus(200).withBody(validLocalCBSConf())));
+ .willReturn(aResponse().withStatus(200).withBody(validLocalCbsConf())));
stubFor(get(urlEqualTo("/service_component/restconfcollector"))
.willReturn(aResponse().withStatus(400)));
@@ -134,8 +135,8 @@ public class ConfigCBSSourceTest extends WiremockBasedTest {
public void shouldReturnFailureIfAppIsInvalidJsonDocument() {
// given
String invalidAppConf = "[$";
- stubConsulToReturnLocalAddressOfCBS();
- stubCBSToReturnAppConfig(invalidAppConf);
+ stubConsulToReturnLocalAddressOfCbs();
+ stubCbsToReturnAppConfig(invalidAppConf);
// when
Try<JSONObject> actual = tryToGetConfig();
@@ -145,7 +146,8 @@ public class ConfigCBSSourceTest extends WiremockBasedTest {
}
private Try<JSONObject> tryToGetConfig() {
- return getAppConfig(new EnvProps("http", "localhost", wireMockRule.port(), "http", "CBSName", "restconfcollector"));
+ return getAppConfig(new EnvProps("http", "localhost", wireMockRule.port(),
+ "http", "CBSName", "restconfcollector"));
}
}
diff --git a/src/test/java/org/onap/dcae/controller/ConfigFilesFacadeTest.java b/src/test/java/org/onap/dcae/controller/ConfigFilesFacadeTest.java
index 4130ceb..af87c30 100644
--- a/src/test/java/org/onap/dcae/controller/ConfigFilesFacadeTest.java
+++ b/src/test/java/org/onap/dcae/controller/ConfigFilesFacadeTest.java
@@ -19,16 +19,17 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.dcae.controller;
import static io.vavr.API.Map;
import static io.vavr.API.Some;
import static org.assertj.core.api.Assertions.assertThat;
import static org.onap.dcae.TestingUtilities.assertFailureHasInfo;
-import static org.onap.dcae.TestingUtilities.assertJSONObjectsEqual;
+import static org.onap.dcae.TestingUtilities.assertJsonObjectsEqual;
import static org.onap.dcae.TestingUtilities.createTemporaryFile;
import static org.onap.dcae.TestingUtilities.readFile;
-import static org.onap.dcae.TestingUtilities.readJSONFromFile;
+import static org.onap.dcae.TestingUtilities.readJsonFromFile;
import io.vavr.collection.Map;
import io.vavr.control.Try;
@@ -39,14 +40,14 @@ import org.junit.Test;
public class ConfigFilesFacadeTest {
- private static final Path NON_EXISTENT = Paths.get("/non-existent");
+ private static final Path NON_EXISTENT = Paths.get("/non-existent-file");
private static final ConfigFilesFacade TO_NON_EXISTENT_POINTING_FACADE = new ConfigFilesFacade(NON_EXISTENT,
NON_EXISTENT);
@Test
public void shouldReadPropertyFile() {
// given
- Path temporaryFile = createTemporaryFile("some.property=10");
+ Path temporaryFile = createTemporaryFile("temp_shouldReadPropertyFile","some.property=10");
// when
ConfigFilesFacade configFilesFacade = new ConfigFilesFacade(temporaryFile, temporaryFile);
@@ -63,22 +64,22 @@ public class ConfigFilesFacadeTest {
@Test
public void shouldReadDMaaPFile() {
// given
- Path temporaryFile = createTemporaryFile("{}");
+ Path temporaryFile = createTemporaryFile("temp_shouldReadDMaaPFile","{}");
// when
ConfigFilesFacade configFilesFacade = new ConfigFilesFacade(temporaryFile, temporaryFile);
- Try<JSONObject> dMaaPConfiguration = configFilesFacade.readDMaaPConfiguration();
+ Try<JSONObject> dmaapconfiguration = configFilesFacade.readDMaaPConfiguration();
// then
- assertThat(dMaaPConfiguration.isSuccess()).isTrue();
- assertThat(dMaaPConfiguration.get().toString()).isEqualTo("{}");
+ assertThat(dmaapconfiguration.isSuccess()).isTrue();
+ assertThat(dmaapconfiguration.get().toString()).isEqualTo("{}");
}
@Test
public void shouldWriteDMaaPConf() {
// given
- Path temporaryFile = createTemporaryFile("{}");
+ Path temporaryFile = createTemporaryFile("temp_shouldWriteDMaaPConf","{}");
JSONObject desiredConf = new JSONObject("{\"key\": 1}");
// when
@@ -88,14 +89,14 @@ public class ConfigFilesFacadeTest {
// then
assertThat(propertiesConfigurations.isSuccess()).isTrue();
- assertJSONObjectsEqual(readJSONFromFile(temporaryFile), desiredConf);
+ assertJsonObjectsEqual(readJsonFromFile(temporaryFile), desiredConf);
}
@Test
public void shouldWriteProperties() {
// given
- Path temporaryFile = createTemporaryFile("{}");
+ Path temporaryFile = createTemporaryFile("temp_shouldWriteProperties", "{}");
// when
ConfigFilesFacade configFilesFacade = new ConfigFilesFacade(temporaryFile, temporaryFile);
diff --git a/src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java b/src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java
index bcba7fb..be63b50 100644
--- a/src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java
+++ b/src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java
@@ -19,84 +19,58 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.dcae.controller;
import static io.vavr.API.Map;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.*;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyZeroInteractions;
import static org.onap.dcae.TestingUtilities.createTemporaryFile;
-import static org.onap.dcae.TestingUtilities.readFile;
-import static org.onap.dcae.TestingUtilities.readJSONFromFile;
+
+import static org.onap.dcae.TestingUtilities.readJsonFromFile;
import static org.onap.dcae.common.publishing.VavrUtils.f;
import java.nio.file.Path;
import java.nio.file.Paths;
import org.json.JSONObject;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.onap.dcae.ApplicationSettings;
-import org.onap.dcae.RestConfCollector;
import org.onap.dcae.WiremockBasedTest;
-import org.onap.dcae.common.publishing.DMaaPConfigurationParser;
import org.onap.dcae.common.publishing.EventPublisher;
public class ConfigLoaderIntegrationE2ETest extends WiremockBasedTest {
@Test
- public void testSuccessfulE2EFlow() {
-// // given
-// Path dMaaPConfigFile = createTemporaryFile("{}");
-// Path collectorPropertiesFile = createTemporaryFile("");
-// Path dMaaPConfigSource = Paths.get("src/test/resources/testParseDMaaPCredentialsGen2.json");
-// JSONObject dMaaPConf = readJSONFromFile(dMaaPConfigSource);
-// stubConsulToReturnLocalAddressOfCBS();
-// stubCBSToReturnAppConfig(f("{\"collector.port\": 8080, \"streams_publishes\": %s}}", dMaaPConf));
-//
-// EventPublisher eventPublisherMock = mock(EventPublisher.class);
-//
-// RestConfCollector rs = Mockito.mock(RestConfCollector.class);
-//
-//
-// ConfigFilesFacade configFilesFacade = new ConfigFilesFacade(dMaaPConfigFile, collectorPropertiesFile);
-// ConfigLoader configLoader = new ConfigLoader(eventPublisherMock::reconfigure, configFilesFacade, ConfigSource::getAppConfig, () -> wiremockBasedEnvProps());
-// configLoader.updateConfig();
-//
-// // then
-// assertThat(readJSONFromFile(dMaaPConfigSource).toString()).isEqualTo(dMaaPConf.toString());
-// assertThat(readFile(collectorPropertiesFile).trim()).isEqualTo("collector.port = 8080");
-// verify(eventPublisherMock, times(1)).reconfigure(
-// DMaaPConfigurationParser.parseToDomainMapping(dMaaPConf).get()
-// );
- }
-
- @Test
public void shouldNotReconfigureNotOverwriteIfConfigurationHasNotChanged() {
// given
- Path dMaaPConfigFile = createTemporaryFile("{}");
- Path collectorPropertiesFile = createTemporaryFile("");
- JSONObject dMaaPConf = readJSONFromFile(Paths.get("src/test/resources/testParseDMaaPCredentialsGen2.json"));
- stubConsulToReturnLocalAddressOfCBS();
- stubCBSToReturnAppConfig(f("{\"collector.port\": 8080, \"streams_publishes\": %s}}", dMaaPConf));
- EventPublisher eventPublisherMock = mock(EventPublisher.class);
- ConfigFilesFacade configFilesFacade = new ConfigFilesFacade(dMaaPConfigFile, collectorPropertiesFile);
- configFilesFacade.writeProperties(Map("collector.port", "8080"));
- configFilesFacade.writeDMaaPConfiguration(dMaaPConf);
-
- ConfigLoader configLoader = new ConfigLoader(eventPublisherMock::reconfigure, configFilesFacade, ConfigSource::getAppConfig, () -> wiremockBasedEnvProps());
- configLoader.updateConfig();
- // then
+ try {
+ Path dmaapConfigFile = createTemporaryFile("temp_dmaapConfigFile", "{}");
+ Path collectorPropertiesFile = createTemporaryFile("temp_collectorPropertiesFile", "");
+ JSONObject dmaapConf = readJsonFromFile(
+ Paths.get("src/test/resources/testParseDMaaPCredentialsGen2.json"));
+ stubConsulToReturnLocalAddressOfCbs();
+ stubCbsToReturnAppConfig(f("{\"collector.port\": 8080, \"streams_publishes\": %s}}", dmaapConf));
+ EventPublisher eventPublisherMock = mock(EventPublisher.class);
+ ConfigFilesFacade configFilesFacade = new ConfigFilesFacade(dmaapConfigFile, collectorPropertiesFile);
+ configFilesFacade.writeProperties(Map("collector.port", "8080"));
+ configFilesFacade.writeDMaaPConfiguration(dmaapConf);
- verifyZeroInteractions(eventPublisherMock);
+ ConfigLoader configLoader = new ConfigLoader(eventPublisherMock::reconfigure,
+ configFilesFacade, ConfigSource::getAppConfig, () -> wiremockBasedEnvProps());
+ configLoader.updateConfig();
+ // then
- // when
- JSONObject dMaaPConf2 = readJSONFromFile(Paths.get("src/test/resources/testParseDMaaPCredentialsGen2Temp.json"));
- configFilesFacade.writeDMaaPConfiguration(dMaaPConf2);
- configFilesFacade.writeProperties(Map("collector.port", "8081"));
- configLoader.updateConfig();
+ verifyZeroInteractions(eventPublisherMock);
+ // when
+ JSONObject dmaapConf2 = readJsonFromFile(
+ Paths.get("src/test/resources/testParseDMaaPCredentialsGen2Temp.json"));
+ configFilesFacade.writeDMaaPConfiguration(dmaapConf2);
+ configFilesFacade.writeProperties(Map("collector.port", "8081"));
+ configLoader.updateConfig();
+ } catch (Exception e) {
+ System.out.println("Exception " + e);
+ }
}
} \ No newline at end of file
diff --git a/src/test/java/org/onap/dcae/controller/ConfigParsingTest.java b/src/test/java/org/onap/dcae/controller/ConfigParsingTest.java
index 7792b71..29c14e9 100644
--- a/src/test/java/org/onap/dcae/controller/ConfigParsingTest.java
+++ b/src/test/java/org/onap/dcae/controller/ConfigParsingTest.java
@@ -25,14 +25,11 @@ package org.onap.dcae.controller;
import static io.vavr.API.Map;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.onap.dcae.TestingUtilities.assertJSONObjectsEqual;
-import static org.onap.dcae.TestingUtilities.readJSONFromFile;
+import static org.onap.dcae.TestingUtilities.assertJsonObjectsEqual;
import io.vavr.collection.Map;
import io.vavr.control.Option;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import org.json.JSONObject;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,16 +40,16 @@ public class ConfigParsingTest {
@Test
public void shouldReturnDMaaPConfig() {
- JSONObject dMaaPConf = new JSONObject("{\"auth-credentials-present\": {\"aaf_username\": \"sampleUser\",\"dmaap_info\": {\"topic_url\": \"http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV\",},\"aaf_password\": \"samplePassword\"}}");
+ JSONObject dmaapConf = new JSONObject("{\"auth-credentials-present\": {\"aaf_username\": \"sampleUser\",\"dmaap_info\": {\"topic_url\": \"http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV\",},\"aaf_password\": \"samplePassword\"}}");
JSONObject root = new JSONObject();
root.put("key1", "someProperty");
root.put("key2", "someProperty");
- root.put("streams_publishes", dMaaPConf);
+ root.put("streams_publishes", dmaapConf);
- Option<JSONObject> dMaaPConfig = ConfigParsing.getDMaaPConfig(root);
+ Option<JSONObject> dmaapConfig = ConfigParsing.getDMaaPConfig(root);
- assertThat(dMaaPConfig.isEmpty()).isFalse();
- assertJSONObjectsEqual(dMaaPConfig.get(), dMaaPConf);
+ assertThat(dmaapConfig.isEmpty()).isFalse();
+ assertJsonObjectsEqual(dmaapConfig.get(), dmaapConf);
}
@Test
@@ -60,18 +57,18 @@ public class ConfigParsingTest {
JSONObject root = new JSONObject();
root.put("streams_publishes", 1);
- Option<JSONObject> dMaaPConfig = ConfigParsing.getDMaaPConfig(root);
+ Option<JSONObject> dmaapConfig = ConfigParsing.getDMaaPConfig(root);
- assertThat(dMaaPConfig.isEmpty()).isTrue();
+ assertThat(dmaapConfig.isEmpty()).isTrue();
}
@Test
public void getProperties() {
- JSONObject dMaaPConf = new JSONObject("{\"auth-credentials-present\": {\"aaf_username\": \"sampleUser\",\"dmaap_info\": {\"topic_url\": \"http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV\",},\"aaf_password\": \"samplePassword\"}}");
+ JSONObject dmaapConf = new JSONObject("{\"auth-credentials-present\": {\"aaf_username\": \"sampleUser\",\"dmaap_info\": {\"topic_url\": \"http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV\",},\"aaf_password\": \"samplePassword\"}}");
JSONObject root = new JSONObject();
root.put("key1", "someProperty");
root.put("key2", "someProperty");
- root.put("streams_publishes", dMaaPConf);
+ root.put("streams_publishes", dmaapConf);
Map<String, String> properties = ConfigParsing.getProperties(root);
assertThat(properties).isEqualTo(Map("key1", "someProperty", "key2", "someProperty"));
diff --git a/src/test/java/org/onap/dcae/controller/EnvPropertiesReaderTest.java b/src/test/java/org/onap/dcae/controller/EnvPropertiesReaderTest.java
index 2e215a7..5fef321 100644
--- a/src/test/java/org/onap/dcae/controller/EnvPropertiesReaderTest.java
+++ b/src/test/java/org/onap/dcae/controller/EnvPropertiesReaderTest.java
@@ -19,6 +19,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.dcae.controller;
import static io.vavr.API.Map;
@@ -41,7 +42,7 @@ public class EnvPropertiesReaderTest {
}
@Test
- public void shouldReturnEmptyOnMissingCBSName() {
+ public void shouldReturnEmptyOnMissingCbsName() {
Map<String, String> envs = Map(
"CONSUL_HOST", "doesNotMatter",
"HOSTNAME", "doesNotMatter");
@@ -49,7 +50,7 @@ public class EnvPropertiesReaderTest {
}
@Test
- public void shouldReturnEmptyOnMissingVESAppName() {
+ public void shouldReturnEmptyOnMissingVesAppName() {
Map<String, String> envs = Map(
"CONSUL_HOST", "doesNotMatter",
"CONFIG_BINDING_SERVICE", "doesNotMatter");
diff --git a/src/test/java/org/onap/dcae/controller/EnvPropsTest.java b/src/test/java/org/onap/dcae/controller/EnvPropsTest.java
index e9c194e..1276e6b 100644
--- a/src/test/java/org/onap/dcae/controller/EnvPropsTest.java
+++ b/src/test/java/org/onap/dcae/controller/EnvPropsTest.java
@@ -20,22 +20,25 @@
package org.onap.dcae.controller;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static org.junit.Assert.assertEquals;
+
import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import junit.framework.Assert;
import org.junit.Rule;
import org.junit.Test;
-import org.onap.dcae.common.Format;
-
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
-import static org.junit.Assert.assertEquals;
public class EnvPropsTest {
+
@Rule
public WireMockRule wireMockRule = new WireMockRule(
wireMockConfig().dynamicPort().dynamicHttpsPort().keystorePath(null));
+
@Test
public void fromString() {
- Assert.assertEquals(new EnvProps("http", "localhost", wireMockRule.port(), "http", "CBSName", "restconfcollector").equals(new EnvProps("http", "localhost", wireMockRule.port(), "http", "CBSName", "restconfcollector")), true);
+ assertEquals(new EnvProps("http", "localhost", wireMockRule.port(),
+ "http", "CBSName", "restconfcollector")
+ .equals(new EnvProps("http", "localhost", wireMockRule.port(),
+ "http", "CBSName", "restconfcollector")), true);
}
} \ No newline at end of file