Skip to content

Commit 63c74c1

Browse files
committed
Make "all" cases in tests more explicit, formatting
1 parent f9d24b0 commit 63c74c1

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

src/test/java/org/nibor/autolink/AutolinkEmailTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class AutolinkEmailTest extends AutolinkTestCase {
1616
public static Iterable<Object[]> data() {
1717
return Arrays.asList(new Object[][]{
1818
{LinkExtractor.builder().linkTypes(EnumSet.of(LinkType.EMAIL)).build(), true, "email"},
19-
{LinkExtractor.builder().build(), true, "all"},
19+
{LinkExtractor.builder().linkTypes(EnumSet.allOf(LinkType.class)).build(), true, "all"},
2020
{LinkExtractor.builder().emailDomainMustHaveDot(false).build(), false, "all, single part domain"}
2121
});
2222
}

src/test/java/org/nibor/autolink/AutolinkUrlTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class AutolinkUrlTest extends AutolinkTestCase {
1818
public static Iterable<Object[]> data() {
1919
return Arrays.asList(new Object[][]{
2020
{LinkExtractor.builder().linkTypes(EnumSet.of(LinkType.URL)).build(), "URL"},
21-
{LinkExtractor.builder().build(), "all"}
21+
{LinkExtractor.builder().linkTypes(EnumSet.allOf(LinkType.class)).build(), "all"}
2222
});
2323
}
2424

src/test/java/org/nibor/autolink/AutolinkWwwTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
package org.nibor.autolink;
22

3-
import java.util.Arrays;
4-
import java.util.EnumSet;
5-
63
import org.junit.Test;
74
import org.junit.runner.RunWith;
85
import org.junit.runners.Parameterized;
96
import org.junit.runners.Parameterized.Parameter;
107
import org.junit.runners.Parameterized.Parameters;
118

9+
import java.util.Arrays;
10+
import java.util.EnumSet;
11+
1212
@RunWith(Parameterized.class)
1313
public class AutolinkWwwTest extends AutolinkTestCase {
1414

1515
@Parameters(name = "{1}")
1616
public static Iterable<Object[]> data() {
1717
return Arrays.asList(new Object[][]{
1818
{LinkExtractor.builder().linkTypes(EnumSet.of(LinkType.WWW)).build(), "WWW"},
19-
{LinkExtractor.builder().build(), "all"}
19+
{LinkExtractor.builder().linkTypes(EnumSet.allOf(LinkType.class)).build(), "all"}
2020
});
2121
}
2222

@@ -38,29 +38,29 @@ public void notLinked() {
3838
assertNotLinked("www..com");
3939
assertNotLinked("wwww.toomany.com");
4040
}
41-
41+
4242
@Test
4343
public void linked() {
44-
assertLinked("www.s.com","|www.s.com|");
45-
assertLinked("www.fo.uk","|www.fo.uk|");
46-
assertLinked("foo:www.fo.uk","foo:|www.fo.uk|");
47-
assertLinked("foo-www.fo.uk","foo-|www.fo.uk|");
44+
assertLinked("www.s.com", "|www.s.com|");
45+
assertLinked("www.fo.uk", "|www.fo.uk|");
46+
assertLinked("foo:www.fo.uk", "foo:|www.fo.uk|");
47+
assertLinked("foo-www.fo.uk", "foo-|www.fo.uk|");
4848
}
49-
49+
5050
@Test
5151
public void html() {
5252
assertLinked("<a href=\"somelink\">www.example.org</a>", "<a href=\"somelink\">|www.example.org|</a>");
5353
assertLinked("<a href=\"www.example.org\">sometext</a>", "<a href=\"|www.example.org|\">sometext</a>");
5454
assertLinked("<p>www.example.org</p>", "<p>|www.example.org|</p>");
5555
}
56-
56+
5757
@Test
5858
public void multiple() {
5959
assertLinked("www.one.org/ www.two.org/", "|www.one.org/| |www.two.org/|");
6060
assertLinked("www.one.org/ : www.two.org/", "|www.one.org/| : |www.two.org/|");
6161
assertLinked("(www.one.org/)(www.two.org/)", "(|www.one.org/|)(|www.two.org/|)");
6262
}
63-
63+
6464
@Test
6565
public void international() {
6666
assertLinked("www.üñîçøðé.com/ä", "|www.üñîçøðé.com/ä|");

0 commit comments

Comments
 (0)