aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/java/org
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2019-04-15 19:36:07 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-15 19:36:07 +0000
commitff4bf8d97be17232187dfdbb5fc913d015b3b213 (patch)
tree7623c7de4b4d14eb21fae2ff7c5a9b34722f1571 /src/test/java/org
parent4d4540de666c02754b4c35bb4a27a6c99c437f83 (diff)
parenta6ffdd5cb52d61792dfe8e233620b34098a5fb37 (diff)
Merge "Collector authentication enhancement"
Diffstat (limited to 'src/test/java/org')
-rw-r--r--src/test/java/org/onap/dcae/TLSTest.java1
-rw-r--r--src/test/java/org/onap/dcae/TLSTestBase.java3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/test/java/org/onap/dcae/TLSTest.java b/src/test/java/org/onap/dcae/TLSTest.java
index b1f90371..3cf0a162 100644
--- a/src/test/java/org/onap/dcae/TLSTest.java
+++ b/src/test/java/org/onap/dcae/TLSTest.java
@@ -125,6 +125,7 @@ public class TLSTest extends TLSTestBase {
when(settings.authMethod()).thenReturn(AuthMethodType.CERT_ONLY.value());
when(settings.truststoreFileLocation()).thenReturn(TRUSTSTORE.toString());
when(settings.truststorePasswordFileLocation()).thenReturn(TRUSTSTORE_PASSWORD_FILE.toString());
+ when(settings.certSubjectMatcher()).thenReturn(CERT_SUBJECT_MATCHER.toString());
}
}
diff --git a/src/test/java/org/onap/dcae/TLSTestBase.java b/src/test/java/org/onap/dcae/TLSTestBase.java
index 8b486ec7..4dada129 100644
--- a/src/test/java/org/onap/dcae/TLSTestBase.java
+++ b/src/test/java/org/onap/dcae/TLSTestBase.java
@@ -45,12 +45,12 @@ import static org.onap.dcae.TestingUtilities.*;
@Configuration
@ExtendWith(SpringExtension.class)
public class TLSTestBase {
- protected static final String KEYSTORE_ALIAS = "localhost";
protected static final Path RESOURCES = Paths.get("src", "test", "resources");
protected static final Path KEYSTORE = Paths.get(RESOURCES.toString(), "keystore");
protected static final Path KEYSTORE_PASSWORD_FILE = Paths.get(RESOURCES.toString(), "passwordfile");
protected static final Path TRUSTSTORE = Paths.get(RESOURCES.toString(), "truststore");
protected static final Path TRUSTSTORE_PASSWORD_FILE = Paths.get(RESOURCES.toString(), "trustpasswordfile");
+ protected static final Path CERT_SUBJECT_MATCHER = Paths.get(RESOURCES.toString(), "certSubjectMatcher");
protected static abstract class ConfigurationBase {
protected final ApplicationSettings settings = Mockito.mock(ApplicationSettings.class);
@@ -67,6 +67,7 @@ public class TLSTestBase {
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
protected abstract class TestClassBase {
+
@MockBean
@Qualifier("inputQueue")
protected LinkedBlockingQueue<JSONObject> queue;