summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-12-20 14:25:32 -0500
committerDan Timoney <dtimoney@att.com>2017-12-20 14:38:34 -0500
commit1e8a80e24b62f66e4d1bacf2be475ffb01c78a17 (patch)
tree43857f7bdab42160b7bd762f029e4b888c1a20b2
parent69453d796578d46f1c0b98964b3a786718a86863 (diff)
Resolve duplicate file name
Renamed vnfapiProviderTest.java to VnfapiProviderTestBase.java to avoid conflict with VnfapiProviderTest.java Change-Id: I500785a038691c17b84faac427232da2f9fdee21 Issue-ID: SDNC-228 Signed-off-by: Dan Timoney <dtimoney@att.com>
-rw-r--r--generic-resource-api/model/pom.xml1
-rw-r--r--vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfapiProviderTestBase.java (renamed from vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java)2
2 files changed, 2 insertions, 1 deletions
diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml
index 701b5163..7a140323 100644
--- a/generic-resource-api/model/pom.xml
+++ b/generic-resource-api/model/pom.xml
@@ -50,6 +50,7 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
+ <version>${odl.yangtools.yang.maven.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfapiProviderTestBase.java
index 88b73e00..f174f7fa 100644
--- a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java
+++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfapiProviderTestBase.java
@@ -117,7 +117,7 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-public class vnfapiProviderTest {
+public class VnfapiProviderTestBase {
@Rule public MockitoRule rule = MockitoJUnit.rule();
@Mock private DataBroker dataBroker;