aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/junit/framework/ComparisonCompactor.java
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2021-03-03 15:09:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-03 15:09:30 +0000
commit6b74b10fa73184d2d997583b5eded4a23324b64d (patch)
tree10923530939981dd1dc5f44ceb6316fb9442428a /src/main/java/junit/framework/ComparisonCompactor.java
parente4ffdd500e7ca130574414d7ecf208a147167249 (diff)
parenta9a7715d84046efd231e038b0dc2f551daf61701 (diff)
downloadjunit-6b74b10fa73184d2d997583b5eded4a23324b64d.tar.gz
Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799c am: b6446bec0a am: fcd81b3e3f am: c7a6d4ec7d am: a9a7715d84
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I70a6b61e69982b66be9f6d7c2e7df5afc91bf382
Diffstat (limited to 'src/main/java/junit/framework/ComparisonCompactor.java')
-rw-r--r--src/main/java/junit/framework/ComparisonCompactor.java1
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);