commit 1f31b25a730506fb854501504954847f7bb95f6b
author David Pursehouse <dpursehouse@collab.net> Sat Mar 02 13:57:07 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Sat Mar 02 16:31:00 2019 +0900
tree 180e14edbac0b43fc3456878e97071963f022241
parent 158fb3e471f68d92db0a2631f90d2255112e3df9

Adapt tests to 3.0-SNAPSHOT

Remove references to ReviewDb and StandardKeyEncoder.

Bug: Issue 10539
Change-Id: Ic070320f9336f595edab6460ee20080541de3f5b

src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfigTest.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfigTest.java b/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfigTest.java
index 08821a7..273fcc8 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfigTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfigTest.java
@@ -17,8 +17,6 @@
 import static org.junit.Assert.assertEquals;
 
 import com.google.gerrit.server.config.SitePaths;
-import com.google.gwtorm.client.KeyUtil;
-import com.google.gwtorm.server.StandardKeyEncoder;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -29,11 +27,6 @@
 import org.junit.Test;
 
 public class HeartbeatConfigTest {
-
-  static {
-    KeyUtil.setEncoderImpl(new StandardKeyEncoder());
-  }
-
   private SitePaths sitePaths;
   private HeartbeatConfig heartbeatConfig;
 

src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemonTest.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemonTest.java b/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemonTest.java
index 90de35b..35c8347 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemonTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemonTest.java
@@ -24,21 +24,12 @@
 import static org.easymock.EasyMock.verify;
 
 import com.google.gerrit.extensions.registration.DynamicItem;
-import com.google.gerrit.reviewdb.server.ReviewDb;
 import com.google.gerrit.server.events.EventDispatcher;
-import com.google.gwtorm.client.KeyUtil;
-import com.google.gwtorm.server.SchemaFactory;
-import com.google.gwtorm.server.StandardKeyEncoder;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
 
 public class HeartbeatDaemonTest {
-
-  static {
-    KeyUtil.setEncoderImpl(new StandardKeyEncoder());
-  }
-
   private EventDispatcher eventDispatcherMock;
   private HeartbeatDaemon heartbeatDaemon;
 
@@ -53,9 +44,6 @@
     HeartbeatConfig heartbeatConfigMock = createMock(HeartbeatConfig.class);
     expect(heartbeatConfigMock.getDelay()).andReturn(1).anyTimes();
     replay(heartbeatConfigMock);
-    SchemaFactory<ReviewDb> schemaFactoryMock = createNiceMock(SchemaFactory.class);
-    expect(schemaFactoryMock.open()).andReturn(createNiceMock(ReviewDb.class)).anyTimes();
-    replay(schemaFactoryMock);
     heartbeatDaemon = new HeartbeatDaemon(dynamicEventDispatcherMock, heartbeatConfigMock);
   }