summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-10-03 13:36:21 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-03 13:36:21 +0000
commit1c8fff51420e5dc3ea45bd5089d8649a7178015f (patch)
tree945b3e9b0d05d1f90ddb890fc15a6f551c26ad2f
parenta9b5088b8333f994fe8ab5507b82de3eadbb2226 (diff)
parentd0c9e06005c819b53970b72cf73ab814a3719109 (diff)
Merge "Add unit tests for mdsal-resource"
-rwxr-xr-xmdsal-resource/provider/pom.xml13
-rw-r--r--mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/ConfigResource.java8
-rw-r--r--mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/OperationalResource.java8
-rw-r--r--mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestConfigResource.java29
-rw-r--r--mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestOperationalResource.java29
-rw-r--r--resource-assignment/features/src/main/resources/features.xml2
6 files changed, 83 insertions, 6 deletions
diff --git a/mdsal-resource/provider/pom.xml b/mdsal-resource/provider/pom.xml
index 6d1de81df..28eab6823 100755
--- a/mdsal-resource/provider/pom.xml
+++ b/mdsal-resource/provider/pom.xml
@@ -53,7 +53,18 @@
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/ConfigResource.java b/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/ConfigResource.java
index 9cade887b..d02530fe6 100644
--- a/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/ConfigResource.java
+++ b/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/ConfigResource.java
@@ -8,9 +8,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.
@@ -42,6 +42,10 @@ public class ConfigResource implements SvcLogicResource {
restService = new RestService(sdncProtocol, sdncHost, sdncPort, sdncUser, sdncPasswd, RestService.PayloadType.XML);
}
+ public ConfigResource(RestService restService) {
+ this.restService = restService;
+ }
+
@Override
public QueryStatus isAvailable(String resource, String key, String prefix, SvcLogicContext ctx) throws SvcLogicException
{
diff --git a/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/OperationalResource.java b/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/OperationalResource.java
index 92a7b6be0..63fe8c6ad 100644
--- a/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/OperationalResource.java
+++ b/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/OperationalResource.java
@@ -8,9 +8,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.
@@ -44,6 +44,10 @@ public class OperationalResource implements SvcLogicResource {
}
+ public OperationalResource(RestService restService) {
+ this.restService = restService;
+ }
+
@Override
public QueryStatus isAvailable(String resource, String key, String prefix, SvcLogicContext ctx) throws SvcLogicException
{
diff --git a/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestConfigResource.java b/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestConfigResource.java
new file mode 100644
index 000000000..a8f4d9483
--- /dev/null
+++ b/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestConfigResource.java
@@ -0,0 +1,29 @@
+package org.onap.ccsdk.sli.adaptors.resource.mdsal;
+
+import junit.framework.TestCase;
+
+import static org.mockito.Mockito.mock;
+
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+
+public class TestConfigResource extends TestCase {
+
+ public void test() throws Exception {
+
+ RestService restService = mock(RestService.class);
+ SvcLogicContext ctx = new SvcLogicContext();
+
+ ConfigResource res = new ConfigResource(restService);
+
+ res.delete("my-resource", null, ctx);
+ res.notify("my-resource", "action", "key", ctx);
+ res.query("my-resource", false, "my-select", "mykey", "pfx", null, ctx);
+ res.release("my-resource", "mykey", ctx);
+ res.reserve("my-resource", "my-select", "mykey", "pfx", ctx);
+ res.exists("my-resource", "mykey", "pfx", ctx);
+ res.isAvailable("my-resource", "mykey", "pfx", ctx);
+ res.save("resource", false, false, null, null, null, ctx);
+ res.update("my-resource", "mykey", null, "pfx", ctx);
+ }
+
+}
diff --git a/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestOperationalResource.java b/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestOperationalResource.java
new file mode 100644
index 000000000..f5725e971
--- /dev/null
+++ b/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestOperationalResource.java
@@ -0,0 +1,29 @@
+package org.onap.ccsdk.sli.adaptors.resource.mdsal;
+
+import static org.mockito.Mockito.mock;
+
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+
+import junit.framework.TestCase;
+
+public class TestOperationalResource extends TestCase {
+
+
+ public void test() throws Exception {
+
+ RestService restService = mock(RestService.class);
+ SvcLogicContext ctx = new SvcLogicContext();
+
+ OperationalResource res = new OperationalResource(restService);
+
+ res.delete("my-resource", null, ctx);
+ res.notify("my-resource", "action", "key", ctx);
+ res.query("my-resource", false, "my-select", "mykey", "pfx", null, ctx);
+ res.release("my-resource", "mykey", ctx);
+ res.reserve("my-resource", "my-select", "mykey", "pfx", ctx);
+ res.exists("my-resource", "mykey", "pfx", ctx);
+ res.isAvailable("my-resource", "mykey", "pfx", ctx);
+ res.save("resource", false, false, null, null, null, ctx);
+ res.update("my-resource", "mykey", null, "pfx", ctx);
+ }
+}
diff --git a/resource-assignment/features/src/main/resources/features.xml b/resource-assignment/features/src/main/resources/features.xml
index ca1126d37..c9161a635 100644
--- a/resource-assignment/features/src/main/resources/features.xml
+++ b/resource-assignment/features/src/main/resources/features.xml
@@ -33,7 +33,7 @@
<feature>spring</feature>
<feature version="[3.1,4)">spring-jdbc</feature>
<feature>spring-dm</feature>
- <bundle start-level="88">mvn:org.onap.ccsdk.sli.adaptors/resource-assignment-provider/${project.version}</bundle>
+ <bundle>mvn:org.onap.ccsdk.sli.adaptors/resource-assignment-provider/${project.version}</bundle>
<bundle>mvn:org.mariadb.jdbc/mariadb-java-client/${mariadb.connector.version}</bundle>
<bundle>mvn:commons-lang/commons-lang/2.6</bundle>
</feature>