Fix broken tests of resource-encapsulation.

Fix broken tests of resource-encapsulation.

DiscoveryManagerTest is moved.
ResourceClientTest is modified to conform to the modified discovery manager.

Change-Id: I55b1fcfa00e4a606796f44ee4c84351dfaebc4c7
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit ebea15b1767e1d545a2e7ac7745216b1f0fba666)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2913