Remove DbUnit usage from UserGroupDaoTest

4 files changed, 19 insertions, 24 deletions

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserGroupDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserGroupDaoTest.java
index 6fab25df6a3..66ca3ab33b5 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserGroupDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserGroupDaoTest.java
@@ -40,21 +40,35 @@ public class UserGroupDaoTest {
 
   @Test
   public void insert() {
-    UserGroupDto userGroupDto = new UserGroupDto().setUserId(1).setGroupId(2);
+    UserDto user = dbTester.users().insertUser();
+    GroupDto group = dbTester.users().insertGroup();
+    UserGroupDto userGroupDto = new UserGroupDto().setUserId(user.getId()).setGroupId(group.getId());
+
     underTest.insert(dbTester.getSession(), userGroupDto);
     dbTester.getSession().commit();
 
-    dbTester.assertDbUnit(getClass(), "insert-result.xml", "groups_users");
+    assertThat(dbTester.getDbClient().groupMembershipDao().selectGroupIdsByUserId(dbTester.getSession(), user.getId())).containsOnly(group.getId());
   }
 
   @Test
   public void delete_members_by_group_id() {
-    dbTester.prepareDbUnit(getClass(), "delete_members_by_group_id.xml");
-    underTest.deleteByGroupId(dbTester.getSession(), 1);
+    UserDto user1 = dbTester.users().insertUser();
+    UserDto user2 = dbTester.users().insertUser();
+    GroupDto group1 = dbTester.users().insertGroup();
+    GroupDto group2 = dbTester.users().insertGroup();
+    dbTester.users().insertMember(group1, user1);
+    dbTester.users().insertMember(group1, user2);
+    dbTester.users().insertMember(group2, user1);
+    dbTester.users().insertMember(group2, user2);
+
+    underTest.deleteByGroupId(dbTester.getSession(), group1.getId());
     dbTester.getSession().commit();
-    dbTester.assertDbUnit(getClass(), "delete_members_by_group_id-result.xml", "groups_users");
+
+    assertThat(dbTester.getDbClient().groupMembershipDao().selectGroupIdsByUserId(dbTester.getSession(), user1.getId())).containsOnly(group2.getId());
+    assertThat(dbTester.getDbClient().groupMembershipDao().selectGroupIdsByUserId(dbTester.getSession(), user2.getId())).containsOnly(group2.getId());
   }
 
+
   @Test
   public void delete_organization_member() {
     OrganizationDto organization = dbTester.organizations().insert();
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/user/UserGroupDaoTest/delete_members_by_group_id-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/user/UserGroupDaoTest/delete_members_by_group_id-result.xml
deleted file mode 100644
index edac414e636..00000000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/user/UserGroupDaoTest/delete_members_by_group_id-result.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<dataset>
-
-  <groups_users user_id="1" group_id="2"/>
-  <groups_users user_id="2" group_id="2"/>
-
-</dataset>
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/user/UserGroupDaoTest/delete_members_by_group_id.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/user/UserGroupDaoTest/delete_members_by_group_id.xml
deleted file mode 100644
index 2430e53dd8e..00000000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/user/UserGroupDaoTest/delete_members_by_group_id.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<dataset>
-
-  <groups_users user_id="1" group_id="1"/>
-  <groups_users user_id="2" group_id="1"/>
-  <groups_users user_id="1" group_id="2"/>
-  <groups_users user_id="2" group_id="2"/>
-
-</dataset>
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/user/UserGroupDaoTest/insert-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/user/UserGroupDaoTest/insert-result.xml
deleted file mode 100644
index 2e5bb1ada57..00000000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/user/UserGroupDaoTest/insert-result.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<dataset>
-
-  <groups_users user_id="1" group_id="2"/>
-
-</dataset>