From 2a48521f04727833ddfc99197bc4c24bf03ac90d Mon Sep 17 00:00:00 2001 From: "yeonghun.nam" Date: Tue, 16 Aug 2016 15:14:41 +0900 Subject: [PATCH] RD test fixed ('&' -> ';' to divide queries) Change-Id: I367125e5c1871ddcd76f057d03427c185ad5e298 Signed-off-by: yeonghun.nam Reviewed-on: https://gerrit.iotivity.org/gerrit/10491 Tested-by: jenkins-iotivity Reviewed-by: Eunok Shin Reviewed-by: Jee Hyeok Kim --- .../cloud/testrdserver/DiscoveryResourceTest.java | 6 ++++-- .../testrdserver/ResourceDirectoryResourceTest.java | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/DiscoveryResourceTest.java b/cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/DiscoveryResourceTest.java index 82ae763..193e298 100644 --- a/cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/DiscoveryResourceTest.java +++ b/cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/DiscoveryResourceTest.java @@ -24,9 +24,11 @@ package org.iotivity.cloud.testrdserver; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; + import java.util.ArrayList; import java.util.HashMap; import java.util.concurrent.CountDownLatch; + import org.iotivity.cloud.base.device.CoapDevice; import org.iotivity.cloud.base.protocols.IRequest; import org.iotivity.cloud.base.protocols.IResponse; @@ -81,7 +83,7 @@ public class DiscoveryResourceTest { public void testHandleGetRequest_notExistVaule() throws Exception { IRequest request = MessageBuilder.createRequest(RequestMethod.GET, RDServerTestUtils.DISCOVERY_REQ_URI, - "rt=core.light&di=" + RDServerTestUtils.DI); + "rt=core.light;di=" + RDServerTestUtils.DI); mDiscoveryResource.onDefaultRequestReceived(mockDevice, request); // assertion: if the response status is "CONTENT" // assertion : if the payload is null @@ -94,7 +96,7 @@ public class DiscoveryResourceTest { public void testHandleGetRequest_existValue() throws Exception { IRequest request = MessageBuilder.createRequest(RequestMethod.GET, RDServerTestUtils.DISCOVERY_REQ_URI, - "rt=core.light&di=" + RDServerTestUtils.DI); + "rt=core.light;di=" + RDServerTestUtils.DI); mRDResource.onDefaultRequestReceived(mockDevice, RDServerTestUtils.makePublishRequest()); mDiscoveryResource.onDefaultRequestReceived(mockDevice, request); diff --git a/cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/ResourceDirectoryResourceTest.java b/cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/ResourceDirectoryResourceTest.java index 7365f75..4d67b08 100644 --- a/cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/ResourceDirectoryResourceTest.java +++ b/cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/ResourceDirectoryResourceTest.java @@ -21,6 +21,14 @@ */ package org.iotivity.cloud.testrdserver; +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.concurrent.CountDownLatch; + import org.iotivity.cloud.base.device.CoapDevice; import org.iotivity.cloud.base.protocols.IRequest; import org.iotivity.cloud.base.protocols.IResponse; @@ -36,12 +44,6 @@ import org.junit.Test; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import static java.util.concurrent.TimeUnit.SECONDS; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.concurrent.CountDownLatch; public class ResourceDirectoryResourceTest { private Cbor> mCbor = new Cbor<>(); @@ -124,7 +126,7 @@ public class ResourceDirectoryResourceTest { .println("\t------testHandleDeleteRequestByIns_notExistVaule"); IRequest request = MessageBuilder.createRequest(RequestMethod.DELETE, RDServerTestUtils.RD_REQ_URI, - "di=" + RDServerTestUtils.DI + "&ins=1"); + "di=" + RDServerTestUtils.DI + ";ins=1"); mRDResource.onDefaultRequestReceived(mockDevice, request); // assertion: if the response status is "DELETED" according to the // resource publication @@ -137,7 +139,7 @@ public class ResourceDirectoryResourceTest { System.out.println("\t------testHandleDeleteRequestByIns_existVaule"); IRequest request = MessageBuilder.createRequest(RequestMethod.DELETE, RDServerTestUtils.RD_REQ_URI, - "di=" + RDServerTestUtils.DI + "&ins=1"); + "di=" + RDServerTestUtils.DI + ";ins=1"); mRDResource.onDefaultRequestReceived(mockDevice, RDServerTestUtils.makePublishRequest()); mRDResource.onDefaultRequestReceived(mockDevice, request); -- 2.7.4