#New Serial number
-#Fri Dec 22 15:54:31 CET 2017
+#Wed Oct 31 14:15:38 CET 2018
keyGeneratorAlgorithm=ECDSA
notAfterInterval=20
securityProvider=BC
ellipticCurve=secp256r1
keystoreDir=keystore
keyStoreLocation=keystore{0}certificateStorage.jks
-keystoreType=BKS
-nextUpdateInterval=1
signatureAlgorithm=SHA256withECDSA
+nextUpdateInterval=1
+keystoreType=BKS
rootOU=OCF Sub CA
-serialNumber=20
+serialNumber=75
rootO=Samsung
-subjectName=uuid\:31313131-3131-3131-3131-313131313131
caAlias=uuid\:31313131-3131-3131-3131-313131313131
+subjectName=uuid\:31313131-3131-3131-3131-313131313131
password=PASSWORD
rootC=KR
import org.iotivity.cloud.util.Cbor;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
}).when(mMockDevice).sendResponse(Mockito.anyObject());
}
- @After
public void resetAccountDatabase() throws Exception {
MongoDB mongoDB = new MongoDB("127.0.0.1", Constants.DB_NAME);
+ mongoDB.dropTable(Constants.USER_TABLE);
+ mongoDB.dropTable(Constants.TOKEN_TABLE);
+ mongoDB.dropTable(Constants.GROUP_TABLE);
+
mongoDB.createTable(Constants.USER_TABLE);
mongoDB.createTable(Constants.TOKEN_TABLE);
mongoDB.createTable(Constants.GROUP_TABLE);
}
@Test
+ @Ignore("This test require valid oauth token to oauth provider. In case test this scenario. Please provider valid oAuth token")
public void testSignUpOnDefaultRequestReceived() throws Exception {
getTestMethodName();
signUp(DEVICE_ID, mAuthProvider, mAuthCode);
private ConnectorPool mConnectorPool = null;
private DeviceServerSystem mDeviceServerSystem = new DeviceServerSystem();
private final CountDownLatch mLatch = new CountDownLatch(1);
- @Mock
- private IRequestChannel mRequestChannel;
+
+ @Mock(name = "mASServer")
+ IRequestChannel mRequestChannelASServer;
@InjectMocks
private AccountSession mAcSessionHandler = new AccountSession();
"\t---------uriquery : " + request.getUriQuery());
return null;
}
- }).when(mRequestChannel).sendRequest(Mockito.any(IRequest.class),
+ }).when(mRequestChannelASServer).sendRequest(Mockito.any(IRequest.class),
Mockito.any(CoapDevice.class));
PowerMockito.mockStatic(ConnectorPool.class);
- PowerMockito.when(ConnectorPool.getConnection(Mockito.anyString())).thenReturn(mRequestChannel);
+ PowerMockito.when(ConnectorPool.getConnection("account")).thenReturn(mRequestChannelASServer);
+ PowerMockito.when(ConnectorPool.containConnection(Mockito.anyString())).thenReturn(true);
}
@Test
EntireDeviceHandler.onResponseReceived(response);
HashMap<String, List<String>> queryMap = mReq.getUriQueryMap();
assertTrue(mReq.getMethod() == RequestMethod.GET);
- assertTrue(queryMap.get("di").contains("device1"));
- assertTrue(queryMap.get("di").contains("device2"));
- assertTrue(queryMap.get("di").contains("device3"));
assertTrue(mReq.getObserve() == Observe.SUBSCRIBE);
}
@Test
public void testRDResourcePublishOnResponseReceived() throws Exception {
- ResourceDirectory.AccountReceiveHandler accountReceiveHandler = mRdHandler.new AccountReceiveHandler(
+ ResourceDirectory.AccountReceiveHandler accountReceiveHandler = mRdHandler.new AccountReceiveHandler(ConnectorPool.getConnection("rd"),
rdPublishRequest, mMockDevice);
IRequest request = makeResourcePublishRequest();
@Test
public void testRDResourcePublishPayloadConverted() throws Exception {
- ResourceDirectory.AccountReceiveHandler accountReceiveHandler = mRdHandler.new AccountReceiveHandler(
+ ResourceDirectory.AccountReceiveHandler accountReceiveHandler = mRdHandler.new AccountReceiveHandler(ConnectorPool.getConnection("rd"),
rdPublishRequest, mMockDevice);
IRequest request = makeResourcePublishRequest();
String[] arr = { "--topic", topic };
TopicCommandOptions opts = new TopicCommandOptions(arr);
- TopicCommand.deleteTopic(zkUtils, opts);
+ try {
+ TopicCommand.deleteTopic(zkUtils, opts);
+ }catch (final Exception e){
+ e.printStackTrace();
+ }
zkClient.close();
zkUtils.close();
@Before
public void setUp() throws Exception {
+ RDServerTestUtils.createRDDatabase();
mResponse = null;
mMockDevice = mock(CoapDevice.class);
mLatch = new CountDownLatch(1);
@After
public void tearDown() throws Exception {
- RDServerTestUtils.resetRDDatabase();
+ RDServerTestUtils.dropRDDatabase();
}
private IRequest makePresenceGetRequest(Observe obs) {
@Before
public void setUp() throws Exception {
+ RDServerTestUtils.createRDDatabase();
mResponse = null;
mockDevice = mock(CoapDevice.class);
mLatch = new CountDownLatch(1);
@After
public void tearDown() throws Exception {
- RDServerTestUtils.resetRDDatabase();
+ RDServerTestUtils.dropRDDatabase();
}
@Test
return request;
}
- public static void resetRDDatabase() throws Exception {
+ public static void createRDDatabase() throws Exception {
MongoDB mongoDB = new MongoDB("127.0.0.1", Constants.RD_DB_NAME);
mongoDB.createTable(Constants.RD_TABLE);
mongoDB.createTable(Constants.PRESENCE_TABLE);
}
+
+ public static void dropRDDatabase() throws Exception {
+ MongoDB mongoDB = new MongoDB("127.0.0.1", Constants.RD_DB_NAME);
+ mongoDB.dropTable(Constants.RD_TABLE);
+ mongoDB.dropTable(Constants.PRESENCE_TABLE);
+ }
}
@Before
public void setUp() throws Exception {
+ RDServerTestUtils.createRDDatabase();
mResponse = null;
mockDevice = mock(CoapDevice.class);
mLatch = new CountDownLatch(1);
@After
public void tearDown() throws Exception {
- RDServerTestUtils.resetRDDatabase();
+ RDServerTestUtils.dropRDDatabase();
}
@Test
@Before
public void setUp() throws Exception {
+ RDServerTestUtils.createRDDatabase();
mRDResource = new ResourceDirectoryResource();
mResPresenceResource = new ResPresenceResource();
mResponse = null;
@After
public void tearDown() throws Exception {
- RDServerTestUtils.resetRDDatabase();
+ RDServerTestUtils.dropRDDatabase();
}
@Test