commit ff06af9c50a4272db248ce1e2fb7bddd80086841
author Saša Živkov <sasa.zivkov@sap.com> Mon Sep 11 09:00:23 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 11 09:00:23 2023 +0000
tree 15e7af145768bc30a315e6635dbe6345a5523dbe
parent abecc8e1951af2c1b334e05a439fd40450d8b4c3
parent adf999917cecb7d21679416f40f6042558b43194

Merge changes I60b5a6fa,If088f635

* changes:
  SpannerRefDatabaseTest: use common setUp/tearDown method names
  SpannerRefDatabaseTest: Use Google truth instead of JUnit assertions

src/test/java/com/googlesource/gerrit/plugins/spannerrefdb/SpannerRefDatabaseTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/spannerrefdb/SpannerRefDatabaseTest.java b/src/test/java/com/googlesource/gerrit/plugins/spannerrefdb/SpannerRefDatabaseTest.java
index 34ef27f..a43d2a5 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/spannerrefdb/SpannerRefDatabaseTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/spannerrefdb/SpannerRefDatabaseTest.java
@@ -14,11 +14,7 @@
 
 package com.googlesource.gerrit.plugins.spannerrefdb;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
 
 import com.google.gerrit.entities.Project;
 import java.util.Optional;
@@ -34,13 +30,13 @@
   private SpannerRefDatabase refdb;
 
   @Before
-  public void setup() throws Exception {
+  public void setUp() throws Exception {
     emulator = new EmulatedSpannerRefDb();
     refdb = emulator.getSpannerRefDatabase();
   }
 
   @After
-  public void cleanup() {
+  public void tearDown() {
     emulator.cleanup();
   }
 
@@ -85,10 +81,10 @@
       throws Exception {
     Ref ref = nullRef(refName);
     try (AutoCloseable lock = refdb.lockRef(project, refName)) {
-      assertTrue(refdb.compareAndPut(project, ref, newValue));
+      assertThat(refdb.compareAndPut(project, ref, newValue)).isTrue();
       Optional<ObjectId> oid = refdb.getObjectId(project, refName);
-      assertFalse(oid.isEmpty());
-      assertEquals(newValue, oid.get());
+      assertThat(oid.isEmpty()).isFalse();
+      assertThat(newValue).isEqualTo(oid.get());
     }
   }
 
@@ -97,8 +93,8 @@
       throws Exception {
     Ref expecRef = newRef(refName, oldValue);
     try (AutoCloseable lock = refdb.lockRef(project, refName)) {
-      assertTrue(refdb.compareAndPut(project, expecRef, newValue));
-      assertEquals(newValue, refdb.getObjectId(project, refName).get());
+      assertThat(refdb.compareAndPut(project, expecRef, newValue)).isTrue();
+      assertThat(newValue).isEqualTo(refdb.getObjectId(project, refName).get());
     }
   }
 
@@ -106,33 +102,35 @@
       throws Exception {
     Ref expecRef = newRef(refName, oldValue);
     try (AutoCloseable lock = refdb.lockRef(project, refName)) {
-      assertTrue(refdb.compareAndPut(project, expecRef, ObjectId.zeroId()));
-      assertTrue(refdb.getObjectId(project, refName).isEmpty());
+      assertThat(refdb.compareAndPut(project, expecRef, ObjectId.zeroId())).isTrue();
+      assertThat(refdb.getObjectId(project, refName).isEmpty()).isTrue();
     }
   }
 
   private void createNewRef(Project.NameKey project, String refName, String newValue)
       throws Exception {
     try (AutoCloseable lock = refdb.lockRef(project, refName)) {
-      assertTrue(refdb.compareAndPut(project, refName, ObjectId.zeroId().name(), newValue));
-      assertNotNull(refdb.get(project, refName));
-      assertEquals(newValue, refdb.get(project, refName));
+      assertThat(refdb.compareAndPut(project, refName, ObjectId.zeroId().name(), newValue))
+          .isTrue();
+      assertThat(refdb.get(project, refName)).isNotNull();
+      assertThat(newValue).isEqualTo(refdb.get(project, refName));
     }
   }
 
   private void updateRef(Project.NameKey project, String refName, String oldValue, String newValue)
       throws Exception {
     try (AutoCloseable lock = refdb.lockRef(project, refName)) {
-      assertTrue(refdb.compareAndPut(project, refName, oldValue, newValue));
-      assertEquals(newValue, refdb.get(project, refName));
+      assertThat(refdb.compareAndPut(project, refName, oldValue, newValue)).isTrue();
+      assertThat(newValue).isEqualTo(refdb.get(project, refName));
     }
   }
 
   private void deleteRef(Project.NameKey project, String refName, String oldValue)
       throws Exception {
     try (AutoCloseable lock = refdb.lockRef(project, refName)) {
-      assertTrue(refdb.compareAndPut(project, refName, oldValue, ObjectId.zeroId().name()));
-      assertNull(refdb.get(project, refName));
+      assertThat(refdb.compareAndPut(project, refName, oldValue, ObjectId.zeroId().name()))
+          .isTrue();
+      assertThat(refdb.get(project, refName)).isNull();
     }
   }
 }