diff options
author | 2015-04-10 14:54:19 +0000 | |
---|---|---|
committer | 2015-04-13 11:44:53 +0000 | |
commit | 8ae34f1ddffa5550d3f03366f918532cbb1bc9b9 (patch) | |
tree | b4db06a2184e6cc8a1494996825070ae4819ff8b /src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java | |
parent | 8d676c54644b7213a926faa00fc793e0e23fad0b (diff) |
Make Artifacts be compared to each other based on their exec paths (and not their paths). This gives a predictable order in places where Artifacts are sorted by their natural order.
This works because exec paths of Artifacts are unique in any given build.
--
MOS_MIGRATED_REVID=90807141
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java b/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java index 0ba34cb057..c4b3f53d28 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java @@ -85,10 +85,10 @@ public class ArtifactTest { PathFragment bPath = new PathFragment("src/b"); Artifact aArtifact = new Artifact(aPath, rootDir); Artifact bArtifact = new Artifact(bPath, rootDir); - assertEquals(-1, aArtifact.compareTo(bArtifact)); - assertEquals(0, aArtifact.compareTo(aArtifact)); - assertEquals(0, bArtifact.compareTo(bArtifact)); - assertEquals(1, bArtifact.compareTo(aArtifact)); + assertEquals(-1, Artifact.EXEC_PATH_COMPARATOR.compare(aArtifact, bArtifact)); + assertEquals(0, Artifact.EXEC_PATH_COMPARATOR.compare(aArtifact, aArtifact)); + assertEquals(0, Artifact.EXEC_PATH_COMPARATOR.compare(bArtifact, bArtifact)); + assertEquals(1, Artifact.EXEC_PATH_COMPARATOR.compare(bArtifact, aArtifact)); } @Test |