Code Review
/
dmaap
/
buscontroller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[DMAAP-BC] Avoid Creating duplicate DR Publisher, Subscriber"
[dmaap/buscontroller.git]
/
dmaap-bc
/
src
/
test
/
java
/
org
/
onap
/
dmaap
/
dbcapi
/
aaf
/
AafServiceFactoryTest.java
diff --git
a/dmaap-bc/src/test/java/org/onap/dmaap/dbcapi/aaf/AafServiceFactoryTest.java
b/dmaap-bc/src/test/java/org/onap/dmaap/dbcapi/aaf/AafServiceFactoryTest.java
index
45ff2b1
..
633742f
100644
(file)
--- a/
dmaap-bc/src/test/java/org/onap/dmaap/dbcapi/aaf/AafServiceFactoryTest.java
+++ b/
dmaap-bc/src/test/java/org/onap/dmaap/dbcapi/aaf/AafServiceFactoryTest.java
@@
-20,7
+20,12
@@
package org.onap.dmaap.dbcapi.aaf;
package org.onap.dmaap.dbcapi.aaf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+
import org.junit.Before;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@
-28,10
+33,6
@@
import org.mockito.runners.MockitoJUnitRunner;
import org.onap.dmaap.dbcapi.aaf.AafService.ServiceType;
import org.onap.dmaap.dbcapi.util.DmaapConfig;
import org.onap.dmaap.dbcapi.aaf.AafService.ServiceType;
import org.onap.dmaap.dbcapi.util.DmaapConfig;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.BDDMockito.given;
-
@RunWith(MockitoJUnitRunner.class)
public class AafServiceFactoryTest {
@RunWith(MockitoJUnitRunner.class)
public class AafServiceFactoryTest {
@@
-45,6
+46,11
@@
public class AafServiceFactoryTest {
private DmaapConfig dmaapConfig;
private AafServiceFactory aafServiceFactory;
private DmaapConfig dmaapConfig;
private AafServiceFactory aafServiceFactory;
+ @BeforeClass
+ public static void setUpClass() {
+ System.setProperty("ConfigFile", "src/test/resources/dmaapbc.properties");
+ }
+
@Before
public void setUp() throws Exception {
aafServiceFactory = new AafServiceFactory(dmaapConfig);
@Before
public void setUp() throws Exception {
aafServiceFactory = new AafServiceFactory(dmaapConfig);