diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-03-25 16:03:36 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-03-25 16:03:36 +0000 |
| commit | 5b2235620d33776d0a1dcae8f9e68693d9390be3 (patch) | |
| tree | de929f0030bc2a9371e3426115d72e7bea13c8ea /src/test/java/org | |
| parent | 39cbfae7358faaff8f876641869492c366ce1218 (diff) | |
Prefer Java stdlib classes to Guava
Diffstat (limited to 'src/test/java/org')
| -rw-r--r-- | src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java | 3 | ||||
| -rw-r--r-- | src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java b/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java index 8538534..470002e 100644 --- a/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java +++ b/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java @@ -1,6 +1,5 @@ package org.zwobble.mammoth.tests; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; @@ -227,7 +226,7 @@ public class DeepReflectionMatcher<T> extends TypeSafeDiagnosingMatcher<T> { } private static String indentedList(Iterable<String> values) { - return Joiner.on(",").join(transform(values, value -> "\n " + indent(value))); + return String.join(",", transform(values, value -> "\n " + indent(value))); } private static String indent(String value) { diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java index bc8eb45..cd63457 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java @@ -1,11 +1,11 @@ package org.zwobble.mammoth.tests.docx; -import com.google.common.base.Charsets; import org.junit.Test; import org.zwobble.mammoth.internal.docx.OfficeXml; import org.zwobble.mammoth.internal.xml.XmlElement; import java.io.ByteArrayInputStream; +import java.nio.charset.StandardCharsets; import static org.hamcrest.MatcherAssert.assertThat; import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals; @@ -28,7 +28,7 @@ public class OfficeXmlTests { "</mc:AlternateContent>" + "</numbering>"; - XmlElement result = OfficeXml.parseXml(new ByteArrayInputStream(xmlString.getBytes(Charsets.UTF_8))); + XmlElement result = OfficeXml.parseXml(new ByteArrayInputStream(xmlString.getBytes(StandardCharsets.UTF_8))); assertThat(result.children(), deepEquals(list(element("fallback")))); } } |
