diff options
author | Pete Bentley <prb@google.com> | 2021-03-03 14:33:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 14:33:07 +0000 |
commit | a9a7715d84046efd231e038b0dc2f551daf61701 (patch) | |
tree | 10923530939981dd1dc5f44ceb6316fb9442428a /src/main/java/junit/framework/ComparisonCompactor.java | |
parent | 138b64feb682b90292d36002f3aff9869d6a9e4b (diff) | |
parent | c7a6d4ec7defd99aab81c3add6e2916629a79a24 (diff) | |
download | junit-a9a7715d84046efd231e038b0dc2f551daf61701.tar.gz |
Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799c am: b6446bec0a am: fcd81b3e3f am: c7a6d4ec7d
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie1a9bf8405e1b57da206312f5694e8c3ff5ce613
Diffstat (limited to 'src/main/java/junit/framework/ComparisonCompactor.java')
-rw-r--r-- | src/main/java/junit/framework/ComparisonCompactor.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/junit/framework/ComparisonCompactor.java b/src/main/java/junit/framework/ComparisonCompactor.java index fa20a8e..81ddd5b 100644 --- a/src/main/java/junit/framework/ComparisonCompactor.java +++ b/src/main/java/junit/framework/ComparisonCompactor.java @@ -18,6 +18,7 @@ public class ComparisonCompactor { fActual = actual; } + @SuppressWarnings("deprecation") public String compact(String message) { if (fExpected == null || fActual == null || areStringsEqual()) { return Assert.format(message, fExpected, fActual); |