mirror of
https://github.com/google/nomulus.git
synced 2025-08-03 16:32:11 +02:00
Replace ExceptionRule with ExpectedException
This is in preparation for running the automatic refactoring script that will replace all ExpectedExceptions with use of JUnit 4.13's assertThrows/ expectThrows. Note that I have recorded the callsites of assertions about EppExceptions being marshallable and will edit those specific assertions back in after running the automatic refactoring script (which do not understand these). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=178812403
This commit is contained in:
parent
c5515ab4e6
commit
03c782f38e
142 changed files with 285 additions and 359 deletions
|
@ -1,74 +0,0 @@
|
|||
// Copyright 2017 The Nomulus Authors. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package google.registry.testing;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkState;
|
||||
import static com.google.common.base.Strings.nullToEmpty;
|
||||
import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions;
|
||||
|
||||
import google.registry.flows.EppException;
|
||||
import javax.annotation.Nullable;
|
||||
import org.junit.rules.TestRule;
|
||||
import org.junit.runner.Description;
|
||||
import org.junit.runners.model.Statement;
|
||||
|
||||
/**
|
||||
* A test rule similar to JUnit's {@code ExpectedException} rule that does extra checking to ensure
|
||||
* that {@link EppException} derivatives have EPP-compliant error messages.
|
||||
*/
|
||||
public class ExceptionRule implements TestRule {
|
||||
|
||||
@Nullable
|
||||
Class<? extends Throwable> expectedExceptionClass;
|
||||
|
||||
@Nullable
|
||||
String expectedMessage;
|
||||
|
||||
@Override
|
||||
public Statement apply(final Statement base, Description description) {
|
||||
return new Statement() {
|
||||
@Override
|
||||
public void evaluate() throws Throwable {
|
||||
try {
|
||||
base.evaluate();
|
||||
if (expectedExceptionClass != null) {
|
||||
throw new AssertionError(String.format(
|
||||
"Expected test to throw %s%s",
|
||||
expectedExceptionClass.getSimpleName(),
|
||||
expectedMessage == null ? "" : (" with message: " + expectedMessage)));
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
if (expectedExceptionClass == null
|
||||
|| !(expectedExceptionClass.isAssignableFrom(e.getClass())
|
||||
&& nullToEmpty(e.getMessage()).contains(nullToEmpty(expectedMessage)))) {
|
||||
throw e; // We didn't expect this so pass it through.
|
||||
}
|
||||
if (e instanceof EppException) {
|
||||
assertAboutEppExceptions().that((EppException) e).marshalsToXml();
|
||||
}
|
||||
}
|
||||
}};
|
||||
}
|
||||
|
||||
public void expect(Class<? extends Throwable> expectedExceptionClass) {
|
||||
checkState(this.expectedExceptionClass == null,
|
||||
"Don't use multiple `thrown.expect()` statements in your test.");
|
||||
this.expectedExceptionClass = expectedExceptionClass;
|
||||
}
|
||||
|
||||
public void expectMessage(String expectedMessage) {
|
||||
this.expectedMessage = expectedMessage;
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue