diff options
| author |  Googler <noreply@google.com> | 2016-03-25 21:44:29 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2016-03-25 22:00:58 +0000 |
| commit | 4a317f484b83e2eb265b71b15b4a181a2eba27a9 (patch) | |
| tree | 3fcdbcbac77f04a87c75ea869814709582a66653 /src/tools/android/java/com/google/devtools/build/android/MergeConflict.java | |
| parent | 7b04a1c5cb882bd31dd218fbb434e01ef4f4a922 (diff) | |
3.71: Remove ResourceMap, Fix tests
Removes ResourceMap from AndroidDataSet, now the merge operates directly on the AndroidDataSet instances.
Change tests to use Map<DataKey, Data?> instead of List<Data?>.
Add tests for finding conflicts during AndroidDataSet creation.
Make MergeConflict more test friendly by sorting Paths on creation.
--
MOS_MIGRATED_REVID=118240635
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/MergeConflict.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/MergeConflict.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java b/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java index 4a2d76d24e..948a357c1a 100644 --- a/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java +++ b/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java @@ -29,7 +29,7 @@ import java.util.Objects; */ @Immutable public class MergeConflict { - static final String CONFLICT_MESSAGE = "%s is provided from %s and %s"; + private static final String CONFLICT_MESSAGE = "%s is provided from %s and %s"; private final DataKey dataKey; private final Path first; private final Path second; @@ -78,7 +78,10 @@ public class MergeConflict { @VisibleForTesting static MergeConflict of(DataKey key, Path first, Path second) { - return new MergeConflict(key, first, second); + // Make sure the paths are always ordered. + Path sortedFirst = first.compareTo(second) > 0 ? first : second; + Path sortedSecond = sortedFirst != first ? first : second; + return new MergeConflict(key, sortedFirst, sortedSecond); } public String toConflictMessage() { |