From a7467ecfcda9bf6e2f67c74fdddca290d27d9da6 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 25 Oct 2015 20:59:42 +0000 Subject: Remove lombok --- src/test/java/org/zwobble/mammoth/tests/MammothTests.java | 6 +++--- src/test/java/org/zwobble/mammoth/tests/TestData.java | 5 ++--- src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java | 6 ++---- 3 files changed, 7 insertions(+), 10 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/zwobble/mammoth/tests/MammothTests.java b/src/test/java/org/zwobble/mammoth/tests/MammothTests.java index 013deae..3bbc3e9 100644 --- a/src/test/java/org/zwobble/mammoth/tests/MammothTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/MammothTests.java @@ -1,13 +1,13 @@ package org.zwobble.mammoth.tests; +import java.io.File; + import org.junit.Test; import org.zwobble.mammoth.Mammoth; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; -import lombok.val; - public class MammothTests { @Test public void emptyParagraphsAreIgnoredByDefault() { @@ -22,7 +22,7 @@ public class MammothTests { } private String convertToHtml(String name) { - val file = TestData.file(name); + File file = TestData.file(name); return Mammoth.convertToHtml(file); } } diff --git a/src/test/java/org/zwobble/mammoth/tests/TestData.java b/src/test/java/org/zwobble/mammoth/tests/TestData.java index e84caa4..082ac7c 100644 --- a/src/test/java/org/zwobble/mammoth/tests/TestData.java +++ b/src/test/java/org/zwobble/mammoth/tests/TestData.java @@ -1,14 +1,13 @@ package org.zwobble.mammoth.tests; import java.io.File; +import java.net.URI; import java.net.URISyntaxException; -import lombok.val; - public class TestData { public static File file(String name) { try { - val uri = TestData.class.getResource("/test-data/" + name).toURI(); + URI uri = TestData.class.getResource("/test-data/" + name).toURI(); return new File(uri); } catch (URISyntaxException exception) { throw new RuntimeException(exception); diff --git a/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java b/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java index be1eced..00f8fb2 100644 --- a/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java @@ -14,8 +14,6 @@ import com.google.common.collect.ImmutableMap; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; -import lombok.val; - public class XmlParserTests { private final XmlParser parser = new XmlParser(ImmutableBiMap.of()); @@ -80,7 +78,7 @@ public class XmlParserTests { @Test public void mappedNamespaceUrisInElementNamesArePrefixedToLocalNameWithColon() { - val parser = new XmlParser(ImmutableBiMap.of("x", "word")); + XmlParser parser = new XmlParser(ImmutableBiMap.of("x", "word")); assertThat( parser.parseString(""), is(new XmlElement("x:body"))); @@ -88,7 +86,7 @@ public class XmlParserTests { @Test public void mappedNamespaceUrisInAttributeNamesArePrefixedToLocalNameWithColon() { - val parser = new XmlParser(ImmutableBiMap.of("x", "word")); + XmlParser parser = new XmlParser(ImmutableBiMap.of("x", "word")); assertThat( parser.parseString(""), is(new XmlElement("body", ImmutableMap.of("x:name", "bob")))); -- cgit v1.2.3