zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-28 23:33:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge JUnitBackport's expectThrows into assertThrows

Browse source 
More information: https://github.com/junit-team/junit5/issues/531

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=187034408
This commit is contained in:
cushon 2018-02-26 09:38:17 -08:00 • committed by jianglai
parent f96a0b7da9
commit 606b470cd0
180 changed files with 1325 additions and 1381 deletions
Download patch file Download diff file Expand all files Collapse all files

8
javatests/google/registry/tools/server/CreateGroupsActionTest.java
View file

@ -15,7 +15,7 @@
package google.registry.tools.server;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
@ -62,7 +62,7 @@ public class CreateGroupsActionTest {
@Test
public void test_invalidRequest_missingClientId() throws Exception {
BadRequestException thrown = expectThrows(BadRequestException.class, () -> runAction(null));
BadRequestException thrown = assertThrows(BadRequestException.class, () -> runAction(null));
assertThat(thrown)
.hasMessageThat()
.contains("Error creating Google Groups, missing parameter: clientId");
@ -71,7 +71,7 @@ public class CreateGroupsActionTest {
@Test
public void test_invalidRequest_invalidClientId() throws Exception {
BadRequestException thrown =
expectThrows(BadRequestException.class, () -> runAction("completelyMadeUpClientId"));
assertThrows(BadRequestException.class, () -> runAction("completelyMadeUpClientId"));
assertThat(thrown)
.hasMessageThat()
.contains(
@ -99,7 +99,7 @@ public class CreateGroupsActionTest {
"newregistrar-technical-contacts@domain-registry.example",
Role.MEMBER);
InternalServerErrorException e =
expectThrows(InternalServerErrorException.class, () -> runAction("NewRegistrar"));
assertThrows(InternalServerErrorException.class, () -> runAction("NewRegistrar"));
String responseString = e.toString();
assertThat(responseString).contains("abuse => Success");
assertThat(responseString).contains("billing => Success");

6
javatests/google/registry/tools/server/DeleteEntityActionTest.java
View file

@ -18,7 +18,7 @@ import static com.google.appengine.api.datastore.DatastoreServiceFactory.getData
import static com.google.common.truth.Truth.assertThat;
import static com.googlecode.objectify.Key.create;
import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import com.google.appengine.api.datastore.Entity;
import com.google.appengine.api.datastore.KeyFactory;
@ -85,7 +85,7 @@ public class DeleteEntityActionTest {
Entity entity = new Entity("not", "here");
String rawKey = KeyFactory.keyToString(entity.getKey());
action.rawKeys = rawKey;
BadRequestException thrown = expectThrows(BadRequestException.class, action::run);
BadRequestException thrown = assertThrows(BadRequestException.class, action::run);
assertThat(thrown).hasMessageThat().contains("Could not find entity with key " + rawKey);
}
@ -97,7 +97,7 @@ public class DeleteEntityActionTest {
Entity entity = new Entity("non", "existent");
String rawKey = KeyFactory.keyToString(entity.getKey());
action.rawKeys = String.format("%s,%s", ofyKey, rawKey);
BadRequestException thrown = expectThrows(BadRequestException.class, action::run);
BadRequestException thrown = assertThrows(BadRequestException.class, action::run);
assertThat(thrown).hasMessageThat().contains("Could not find entity with key " + rawKey);
}
}