commit 94f077b5d2cb22d905fdf2212f6845d90e83c2cf
author Dave Borowitz <dborowitz@google.com> Wed Aug 09 15:56:16 2017 -0400
committer Dave Borowitz <dborowitz@google.com> Mon Aug 14 11:20:28 2017 -0400
tree f43dee473e294a1bf215c39ec020ae4c996df412
parent a866f2ea2a68367690119815f2253f3ef08fce2f

Don't depend on GerritBaseTests from small index tests

In preparation for moving these classes to a new package, from which we
don't want a dependency into //gerrit-server:testutil.

Change-Id: I9e4535cf66f2626a5023580bf3ad265ff0b2c937

gerrit-server/src/test/java/com/google/gerrit/server/index/SchemaUtilTest.java

diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/index/SchemaUtilTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/index/SchemaUtilTest.java
index 1dc6a469..9267f37 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/index/SchemaUtilTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/index/SchemaUtilTest.java
@@ -19,12 +19,15 @@
 import static com.google.gerrit.server.index.SchemaUtil.getPersonParts;
 import static com.google.gerrit.server.index.SchemaUtil.schema;
 
-import com.google.gerrit.testutil.GerritBaseTests;
 import java.util.Map;
 import org.eclipse.jgit.lib.PersonIdent;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
-public class SchemaUtilTest extends GerritBaseTests {
+public class SchemaUtilTest {
+  @Rule public ExpectedException exception = ExpectedException.none();
+
   static class TestSchemas {
     static final Schema<String> V1 = schema();
     static final Schema<String> V2 = schema();

gerrit-server/src/test/java/com/google/gerrit/server/query/PredicateTest.java

diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/PredicateTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/PredicateTest.java
index 2d13876..44f0cad 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/PredicateTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/PredicateTest.java
@@ -14,11 +14,14 @@
 
 package com.google.gerrit.server.query;
 
-import com.google.gerrit.testutil.GerritBaseTests;
 import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.rules.ExpectedException;
 
 @Ignore
-public abstract class PredicateTest extends GerritBaseTests {
+public abstract class PredicateTest {
+  @Rule public ExpectedException exception = ExpectedException.none();
+
   protected static final class TestPredicate extends OperatorPredicate<String> {
     protected TestPredicate(String name, String value) {
       super(name, value);