opendev/gerrit
Code Issues Proposed changes

Remove ExpectedException rules

Browse Source 
Change-Id: I0eaebb7bce357bd22ed8f8c1313aea59370789a6
This commit is contained in:
Dave Borowitz
2019-05-02 09:14:14 -07:00
parent b85cb39003
commit 0700c0e1f8
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -184,7 +184,6 @@ import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.ClassRule; import org.junit.ClassRule;
import org.junit.Rule; import org.junit.Rule;
import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder; import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestRule; import org.junit.rules.TestRule;
import org.junit.runner.Description; import org.junit.runner.Description;
@@ -201,10 +200,6 @@ public abstract class AbstractDaemonTest {
@ConfigSuite.Parameter public Config baseConfig; @ConfigSuite.Parameter public Config baseConfig;
@ConfigSuite.Name private String configName; @ConfigSuite.Name private String configName;
@Deprecated // Use GerritJUnit#assertThrows
@Rule
public ExpectedException exception = ExpectedException.none();
@Rule @Rule
public TestRule testRunner = public TestRule testRunner =
new TestRule() { new TestRule() {

8
java/com/google/gerrit/testing/GerritBaseTests.java
View File

@@ -15,12 +15,6 @@
package com.google.gerrit.testing; package com.google.gerrit.testing;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Rule;
import org.junit.rules.ExpectedException;
@Ignore @Ignore
public abstract class GerritBaseTests { public abstract class GerritBaseTests {}
@Deprecated // Use GerritJUnit#assertThrows
@Rule
public ExpectedException exception = ExpectedException.none();
}