SONAR-8192 skip MyBatis in RootFlagAssertions

diff --git a/sonar-db/src/test/java/org/sonar/db/user/RootFlagAssertions.java b/sonar-db/src/test/java/org/sonar/db/user/RootFlagAssertions.java
index af7abd8f7c70e6c39cafd15fdbba86dbe364a6a6..2ac2353e204d339af51c6abb1f051b29f0c54dad 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/user/RootFlagAssertions.java
+++ b/sonar-db/src/test/java/org/sonar/db/user/RootFlagAssertions.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.db.user;
 
+import java.util.Map;
 import org.sonar.db.DbTester;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -35,25 +36,31 @@ public class RootFlagAssertions {
   }
 
   public void verify(UserDto userDto, boolean root, long updatedAt) {
-    UserDto dto = db.getDbClient().userDao().selectByLogin(db.getSession(), userDto.getLogin());
-    assertThat(dto.isRoot())
+    Map<String, Object> row = db.selectFirst("select is_root as \"isRoot\", updated_at as \"updatedAt\" from users where login = '" + userDto.getLogin() + "'");
+    Object isRoot = row.get("isRoot");
+    assertThat(isRoot)
       .as("Root flag of user '%s' is same as when created", userDto.getLogin())
-      .isEqualTo(root);
-    assertThat(dto.getUpdatedAt())
+      .isEqualTo(isRoot instanceof Long ? toLong(root) : root);
+    assertThat(row.get("updatedAt"))
       .as("UpdatedAt of user '%s' has not changed since created")
       .isEqualTo(updatedAt);
   }
 
   public void verify(UserDto userDto, boolean root) {
-    UserDto dto = db.getDbClient().userDao().selectByLogin(db.getSession(), userDto.getLogin());
-    assertThat(dto.isRoot())
+    Map<String, Object> row = db.selectFirst("select is_root as \"isRoot\", updated_at as \"updatedAt\" from users where login = '" + userDto.getLogin() + "'");
+    Object isRoot = row.get("isRoot");
+    assertThat(isRoot)
       .as("Root flag of user '%s' is '%s'", userDto.getLogin(), root)
-      .isEqualTo(root);
-    assertThat(dto.getUpdatedAt())
+      .isEqualTo(isRoot instanceof Long ? toLong(root) : root);
+    assertThat(row.get("updatedAt"))
       .as("UpdatedAt of user '%s' has changed since insertion", userDto.getLogin())
       .isNotEqualTo(userDto.getUpdatedAt());
   }
 
+  private static Long toLong(boolean root) {
+    return root ? 1L : 0L;
+  }
+
   public void verify(String login, boolean root) {
     assertThat(db.getDbClient().userDao().selectByLogin(db.getSession(), login).isRoot())
       .as("Root flag of user '%s' is '%s'", login, root)