diff options
author | Maurice Lam <yukl@google.com> | 2017-02-21 20:12:51 -0800 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2017-02-21 20:12:51 -0800 |
commit | 97860ddbfea1075cfd281102b93a3982c2b66537 (patch) | |
tree | d6f048b516576e7ba324d4ae8049d438eaf3a7d1 /library/test/instrumentation/src/com/android/setupwizardlib/template | |
parent | e4dd10a2057f87946f3c4c0a9ad104a90593c48b (diff) | |
download | setupwizard-97860ddbfea1075cfd281102b93a3982c2b66537.tar.gz |
Fix ListMixinTest and RecyclerMixinTest for KitKat
A dexmaker issue with KitKat makes it so that accessing package
private methods on a spy will throw IllegalAccessError. Use mock with
delegatesTo instead to workaround the issue.
Test: ./gradlew connectedAndroidTest
Change-Id: I18ad132593a646e6955024caaef0238486b69703
Diffstat (limited to 'library/test/instrumentation/src/com/android/setupwizardlib/template')
-rw-r--r-- | library/test/instrumentation/src/com/android/setupwizardlib/template/ListMixinTest.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/template/ListMixinTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/template/ListMixinTest.java index 5151c32..93201ca 100644 --- a/library/test/instrumentation/src/com/android/setupwizardlib/template/ListMixinTest.java +++ b/library/test/instrumentation/src/com/android/setupwizardlib/template/ListMixinTest.java @@ -19,8 +19,10 @@ package com.android.setupwizardlib.template; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; +import static org.mockito.AdditionalAnswers.delegatesTo; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -66,7 +68,7 @@ public class ListMixinTest { mTemplateLayout = spy(new TemplateLayout(mContext, R.layout.test_template, R.id.suw_layout_content)); - mListView = spy(new ListView(mContext)); + mListView = mock(ListView.class, delegatesTo(new ListView(mContext))); doReturn(1).when(mAdapter).getViewTypeCount(); doReturn(mListView).when(mTemplateLayout) |