DeleteRequest should target object instance only.

Signed-off-by: Rokwoon Kim <k862390@gmail.com> Also-by: Simon Bernard <sbernard@sierrawireless.com>
eclipse-leshan · Jul 11, 2018 · a7c958a · a7c958a
1 parent a45b093
commit a7c958a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/DeleteRequest.java b/leshan-core/src/main/java/org/eclipse/leshan/core/request/DeleteRequest.java
@@ -41,7 +41,7 @@ public DeleteRequest(int objectId, int objectInstanceId) {
      * @exception InvalidRequestException if the path is not valid.
      */
     public DeleteRequest(String path) throws InvalidRequestException {
-        super(newPath(path));
+        this(newPath(path));
     }
 
     private DeleteRequest(LwM2mPath target) {

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/DiscoverRequest.java b/leshan-core/src/main/java/org/eclipse/leshan/core/request/DiscoverRequest.java
@@ -62,7 +62,7 @@ public DiscoverRequest(int objectId, int objectInstanceId, int resourceId) {
      * @exception InvalidRequestException if the path is not valid.
      */
     public DiscoverRequest(String path) throws InvalidRequestException {
-        super(newPath(path));
+        this(newPath(path));
     }
 
     private DiscoverRequest(LwM2mPath target) {

diff --git a/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/DeleteTest.java b/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/DeleteTest.java
@@ -25,6 +25,7 @@
 
 import java.util.Arrays;
 
+import org.eclipse.californium.core.coap.Request;
 import org.eclipse.californium.core.coap.Response;
 import org.eclipse.leshan.ResponseCode;
 import org.eclipse.leshan.core.node.LwM2mObjectInstance;
@@ -61,10 +62,8 @@ public void stop() {
     @Test
     public void delete_created_object_instance() throws InterruptedException {
         // create ACL instance
-        helper.server.send(
-                helper.getCurrentRegistration(),
-                new CreateRequest(2, new LwM2mObjectInstance(0, Arrays.asList(new LwM2mResource[] { LwM2mSingleResource
-                        .newIntegerResource(0, 123) }))));
+        helper.server.send(helper.getCurrentRegistration(), new CreateRequest(2, new LwM2mObjectInstance(0,
+                Arrays.asList(new LwM2mResource[] { LwM2mSingleResource.newIntegerResource(0, 123) }))));
 
         // try to delete this instance
         DeleteResponse response = helper.server.send(helper.getCurrentRegistration(), new DeleteRequest(2, 0));
@@ -76,20 +75,18 @@ public void delete_created_object_instance() throws InterruptedException {
     }
 
     @Test
-    public void cannot_delete_resource_of_created_object_instance() throws InterruptedException {
+    public void cannot_delete_resource() throws InterruptedException {
         // create ACL instance
-        helper.server.send(
-                helper.getCurrentRegistration(),
-                new CreateRequest(2, new LwM2mObjectInstance(0, Arrays.asList(new LwM2mResource[] { LwM2mSingleResource
-                        .newIntegerResource(0, 123) }))));
+        helper.server.send(helper.getCurrentRegistration(), new CreateRequest(2, new LwM2mObjectInstance(0,
+                Arrays.asList(new LwM2mResource[] { LwM2mSingleResource.newIntegerResource(0, 123) }))));
 
-        // try to delete this instance
-        DeleteResponse response = helper.server.send(helper.getCurrentRegistration(), new DeleteRequest("/2/0/0"));
+        // try to delete this resource using coap API as lwm2m API does not allow it.
+        Request delete = Request.newDelete();
+        delete.getOptions().addUriPath("2").addUriPath("0").addUriPath("0");
+        Response response = helper.server.coap().send(helper.getCurrentRegistration(), delete);
 
         // verify result
-        assertEquals(ResponseCode.METHOD_NOT_ALLOWED, response.getCode());
-        assertNotNull(response.getCoapResponse());
-        assertThat(response.getCoapResponse(), is(instanceOf(Response.class)));
+        assertEquals(org.eclipse.californium.core.coap.CoAP.ResponseCode.BAD_REQUEST, response.getCode());
     }
 
     @Test