Migrate from isNotSameAs to isNotSameInstanceAs.
The two behave identically, and isNotSameAs is being removed.
More information:
go/issameas-lsc
Tested:
TAP --sample for global presubmit queue
http://test/OCL:244737015:BASE:244782138:1555989873958:cde03378
PiperOrigin-RevId: 245262299
Change-Id: I6db5ad48f01311e4c876a7f9f434cf6349cf5835
diff --git a/src/test/java/com/google/android/libraries/feed/common/intern/HashPoolInternerTest.java b/src/test/java/com/google/android/libraries/feed/common/intern/HashPoolInternerTest.java
index 6c1d4c5..3b49a70 100644
--- a/src/test/java/com/google/android/libraries/feed/common/intern/HashPoolInternerTest.java
+++ b/src/test/java/com/google/android/libraries/feed/common/intern/HashPoolInternerTest.java
@@ -64,9 +64,9 @@
.setStylesheets(Stylesheets.newBuilder().addStylesheetIds("bar")))
.addStylesheets(Stylesheet.newBuilder().setStylesheetId("bay"))
.build());
- assertThat(first).isNotSameAs(second);
- assertThat(first).isNotSameAs(third);
- assertThat(second).isNotSameAs(third);
+ assertThat(first).isNotSameInstanceAs(second);
+ assertThat(first).isNotSameInstanceAs(third);
+ assertThat(second).isNotSameInstanceAs(third);
// Pool is empty so first is added/returned.
PietSharedStateWrapper internedFirst = interner.intern(first);
diff --git a/src/test/java/com/google/android/libraries/feed/common/intern/InternedMapTest.java b/src/test/java/com/google/android/libraries/feed/common/intern/InternedMapTest.java
index 6d2e662..8a9d075 100644
--- a/src/test/java/com/google/android/libraries/feed/common/intern/InternedMapTest.java
+++ b/src/test/java/com/google/android/libraries/feed/common/intern/InternedMapTest.java
@@ -54,7 +54,7 @@
.setParentContentId("baz")
.setOperation(Operation.UPDATE_OR_APPEND)
.build();
- assertThat(first).isNotSameAs(second);
+ assertThat(first).isNotSameInstanceAs(second);
assertThat(first).isEqualTo(second);
assertThat(first).isNotEqualTo(third);
diff --git a/src/test/java/com/google/android/libraries/feed/common/intern/InternerWithStatsTest.java b/src/test/java/com/google/android/libraries/feed/common/intern/InternerWithStatsTest.java
index 4c2358d..4a048ca 100644
--- a/src/test/java/com/google/android/libraries/feed/common/intern/InternerWithStatsTest.java
+++ b/src/test/java/com/google/android/libraries/feed/common/intern/InternerWithStatsTest.java
@@ -53,7 +53,7 @@
.setParentContentId("baz")
.setOperation(Operation.UPDATE_OR_APPEND)
.build();
- assertThat(first).isNotSameAs(second);
+ assertThat(first).isNotSameInstanceAs(second);
assertThat(first).isEqualTo(second);
assertThat(first).isNotEqualTo(third);
diff --git a/src/test/java/com/google/android/libraries/feed/common/intern/WeakPoolInternerTest.java b/src/test/java/com/google/android/libraries/feed/common/intern/WeakPoolInternerTest.java
index f0ca419..6d8c49d 100644
--- a/src/test/java/com/google/android/libraries/feed/common/intern/WeakPoolInternerTest.java
+++ b/src/test/java/com/google/android/libraries/feed/common/intern/WeakPoolInternerTest.java
@@ -48,7 +48,7 @@
.setParentContentId("baz")
.setOperation(Operation.UPDATE_OR_APPEND)
.build();
- assertThat(first).isNotSameAs(second);
+ assertThat(first).isNotSameInstanceAs(second);
assertThat(first).isEqualTo(second);
assertThat(first).isNotEqualTo(third);
diff --git a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerTest.java b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerTest.java
index 6300169..8e9a503 100644
--- a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerTest.java
@@ -210,7 +210,7 @@
assertThat(sharedState1.getPietSharedStateItem())
.isEqualTo(sharedState2.getPietSharedStateItem());
assertThat(sharedState1.getPietSharedStateItem())
- .isNotSameAs(sharedState2.getPietSharedStateItem());
+ .isNotSameInstanceAs(sharedState2.getPietSharedStateItem());
StreamStructure operation =
StreamStructure.newBuilder()
@@ -773,7 +773,7 @@
PietSharedState.newBuilder()
.addTemplates(Template.newBuilder().setTemplateId("different"))))
.build();
- assertThat(first).isNotSameAs(second);
+ assertThat(first).isNotSameInstanceAs(second);
assertThat(first.getPietSharedStateItem()).isEqualTo(second.getPietSharedStateItem());
assertThat(first).isNotEqualTo(third);
assertThat(first.getPietSharedStateItem()).isNotEqualTo(third.getPietSharedStateItem());
@@ -788,7 +788,7 @@
assertThat(interner.size()).isEqualTo(1);
// The returned proto is equal to second, but its internal PietSharedStateItem is the same as
// the one in first (memoized).
- assertThat(internedSecond).isNotSameAs(second);
+ assertThat(internedSecond).isNotSameInstanceAs(second);
assertThat(internedSecond).isEqualTo(second);
assertThat(internedSecond.getPietSharedStateItem()).isSameAs(first.getPietSharedStateItem());
diff --git a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionCacheTest.java b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionCacheTest.java
index c96d5b2..623928b 100644
--- a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionCacheTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionCacheTest.java
@@ -194,7 +194,7 @@
Session unboundSession = allSessions.get(0);
assertThat(unboundSession.getSessionId()).isEqualTo(s1.getSessionId());
assertThat(unboundSession.getContentInSession()).isEqualTo(s1.getContentInSession());
- assertThat(unboundSession).isNotSameAs(s1);
+ assertThat(unboundSession).isNotSameInstanceAs(s1);
}
@Test
diff --git a/src/test/java/com/google/android/libraries/feed/piet/ChunkedTextElementAdapterTest.java b/src/test/java/com/google/android/libraries/feed/piet/ChunkedTextElementAdapterTest.java
index 6d17fdd..f89cb11 100644
--- a/src/test/java/com/google/android/libraries/feed/piet/ChunkedTextElementAdapterTest.java
+++ b/src/test/java/com/google/android/libraries/feed/piet/ChunkedTextElementAdapterTest.java
@@ -792,7 +792,7 @@
imageCallbackCaptor.getValue().accept(imageDrawable);
// Assert that we did NOT set the image on the span
- assertThat(containerDrawable.getDrawable(SINGLE_LAYER_ID)).isNotSameAs(imageDrawable);
+ assertThat(containerDrawable.getDrawable(SINGLE_LAYER_ID)).isNotSameInstanceAs(imageDrawable);
}
@Test
diff --git a/src/test/java/com/google/android/libraries/feed/piet/ParameterizedTextElementAdapterFactoryTest.java b/src/test/java/com/google/android/libraries/feed/piet/ParameterizedTextElementAdapterFactoryTest.java
index 999ac31..da2b996 100644
--- a/src/test/java/com/google/android/libraries/feed/piet/ParameterizedTextElementAdapterFactoryTest.java
+++ b/src/test/java/com/google/android/libraries/feed/piet/ParameterizedTextElementAdapterFactoryTest.java
@@ -135,7 +135,7 @@
// Verify we get a new item when we create another.
TextElementAdapter textElementAdapter3 = textElementFactory.get(textElement, frameContext);
assertThat(textElementAdapter3).isSameAs(adapter2);
- assertThat(textElementAdapter3).isNotSameAs(textElementAdapter);
+ assertThat(textElementAdapter3).isNotSameInstanceAs(textElementAdapter);
}
private TextElement getBaseTextElement(/*@Nullable*/ StyleProvider styleProvider) {
diff --git a/src/test/java/com/google/android/libraries/feed/piet/TemplateBinderTest.java b/src/test/java/com/google/android/libraries/feed/piet/TemplateBinderTest.java
index 1c07fd8..d08ca10 100644
--- a/src/test/java/com/google/android/libraries/feed/piet/TemplateBinderTest.java
+++ b/src/test/java/com/google/android/libraries/feed/piet/TemplateBinderTest.java
@@ -708,8 +708,8 @@
TemplateAdapterModel model2 =
new TemplateAdapterModel(
MODEL_TEMPLATE.toBuilder().build(), MODEL_BINDING_CONTEXT.toBuilder().build());
- assertThat(model1.getTemplate()).isNotSameAs(model2.getTemplate());
- assertThat(model1.getBindingContext()).isNotSameAs(model2.getBindingContext());
+ assertThat(model1.getTemplate()).isNotSameInstanceAs(model2.getTemplate());
+ assertThat(model1.getBindingContext()).isNotSameInstanceAs(model2.getBindingContext());
assertThat(model1).isEqualTo(model2);
assertThat(model1.hashCode()).isEqualTo(model2.hashCode());
}
diff --git a/src/test/java/com/google/android/libraries/feed/piet/ViewUtilsTest.java b/src/test/java/com/google/android/libraries/feed/piet/ViewUtilsTest.java
index da0e1e4..ab87cbc 100644
--- a/src/test/java/com/google/android/libraries/feed/piet/ViewUtilsTest.java
+++ b/src/test/java/com/google/android/libraries/feed/piet/ViewUtilsTest.java
@@ -494,11 +494,11 @@
Drawable result1 = ViewUtils.applyOverlayColor(original, overlayColor1);
Drawable result2 = ViewUtils.applyOverlayColor(original, overlayColor2);
- assertThat(result1).isNotSameAs(original);
+ assertThat(result1).isNotSameInstanceAs(original);
assertThat(result1.getColorFilter())
.isEqualTo(new PorterDuffColorFilter(overlayColor1, Mode.SRC_IN));
- assertThat(result2).isNotSameAs(original);
+ assertThat(result2).isNotSameInstanceAs(original);
assertThat(result2.getColorFilter())
.isEqualTo(new PorterDuffColorFilter(overlayColor2, Mode.SRC_IN));
}
diff --git a/src/test/java/com/google/android/libraries/feed/piet/ui/RoundedCornerMaskCacheTest.java b/src/test/java/com/google/android/libraries/feed/piet/ui/RoundedCornerMaskCacheTest.java
index d0e22e1..a7dd750 100644
--- a/src/test/java/com/google/android/libraries/feed/piet/ui/RoundedCornerMaskCacheTest.java
+++ b/src/test/java/com/google/android/libraries/feed/piet/ui/RoundedCornerMaskCacheTest.java
@@ -79,7 +79,7 @@
RoundedCornerBitmaps masks2 = cache.getMasks(16);
- assertThat(masks1).isNotSameAs(masks2);
+ assertThat(masks1).isNotSameInstanceAs(masks2);
}
@Test