From 0ebeabf9c1c2dc1ecf59ac3cc04ad7558ce4299f Mon Sep 17 00:00:00 2001 From: "yeonghun.nam" Date: Thu, 1 Dec 2016 18:59:36 +0900 Subject: [PATCH] [IOT-1628] fixed TC failure in the resource discovery in the cloud RD - According to the latest RD implementation, the resource discovery TC is fixed where the device presence information is stored in the DB in advance Change-Id: I85c2c848cf3b0a60fa22014faa09e00985fe6688 Signed-off-by: yeonghun.nam Reviewed-on: https://gerrit.iotivity.org/gerrit/15017 Tested-by: jenkins-iotivity Reviewed-by: Jee Hyeok Kim (cherry picked from commit fbedeaf326cfd49446ba3a28d599a4cb54824d10) Reviewed-on: https://gerrit.iotivity.org/gerrit/15259 Reviewed-by: Phil Coval Reviewed-by: Ziran Sun --- .../iotivity/cloud/testrdserver/DiscoveryResourceTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 1881f90..68b03f3 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 @@ -36,6 +36,8 @@ import org.iotivity.cloud.base.protocols.MessageBuilder; import org.iotivity.cloud.base.protocols.coap.CoapResponse; import org.iotivity.cloud.base.protocols.enums.RequestMethod; import org.iotivity.cloud.base.protocols.enums.ResponseStatus; +import org.iotivity.cloud.rdserver.Constants; +import org.iotivity.cloud.rdserver.db.DBManager; import org.iotivity.cloud.rdserver.resources.directory.rd.ResourceDirectoryResource; import org.iotivity.cloud.rdserver.resources.directory.res.DiscoveryResource; import org.iotivity.cloud.util.Cbor; @@ -92,6 +94,13 @@ public class DiscoveryResourceTest { @Test public void testHandleGetRequest_existValue() throws Exception { + // add presence state on + HashMap presenceinfo = new HashMap<>(); + presenceinfo.put(Constants.DEVICE_ID, RDServerTestUtils.DI); + presenceinfo.put(Constants.PRESENCE_STATE, Constants.PRESENCE_ON); + DBManager.getInstance().insertRecord(Constants.PRESENCE_TABLE, + presenceinfo); + IRequest request = MessageBuilder.createRequest(RequestMethod.GET, RDServerTestUtils.DISCOVERY_REQ_URI, "rt=core.light;di=" + RDServerTestUtils.DI); @@ -148,4 +157,4 @@ public class DiscoveryResourceTest { .parsePayloadFromCbor(mResponse.getPayload(), ArrayList.class); return (payloadData.isEmpty()); } -} \ No newline at end of file +} -- 2.7.4