Skip to content

refactor: use Guava's EqualsTester for equals test #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
albertocavalcante merged 1 commit into from
Jun 9, 2025
Merged

refactor: use Guava's EqualsTester for equals test #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions antlr/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,12 @@ def rules_antlr_test_dependencies(repository = _MAVEN_CENTRAL):
"version": "33.4.8-jre",
"sha256": "f3d7f57f67fd622f4d468dfdd692b3a5e3909246c28017ac3263405f0fe617ed",
},
"guava_testlib": {
"group": "com.google.guava",
"artifact": "guava-testlib",
"version": "33.4.8-jre",
"sha256": "a58a38746f97e02ae3d067b74a25ad2b136650227baa7124ce03fa3bce4e8576",
},
}, repository)

def _maven_jars(dependencies, repository = _MAVEN_CENTRAL):
Expand Down
1 change: 1 addition & 0 deletions src/test/java/org/antlr/bazel/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ java_library(
deps = [
"//src/main/java/org/antlr/bazel",
"@guava//jar",
"@guava_testlib//jar",
"@jimfs//jar",
"@junit//jar",
],
Expand Down
20 changes: 11 additions & 9 deletions src/test/java/org/antlr/bazel/GrammarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@

import com.google.common.jimfs.Configuration;
import com.google.common.jimfs.Jimfs;
import com.google.common.testing.EqualsTester;

import static org.antlr.bazel.Language.*;
import static org.antlr.bazel.Version.*;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;

import org.junit.Test;
Expand Down Expand Up @@ -72,14 +72,16 @@ public void equals() throws IOException
{
Grammar g1 = grammar(V4,
path("examples/antlr4/InheritSameFolder/src/main/antlr4/G1.g4"));
assertEquals(g1, g1);
assertEquals(
grammar(V4, path("examples/antlr4/InheritSameFolder/src/main/antlr4/G3.g4")),
grammar(V4, path("examples/antlr4/InheritSameFolder/src/main/antlr4/G3.g4")));
assertNotEquals(g1,
grammar(V4, path("examples/antlr4/InheritSameFolder/src/main/antlr4/G2.g4")));
assertNotEquals(g1, null);
assertNotEquals(g1, new String());
Grammar g3a = grammar(V4, path("examples/antlr4/InheritSameFolder/src/main/antlr4/G3.g4"));
Grammar g3b = grammar(V4, path("examples/antlr4/InheritSameFolder/src/main/antlr4/G3.g4"));
Grammar g2 = grammar(V4, path("examples/antlr4/InheritSameFolder/src/main/antlr4/G2.g4"));

new EqualsTester()
.addEqualityGroup(g1)
.addEqualityGroup(g3a, g3b)
.addEqualityGroup(g2)
.addEqualityGroup("different type")
.testEquals();
}


Expand Down
19 changes: 13 additions & 6 deletions src/test/java/org/antlr/bazel/NamespaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import java.nio.file.Paths;

import com.google.common.testing.EqualsTester;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Expand All @@ -21,12 +23,17 @@ public class NamespaceTest
@Test
public void equals()
{
Namespace namespace = Namespace.of("a");
assertTrue(Namespace.of("").equals(Namespace.of("")));
assertTrue(namespace.equals(namespace));
assertFalse(Namespace.of("").equals(Namespace.of("a")));
assertFalse(Namespace.of("").equals(null));
assertFalse(Namespace.of("").equals(""));
Namespace empty1 = Namespace.of("");
Namespace empty2 = Namespace.of("");
Namespace namespaceA = Namespace.of("a");
Namespace namespaceB = Namespace.of("b");

new EqualsTester()
.addEqualityGroup(empty1, empty2)
.addEqualityGroup(namespaceA)
.addEqualityGroup(namespaceB)
.addEqualityGroup("different type")
.testEquals();
}


Expand Down