From be024b0e4bb779990385495e1eb6740c9c6ffc70 Mon Sep 17 00:00:00 2001 From: David Beaumont Date: Tue, 7 Jul 2020 19:14:58 +0200 Subject: [PATCH] Project import generated by Copybara. (#2496) PiperOrigin-RevId: 320004982 Co-authored-by: The libphonenumber Team --- .../metadata/DigitSequenceTest.java | 2 +- .../metadata/RangeSpecificationTest.java | 2 +- .../phonenumbers/metadata/RangeTreeTest.java | 2 +- .../metadata/i18n/PhoneRegionTest.java | 2 +- .../metadata/i18n/SimpleLanguageTagTest.java | 2 +- .../metadata/model/AltFormatSpecTest.java | 2 +- .../metadata/model/FormatSpecTest.java | 2 +- .../metadata/table/AssignmentTest.java | 2 +- .../metadata/table/ChangeTest.java | 2 +- .../metadata/table/ColumnGroupTest.java | 2 +- .../metadata/table/ColumnTest.java | 2 +- .../metadata/table/CsvParserTest.java | 2 +- .../metadata/table/CsvTableTest.java | 2 +- .../metadata/table/RangeTableTest.java | 2 +- .../metadata/table/SchemaTest.java | 2 +- .../metadata/testing/AssertUtil.java | 22 +++++++++++++++++++ 16 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 metadata/src/test/java/com/google/i18n/phonenumbers/metadata/testing/AssertUtil.java diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/DigitSequenceTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/DigitSequenceTest.java index 80ebc30d9..1e6c530a2 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/DigitSequenceTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/DigitSequenceTest.java @@ -17,7 +17,7 @@ package com.google.i18n.phonenumbers.metadata; import static com.google.common.truth.Truth.assertThat; import static com.google.i18n.phonenumbers.metadata.DigitSequence.domain; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/RangeSpecificationTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/RangeSpecificationTest.java index 7a8622e90..6869f415d 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/RangeSpecificationTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/RangeSpecificationTest.java @@ -21,7 +21,7 @@ import static com.google.i18n.phonenumbers.metadata.DigitSequence.domain; import static com.google.i18n.phonenumbers.metadata.RangeSpecification.ALL_DIGITS_MASK; import static com.google.i18n.phonenumbers.metadata.RangeSpecification.parse; import static java.util.Arrays.asList; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.Range; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/RangeTreeTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/RangeTreeTest.java index 646a63c1d..d8f32a93c 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/RangeTreeTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/RangeTreeTest.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.i18n.phonenumbers.metadata.DigitSequence.domain; import static com.google.i18n.phonenumbers.metadata.testing.RangeTreeSubject.assertThat; import static java.util.Arrays.asList; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import com.google.auto.value.AutoValue; import com.google.common.base.Strings; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/i18n/PhoneRegionTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/i18n/PhoneRegionTest.java index 251d483f0..4eca9d05d 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/i18n/PhoneRegionTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/i18n/PhoneRegionTest.java @@ -17,7 +17,7 @@ package com.google.i18n.phonenumbers.metadata.i18n; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import java.util.stream.Stream; import org.junit.Test; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/i18n/SimpleLanguageTagTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/i18n/SimpleLanguageTagTest.java index d7706e62c..b48d78de3 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/i18n/SimpleLanguageTagTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/i18n/SimpleLanguageTagTest.java @@ -16,7 +16,7 @@ package com.google.i18n.phonenumbers.metadata.i18n; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/model/AltFormatSpecTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/model/AltFormatSpecTest.java index 12e4edd84..89e1fedb3 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/model/AltFormatSpecTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/model/AltFormatSpecTest.java @@ -17,7 +17,7 @@ package com.google.i18n.phonenumbers.metadata.model; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import com.google.i18n.phonenumbers.metadata.RangeSpecification; import com.google.i18n.phonenumbers.metadata.model.FormatSpec.FormatTemplate; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/model/FormatSpecTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/model/FormatSpecTest.java index 5b7b5d6d0..1d2deb964 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/model/FormatSpecTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/model/FormatSpecTest.java @@ -18,7 +18,7 @@ package com.google.i18n.phonenumbers.metadata.model; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; import static java.util.Optional.empty; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import com.google.i18n.phonenumbers.metadata.model.FormatSpec.FormatTemplate; import java.util.Optional; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/AssignmentTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/AssignmentTest.java index b27ae9643..67435f4ad 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/AssignmentTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/AssignmentTest.java @@ -17,7 +17,7 @@ package com.google.i18n.phonenumbers.metadata.table; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/ChangeTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/ChangeTest.java index 0bd62427c..8fbd3ff25 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/ChangeTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/ChangeTest.java @@ -18,7 +18,7 @@ package com.google.i18n.phonenumbers.metadata.table; import static com.google.common.truth.Truth.assertThat; import static com.google.i18n.phonenumbers.metadata.testing.RangeTreeSubject.assertThat; import static java.util.Arrays.asList; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import com.google.i18n.phonenumbers.metadata.RangeSpecification; import com.google.i18n.phonenumbers.metadata.RangeTree; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/ColumnGroupTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/ColumnGroupTest.java index 6d9b577cc..c1c88eac6 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/ColumnGroupTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/ColumnGroupTest.java @@ -16,7 +16,7 @@ package com.google.i18n.phonenumbers.metadata.table; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import com.google.common.collect.ImmutableSet; import com.google.i18n.phonenumbers.metadata.i18n.PhoneRegion; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/ColumnTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/ColumnTest.java index b46fad1e5..1bcbe7317 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/ColumnTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/ColumnTest.java @@ -21,7 +21,7 @@ import static com.google.i18n.phonenumbers.metadata.proto.Types.ValidNumberType. import static com.google.i18n.phonenumbers.metadata.proto.Types.XmlNumberType.XML_UNKNOWN; import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import com.google.i18n.phonenumbers.metadata.proto.Types.ValidNumberType; import com.google.i18n.phonenumbers.metadata.proto.Types.XmlNumberType; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/CsvParserTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/CsvParserTest.java index 14cf0e67d..ec136a39b 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/CsvParserTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/CsvParserTest.java @@ -18,7 +18,7 @@ package com.google.i18n.phonenumbers.metadata.table; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.truth.Truth.assertThat; import static com.google.i18n.phonenumbers.metadata.table.CsvParser.rowMapper; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import com.google.common.collect.ImmutableMap; import com.google.i18n.phonenumbers.metadata.table.CsvParser.RowMapper; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/CsvTableTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/CsvTableTest.java index 6817d25e9..df11cbd7f 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/CsvTableTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/CsvTableTest.java @@ -32,7 +32,7 @@ import static com.google.i18n.phonenumbers.metadata.table.CsvTable.DiffMode.ALL; import static com.google.i18n.phonenumbers.metadata.table.CsvTable.DiffMode.CHANGES; import static com.google.i18n.phonenumbers.metadata.table.CsvTable.DiffMode.LHS; import static com.google.i18n.phonenumbers.metadata.table.CsvTable.DiffMode.RHS; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/RangeTableTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/RangeTableTest.java index 78311690a..ebe89e99c 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/RangeTableTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/RangeTableTest.java @@ -26,7 +26,7 @@ import static com.google.i18n.phonenumbers.metadata.proto.Types.ValidNumberType. import static com.google.i18n.phonenumbers.metadata.testing.RangeTableSubject.assertThat; import static com.google.i18n.phonenumbers.metadata.testing.RangeTreeSubject.assertThat; import static java.util.stream.IntStream.rangeClosed; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Table; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/SchemaTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/SchemaTest.java index a7847c1b1..0f105c2a1 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/SchemaTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/SchemaTest.java @@ -18,7 +18,7 @@ package com.google.i18n.phonenumbers.metadata.table; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; import static com.google.i18n.phonenumbers.metadata.proto.Types.ValidNumberType.UNKNOWN; -import static org.junit.Assert.assertThrows; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import com.google.i18n.phonenumbers.metadata.i18n.PhoneRegion; import com.google.i18n.phonenumbers.metadata.proto.Types.ValidNumberType; diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/testing/AssertUtil.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/testing/AssertUtil.java new file mode 100644 index 000000000..58ba1482b --- /dev/null +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/testing/AssertUtil.java @@ -0,0 +1,22 @@ +package com.google.i18n.phonenumbers.metadata.testing; + +/** Additional useful assertion methods for testing. */ +public final class AssertUtil { + + /** Asserts the given code threw the expected exception, and returns it for further checking. */ + public static T assertThrows(Class clazz, Runnable fn) { + String message; + try { + fn.run(); + message = String.format("expected exception (%s) was not thrown", clazz.getSimpleName()); + } catch (Throwable t) { + if (clazz.isInstance(t)) { + return clazz.cast(t); + } + message = String.format("expected (%s), but caught: %s", clazz.getSimpleName(), t); + } + throw new AssertionError(message); + } + + private AssertUtil() {} +}