summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sms-client/src/java/test/ClientTestRunner.java3
-rw-r--r--sms-client/src/java/test/SmsCreateDomainTest.java4
-rw-r--r--sms-client/src/java/test/SmsDeleteDomainTest.java43
-rw-r--r--sms-client/src/java/test/SmsTest.java34
4 files changed, 71 insertions, 13 deletions
diff --git a/sms-client/src/java/test/ClientTestRunner.java b/sms-client/src/java/test/ClientTestRunner.java
index e1e0dd2..dc5fbf9 100644
--- a/sms-client/src/java/test/ClientTestRunner.java
+++ b/sms-client/src/java/test/ClientTestRunner.java
@@ -21,7 +21,8 @@ import org.junit.runner.notification.Failure;
public class ClientTestRunner {
public static void main(String[] args) {
Result r = JUnitCore.runClasses(
- SmsCreateDomainTest.class
+ SmsCreateDomainTest.class,
+ SmsDeleteDomainTest.class
);
for( Failure f : r.getFailures()) {
diff --git a/sms-client/src/java/test/SmsCreateDomainTest.java b/sms-client/src/java/test/SmsCreateDomainTest.java
index b0896d4..2bbe348 100644
--- a/sms-client/src/java/test/SmsCreateDomainTest.java
+++ b/sms-client/src/java/test/SmsCreateDomainTest.java
@@ -34,8 +34,10 @@ public class SmsCreateDomainTest extends TestCase {
if ( resp.getSuccess() ) {
Map<String, Object> m = resp.getResponse();
assertNotNull(m);
- assertEquals(200, resp.getResponseCode());
+ assertEquals(201, resp.getResponseCode());
assertEquals("onap.new.test.sms0", m.get("name"));
+ } else {
+ fail("Unexpected response while creating domain");
}
} catch ( Exception e ) {
fail("Exception while creating domain");
diff --git a/sms-client/src/java/test/SmsDeleteDomainTest.java b/sms-client/src/java/test/SmsDeleteDomainTest.java
new file mode 100644
index 0000000..aa047b2
--- /dev/null
+++ b/sms-client/src/java/test/SmsDeleteDomainTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2018 Intel Corporation, Inc
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import junit.framework.*;
+import org.onap.aaf.sms.SmsClient;
+import org.onap.aaf.sms.SmsResponse;
+import org.onap.aaf.sms.test.SmsSecureSocket;
+import javax.net.ssl.SSLSocketFactory;
+import java.util.HashMap;
+import java.util.Map;
+
+public class SmsDeleteDomainTest extends TestCase {
+
+ public void testSmsDeleteDomain() {
+ try {
+ SmsSecureSocket sss = new SmsSecureSocket();
+
+ SmsTest sms = new SmsTest("otconap4.sc.intel.com", 10443, sss.getSSF());
+ SmsResponse resp = sms.deleteDomain("onap.new.test.sms0");
+ assertTrue(resp.getSuccess());
+ if ( resp.getSuccess() ) {
+ assertEquals(204, resp.getResponseCode());
+ } else {
+ fail("Unexpected response while deleting domain");
+ }
+ } catch ( Exception e ) {
+ fail("Exception while deleting domain");
+ }
+ }
+}
diff --git a/sms-client/src/java/test/SmsTest.java b/sms-client/src/java/test/SmsTest.java
index 8786570..79c1625 100644
--- a/sms-client/src/java/test/SmsTest.java
+++ b/sms-client/src/java/test/SmsTest.java
@@ -46,18 +46,30 @@ public class SmsTest extends SmsClient {
Map<String, Object> m;
SmsResponse resp = new SmsResponse();
System.out.println(t);
- if ( t.matches("(.*)/v1/sms/domain"))
- {
- resp.setSuccess(true);
- resp.setResponseCode(200);
- try {
- m = strtomap(ins);
- } catch ( Exception e ) {
- resp.setResponse(null);
- return(resp);
- }
- resp.setResponse(m);
+ switch ( reqtype ) {
+ case "POST":
+ if ( t.matches("(.*)/v1/sms/domain")) {
+ resp.setSuccess(true);
+ resp.setResponseCode(201);
+ try {
+ m = strtomap(ins);
+ } catch ( Exception e ) {
+ resp.setResponse(null);
+ return(resp);
+ }
+ resp.setResponse(m);
+ }
+ break;
+ case "DELETE":
+ if ( t.matches("(.*)/v1/sms/domain/(.*)") ) {
+ // for both delete domain & secret case
+ resp.setSuccess(true);
+ resp.setResponseCode(204);
+ resp.setResponse(null);
+ }
+ break;
+
}
return resp;
}