Skip to content

Commit 38bb432

Browse files
refactor: use guava's EqualsTester for equals test (#81)
1 parent f37da3d commit 38bb432

File tree

4 files changed

+31
-15
lines changed

4 files changed

+31
-15
lines changed

antlr/repositories.bzl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,12 @@ def rules_antlr_test_dependencies(repository = _MAVEN_CENTRAL):
675675
"version": "33.4.8-jre",
676676
"sha256": "f3d7f57f67fd622f4d468dfdd692b3a5e3909246c28017ac3263405f0fe617ed",
677677
},
678+
"guava_testlib": {
679+
"group": "com.google.guava",
680+
"artifact": "guava-testlib",
681+
"version": "33.4.8-jre",
682+
"sha256": "a58a38746f97e02ae3d067b74a25ad2b136650227baa7124ce03fa3bce4e8576",
683+
},
678684
}, repository)
679685

680686
def _maven_jars(dependencies, repository = _MAVEN_CENTRAL):

src/test/java/org/antlr/bazel/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ java_library(
1414
deps = [
1515
"//src/main/java/org/antlr/bazel",
1616
"@guava//jar",
17+
"@guava_testlib//jar",
1718
"@jimfs//jar",
1819
"@junit//jar",
1920
],

src/test/java/org/antlr/bazel/GrammarTest.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
import com.google.common.jimfs.Configuration;
1515
import com.google.common.jimfs.Jimfs;
16+
import com.google.common.testing.EqualsTester;
1617

1718
import static org.antlr.bazel.Language.*;
1819
import static org.antlr.bazel.Version.*;
1920
import static org.junit.Assert.assertArrayEquals;
2021
import static org.junit.Assert.assertEquals;
21-
import static org.junit.Assert.assertNotEquals;
2222
import static org.junit.Assert.assertTrue;
2323

2424
import org.junit.Test;
@@ -72,14 +72,16 @@ public void equals() throws IOException
7272
{
7373
Grammar g1 = grammar(V4,
7474
path("examples/antlr4/InheritSameFolder/src/main/antlr4/G1.g4"));
75-
assertEquals(g1, g1);
76-
assertEquals(
77-
grammar(V4, path("examples/antlr4/InheritSameFolder/src/main/antlr4/G3.g4")),
78-
grammar(V4, path("examples/antlr4/InheritSameFolder/src/main/antlr4/G3.g4")));
79-
assertNotEquals(g1,
80-
grammar(V4, path("examples/antlr4/InheritSameFolder/src/main/antlr4/G2.g4")));
81-
assertNotEquals(g1, null);
82-
assertNotEquals(g1, new String());
75+
Grammar g3a = grammar(V4, path("examples/antlr4/InheritSameFolder/src/main/antlr4/G3.g4"));
76+
Grammar g3b = grammar(V4, path("examples/antlr4/InheritSameFolder/src/main/antlr4/G3.g4"));
77+
Grammar g2 = grammar(V4, path("examples/antlr4/InheritSameFolder/src/main/antlr4/G2.g4"));
78+
79+
new EqualsTester()
80+
.addEqualityGroup(g1)
81+
.addEqualityGroup(g3a, g3b)
82+
.addEqualityGroup(g2)
83+
.addEqualityGroup("different type")
84+
.testEquals();
8385
}
8486

8587

src/test/java/org/antlr/bazel/NamespaceTest.java

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.nio.file.Paths;
44

5+
import com.google.common.testing.EqualsTester;
6+
57
import static org.junit.Assert.assertEquals;
68
import static org.junit.Assert.assertFalse;
79
import static org.junit.Assert.assertTrue;
@@ -21,12 +23,17 @@ public class NamespaceTest
2123
@Test
2224
public void equals()
2325
{
24-
Namespace namespace = Namespace.of("a");
25-
assertTrue(Namespace.of("").equals(Namespace.of("")));
26-
assertTrue(namespace.equals(namespace));
27-
assertFalse(Namespace.of("").equals(Namespace.of("a")));
28-
assertFalse(Namespace.of("").equals(null));
29-
assertFalse(Namespace.of("").equals(""));
26+
Namespace empty1 = Namespace.of("");
27+
Namespace empty2 = Namespace.of("");
28+
Namespace namespaceA = Namespace.of("a");
29+
Namespace namespaceB = Namespace.of("b");
30+
31+
new EqualsTester()
32+
.addEqualityGroup(empty1, empty2)
33+
.addEqualityGroup(namespaceA)
34+
.addEqualityGroup(namespaceB)
35+
.addEqualityGroup("different type")
36+
.testEquals();
3037
}
3138

3239

0 commit comments

Comments
 (0)