From bd1632355ec72a7a893334a87d103d11ba4c2593 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Mon, 2 Apr 2018 12:56:56 -0700 Subject: [PATCH] Fix {Spanned|Spannable}StringNoCopyTest test cases The meaning of boolean argument was flipped in the last patch set. Need to be reversed. Bug: 77224927 Test: atest FrameworksCoreTests:android.text Change-Id: I8bcd21352e86b29e5f6282641ee4e0bb63bc5da8 --- .../coretests/src/android/text/SpannableStringNoCopyTest.java | 4 ++-- .../coretests/src/android/text/SpannedStringNoCopyTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java b/core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java index c205f9695bb84..6c05601a31fde 100644 --- a/core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java +++ b/core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java @@ -54,7 +54,7 @@ public class SpannableStringNoCopyTest { first.setSpan(new UnderlineSpan(), 0, first.length(), Spanned.SPAN_PRIORITY); // Do not copy NoCopySpan if specified so. - final SpannedString copied = new SpannedString(first, false /* copyNoCopySpan */); + final SpannedString copied = new SpannedString(first, true /* ignoreNoCopySpan */); final Object[] spans = copied.getSpans(0, copied.length(), Object.class); assertNotNull(spans); assertEquals(2, spans.length); @@ -87,7 +87,7 @@ public class SpannableStringNoCopyTest { // Do not copy NoCopySpan if specified so. final SpannedString copied = new SpannedString( - new CustomSpannable(first), false /* copyNoCopySpan */); + new CustomSpannable(first), true /* ignoreNoCopySpan */); final Object[] spans = copied.getSpans(0, copied.length(), Object.class); assertNotNull(spans); assertEquals(2, spans.length); diff --git a/core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java b/core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java index 068092484b1b8..380e3153ccdaf 100644 --- a/core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java +++ b/core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java @@ -54,7 +54,7 @@ public class SpannedStringNoCopyTest { first.setSpan(new UnderlineSpan(), 0, first.length(), Spanned.SPAN_PRIORITY); // Do not copy NoCopySpan if specified so. - final SpannedString copied = new SpannedString(first, false /* copyNoCopySpan */); + final SpannedString copied = new SpannedString(first, true /* ignoreNoCopySpan */); final Object[] spans = copied.getSpans(0, copied.length(), Object.class); assertNotNull(spans); assertEquals(2, spans.length); @@ -87,7 +87,7 @@ public class SpannedStringNoCopyTest { // Do not copy NoCopySpan if specified so. final SpannedString copied = new SpannedString( - new CustomSpanned(first), false /* copyNoCopySpan */); + new CustomSpanned(first), true /* ignoreNoCopySpan */); final Object[] spans = copied.getSpans(0, copied.length(), Object.class); assertNotNull(spans); assertEquals(2, spans.length);