From d6a131213271962d614228cffe68ac51cd6ab685 Mon Sep 17 00:00:00 2001 From: "yeonghun.nam" Date: Wed, 28 Sep 2016 09:03:53 +0900 Subject: [PATCH] Fixed account server TC 1. DB reset for each test case Change-Id: I7cc9d46af2ffe6136b13231d9b0e015ee6799dcf Signed-off-by: yeonghun.nam Reviewed-on: https://gerrit.iotivity.org/gerrit/12373 Tested-by: jenkins-iotivity Reviewed-by: Jee Hyeok Kim (cherry picked from commit c8ea7c0831a5a268b3a4ac4fda81d3b420121645) Reviewed-on: https://gerrit.iotivity.org/gerrit/16547 Tested-by: jenkins-iotivity --- .../resources/account/session/SessionResourceTest.java | 8 ++++++++ .../accountserver/resources/acl/group/GroupResourceTest.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/account/session/SessionResourceTest.java b/cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/account/session/SessionResourceTest.java index 5224f76..1c8efc7 100644 --- a/cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/account/session/SessionResourceTest.java +++ b/cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/account/session/SessionResourceTest.java @@ -112,6 +112,14 @@ public class SessionResourceTest { mongoDB.createTable(Constants.GROUP_TABLE); } + @After + public void resetAccountDatabase() throws Exception { + MongoDB mongoDB = new MongoDB(Constants.DB_NAME); + mongoDB.createTable(Constants.USER_TABLE); + mongoDB.createTable(Constants.TOKEN_TABLE); + mongoDB.createTable(Constants.GROUP_TABLE); + } + @Test public void testSignInOnDefaultRequestReceived() throws Exception { getTestMethodName(); diff --git a/cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/acl/group/GroupResourceTest.java b/cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/acl/group/GroupResourceTest.java index 325a498..87c3378 100644 --- a/cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/acl/group/GroupResourceTest.java +++ b/cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/acl/group/GroupResourceTest.java @@ -121,6 +121,14 @@ public class GroupResourceTest { mongoDB.createTable(Constants.ACE_TABLE); } + @After + public void resetAccountDatabase() throws Exception { + MongoDB mongoDB = new MongoDB(Constants.DB_NAME); + mongoDB.createTable(Constants.USER_TABLE); + mongoDB.createTable(Constants.TOKEN_TABLE); + mongoDB.createTable(Constants.GROUP_TABLE); + } + @Test public void testCreateGroup() throws Exception { getTestMethodName(); -- 2.7.4