From 9310393de75e733560f2d1d1213ad4af95b11f4c Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 20 Nov 2018 10:37:48 -0800 Subject: [PATCH] LocalDiskRepositoryManagerTest: Extend GerritBaseTests This class doesn't use mocks, so there's no reason to extend EasyMockSupport. Change-Id: Iabaff75fdaefd862316b778c938390a1da0ea576 --- .../server/git/LocalDiskRepositoryManagerTest.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/javatests/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java b/javatests/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java index 4e0cb0ca3d..b89f4912b3 100644 --- a/javatests/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java +++ b/javatests/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java @@ -20,13 +20,11 @@ import static com.google.common.truth.TruthJUnit.assume; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.ioutil.HostPlatform; +import com.google.gerrit.testing.GerritBaseTests; import com.google.gerrit.testing.TempFileUtil; -import com.google.gwtorm.client.KeyUtil; -import com.google.gwtorm.server.StandardKeyEncoder; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import org.easymock.EasyMockSupport; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Constants; @@ -37,12 +35,7 @@ import org.eclipse.jgit.util.FS; import org.junit.Before; import org.junit.Test; -public class LocalDiskRepositoryManagerTest extends EasyMockSupport { - - static { - KeyUtil.setEncoderImpl(new StandardKeyEncoder()); - } - +public class LocalDiskRepositoryManagerTest extends GerritBaseTests { private Config cfg; private SitePaths site; private LocalDiskRepositoryManager repoManager;