mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-03 14:46:59 +00:00
Code Issues Releases Wiki Activity

Upgradle JUnit to 4.13 (#442)

Browse Source 
* Upgradle JUnit to 4.13

Removed third_party/junit folder and all usage of the
JunitBackPort class. As a result, third_party is no
longer a Gradle subproject.

Minor code changes were needed to work around an
error-prone pattern: multiple statement in assertThrows'
runnable lambda.

Also third_party/activation and third_party/jsch. These
dependencies are loaded from remote maven repo. The local
copies are not in use.
This commit is contained in:
Weimin Yu
2020-01-14 10:54:09 -05:00
committed by GitHub
parent 54471e2714
commit e106e25800
336 changed files with 322 additions and 1646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/src/test/java/google/registry/util/AppEngineServiceUtilsImplTest.java
+1 -1
View File
@@ -15,7 +15,7 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static org.junit.Assert.assertThrows;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
util/src/test/java/google/registry/util/CidrAddressBlockTest.java
+1 -1
View File
@@ -14,8 +14,8 @@
package google.registry.util;
import static google.registry.testing.JUnitBackports.assertThrows;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertThrows;
import com.google.common.collect.ImmutableMap;
import com.google.common.net.InetAddresses;
util/src/test/java/google/registry/util/CollectionUtilsTest.java
+1 -1
View File
@@ -15,9 +15,9 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.util.CollectionUtils.nullToEmpty;
import static google.registry.util.CollectionUtils.partitionMap;
import static org.junit.Assert.assertThrows;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableList;
util/src/test/java/google/registry/util/ComparingInvocationHandlerTest.java
+1 -1
View File
@@ -15,7 +15,7 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
util/src/test/java/google/registry/util/DateTimeUtilsTest.java
+1 -1
View File
@@ -15,7 +15,6 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.util.DateTimeUtils.END_OF_TIME;
import static google.registry.util.DateTimeUtils.START_OF_TIME;
import static google.registry.util.DateTimeUtils.earliestOf;
@@ -26,6 +25,7 @@ import static google.registry.util.DateTimeUtils.leapSafeAddYears;
import static google.registry.util.DateTimeUtils.leapSafeSubtractYears;
import static google.registry.util.DateTimeUtils.toJodaDateTime;
import static google.registry.util.DateTimeUtils.toZonedDateTime;
import static org.junit.Assert.assertThrows;
import com.google.common.collect.ImmutableList;
import java.time.ZonedDateTime;
util/src/test/java/google/registry/util/DomainNameUtilsTest.java
+1 -1
View File
@@ -15,9 +15,9 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
import static google.registry.util.DomainNameUtils.getSecondLevelDomain;
import static org.junit.Assert.assertThrows;
import org.junit.Test;
import org.junit.runner.RunWith;
util/src/test/java/google/registry/util/HexDumperTest.java
+1 -1
View File
@@ -15,8 +15,8 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertThrows;
import java.io.StringWriter;
import org.junit.Test;
util/src/test/java/google/registry/util/PosixTarHeaderTest.java
+2 -3
View File
@@ -17,8 +17,8 @@ package google.registry.util;
import static com.google.common.io.BaseEncoding.base64;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static google.registry.testing.JUnitBackports.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertThrows;
import com.google.common.testing.EqualsTester;
import java.io.ByteArrayInputStream;
@@ -47,8 +47,7 @@ public class PosixTarHeaderTest {
byte[] gnuTarGeneratedData =
base64()
.decode(
""
+ "aGVsbG8ueG1sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"aGVsbG8ueG1sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMDA2NDAAMDU0MTI2"
+ "NgAwMDExNjEwADAwMDAwMDAwMDE0ADEyMjAyMzEwMzI0ADAxMjQ2MQAgMAAAAAAAAAAAAAAAAAAA"
+ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
util/src/test/java/google/registry/util/RetrierTest.java
+2 -1
View File
@@ -15,7 +15,7 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static org.junit.Assert.assertThrows;
import google.registry.testing.FakeClock;
import google.registry.testing.FakeSleeper;
@@ -94,6 +94,7 @@ public class RetrierTest {
}
@Test
@SuppressWarnings("AssertThrowsMultipleStatements")
public void testRetryFailed_withReporter() {
CountingException thrown =
assertThrows(
util/src/test/java/google/registry/util/SendEmailServiceTest.java
+1 -1
View File
@@ -15,7 +15,7 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static org.junit.Assert.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
util/src/test/java/google/registry/util/SerializeUtilsTest.java
+1 -1
View File
@@ -15,9 +15,9 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.util.SerializeUtils.deserialize;
import static google.registry.util.SerializeUtils.serialize;
import static org.junit.Assert.assertThrows;
import org.junit.Test;
import org.junit.runner.RunWith;
util/src/test/java/google/registry/util/SqlTemplateTest.java
+1 -1
View File
@@ -15,7 +15,7 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static org.junit.Assert.assertThrows;
import org.junit.Test;
import org.junit.runner.RunWith;
util/src/test/java/google/registry/util/TeeOutputStreamTest.java
+1 -1
View File
@@ -15,9 +15,9 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Arrays.asList;
import static org.junit.Assert.assertThrows;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
util/src/test/java/google/registry/util/TypeUtilsTest.java
+1 -1
View File
@@ -15,7 +15,7 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static org.junit.Assert.assertThrows;
import java.io.Serializable;
import java.util.ArrayList;