From 2e634640f3ed1b101f3748849b415fa14d57991c Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Wed, 28 Dec 2016 17:34:10 -0800 Subject: [PATCH] Add robolectric test Configure the build target and migrate LinkSpanTest to Robolectric. Move existing instrumentation tests into test/instrumentation Bug: 32975598 Test: ./gradlew test Change-Id: I9bb39142c616a2c44fe38f48d92e89ab8ebda7ba --- library/self.gradle | 17 ++++++++++++++--- .../{ => instrumentation}/AndroidManifest.xml | 0 .../res/layout/test_glif_layout.xml | 0 .../layout/test_glif_layout_primary_color.xml | 0 .../res/layout/test_glif_list_layout.xml | 0 .../res/layout/test_layout.xml | 0 .../res/layout/test_list_layout.xml | 0 .../res/layout/test_template.xml | 0 .../res/layout/test_template_layout.xml | 0 .../res/values/config.xml | 0 .../res/xml/test_items.xml | 0 .../setupwizardlib/TemplateLayoutTest.java | 0 .../test/BottomScrollViewTest.java | 18 +++++++++--------- .../test/ButtonBarItemTest.java | 0 .../setupwizardlib/test/ButtonItemTest.java | 0 .../DrawableLayoutDirectionHelperTest.java | 2 +- .../test/GlifDimensionTest.java | 0 .../setupwizardlib/test/GlifLayoutTest.java | 0 .../test/GlifListLayoutTest.java | 0 .../test/GlifPatternDrawableTest.java | 0 .../setupwizardlib/test/IllustrationTest.java | 0 .../setupwizardlib/test/ItemAdapterTest.java | 0 .../setupwizardlib/test/ItemGroupTest.java | 0 .../setupwizardlib/test/ItemInflaterTest.java | 0 .../android/setupwizardlib/test/ItemTest.java | 0 .../test/ListViewRequireScrollHelperTest.java | 4 ++-- .../setupwizardlib/test/PartnerTest.java | 4 ++-- .../test/RequireScrollHelperTest.java | 4 ++-- .../test/SetupWizardLayoutTest.java | 0 .../test/SetupWizardListLayoutTest.java | 0 .../setupwizardlib/test/SpanHelperTest.java | 0 .../test/StatusBarBackgroundLayoutTest.java | 0 .../test/SystemBarHelperTest.java | 2 +- .../test/WizardManagerHelperTest.java | 0 .../setupwizardlib/test/util/MockWindow.java | 16 ++++++++++++++++ .../setupwizardlib/span}/LinkSpanTest.java | 19 +++++++------------ 36 files changed, 54 insertions(+), 32 deletions(-) rename library/test/{ => instrumentation}/AndroidManifest.xml (100%) rename library/test/{ => instrumentation}/res/layout/test_glif_layout.xml (100%) rename library/test/{ => instrumentation}/res/layout/test_glif_layout_primary_color.xml (100%) rename library/test/{ => instrumentation}/res/layout/test_glif_list_layout.xml (100%) rename library/test/{ => instrumentation}/res/layout/test_layout.xml (100%) rename library/test/{ => instrumentation}/res/layout/test_list_layout.xml (100%) rename library/test/{ => instrumentation}/res/layout/test_template.xml (100%) rename library/test/{ => instrumentation}/res/layout/test_template_layout.xml (100%) rename library/test/{ => instrumentation}/res/values/config.xml (100%) rename library/test/{ => instrumentation}/res/xml/test_items.xml (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/TemplateLayoutTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/BottomScrollViewTest.java (88%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/ButtonBarItemTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/ButtonItemTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/DrawableLayoutDirectionHelperTest.java (99%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/GlifDimensionTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/GlifLayoutTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/GlifListLayoutTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/GlifPatternDrawableTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/IllustrationTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/ItemAdapterTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/ItemGroupTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/ItemInflaterTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/ItemTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/ListViewRequireScrollHelperTest.java (98%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/PartnerTest.java (98%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/RequireScrollHelperTest.java (97%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/SetupWizardLayoutTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/SetupWizardListLayoutTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/SpanHelperTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/StatusBarBackgroundLayoutTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/SystemBarHelperTest.java (99%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/WizardManagerHelperTest.java (100%) rename library/test/{ => instrumentation}/src/com/android/setupwizardlib/test/util/MockWindow.java (92%) rename library/test/{src/com/android/setupwizardlib/test => robotest/src/com/android/setupwizardlib/span}/LinkSpanTest.java (76%) diff --git a/library/self.gradle b/library/self.gradle index 2c1584c..2f16a98 100644 --- a/library/self.gradle +++ b/library/self.gradle @@ -9,9 +9,9 @@ apply from: 'standalone-rules.gradle' // Add targets for tests android.sourceSets { androidTest { - manifest.srcFile 'test/AndroidManifest.xml' - java.srcDirs = ['test/src'] - res.srcDirs = ['test/res'] + manifest.srcFile 'test/instrumentation/AndroidManifest.xml' + java.srcDirs = ['test/instrumentation/src'] + res.srcDirs = ['test/instrumentation/res'] dependencies { androidTestCompile 'com.android.support.test:rules:0.5' @@ -36,6 +36,17 @@ android.sourceSets { java.srcDirs = ['full-support/test/src', 'eclair-mr1/test/src'] res.srcDirs = ['full-support/test/res'] } + + test { + java.srcDirs = ['test/robotest/src'] + + dependencies { + testCompile 'org.robolectric:robolectric:3.+' + testCompile 'org.robolectric:shadows-core:3.+' + testCompile 'junit:junit:4.+' + testCompile 'org.mockito:mockito-core:1.9.5' + } + } } android.defaultConfig.testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/library/test/AndroidManifest.xml b/library/test/instrumentation/AndroidManifest.xml similarity index 100% rename from library/test/AndroidManifest.xml rename to library/test/instrumentation/AndroidManifest.xml diff --git a/library/test/res/layout/test_glif_layout.xml b/library/test/instrumentation/res/layout/test_glif_layout.xml similarity index 100% rename from library/test/res/layout/test_glif_layout.xml rename to library/test/instrumentation/res/layout/test_glif_layout.xml diff --git a/library/test/res/layout/test_glif_layout_primary_color.xml b/library/test/instrumentation/res/layout/test_glif_layout_primary_color.xml similarity index 100% rename from library/test/res/layout/test_glif_layout_primary_color.xml rename to library/test/instrumentation/res/layout/test_glif_layout_primary_color.xml diff --git a/library/test/res/layout/test_glif_list_layout.xml b/library/test/instrumentation/res/layout/test_glif_list_layout.xml similarity index 100% rename from library/test/res/layout/test_glif_list_layout.xml rename to library/test/instrumentation/res/layout/test_glif_list_layout.xml diff --git a/library/test/res/layout/test_layout.xml b/library/test/instrumentation/res/layout/test_layout.xml similarity index 100% rename from library/test/res/layout/test_layout.xml rename to library/test/instrumentation/res/layout/test_layout.xml diff --git a/library/test/res/layout/test_list_layout.xml b/library/test/instrumentation/res/layout/test_list_layout.xml similarity index 100% rename from library/test/res/layout/test_list_layout.xml rename to library/test/instrumentation/res/layout/test_list_layout.xml diff --git a/library/test/res/layout/test_template.xml b/library/test/instrumentation/res/layout/test_template.xml similarity index 100% rename from library/test/res/layout/test_template.xml rename to library/test/instrumentation/res/layout/test_template.xml diff --git a/library/test/res/layout/test_template_layout.xml b/library/test/instrumentation/res/layout/test_template_layout.xml similarity index 100% rename from library/test/res/layout/test_template_layout.xml rename to library/test/instrumentation/res/layout/test_template_layout.xml diff --git a/library/test/res/values/config.xml b/library/test/instrumentation/res/values/config.xml similarity index 100% rename from library/test/res/values/config.xml rename to library/test/instrumentation/res/values/config.xml diff --git a/library/test/res/xml/test_items.xml b/library/test/instrumentation/res/xml/test_items.xml similarity index 100% rename from library/test/res/xml/test_items.xml rename to library/test/instrumentation/res/xml/test_items.xml diff --git a/library/test/src/com/android/setupwizardlib/TemplateLayoutTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/TemplateLayoutTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/TemplateLayoutTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/TemplateLayoutTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/BottomScrollViewTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/BottomScrollViewTest.java similarity index 88% rename from library/test/src/com/android/setupwizardlib/test/BottomScrollViewTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/BottomScrollViewTest.java index 7c0dc36..1a8eb21 100644 --- a/library/test/src/com/android/setupwizardlib/test/BottomScrollViewTest.java +++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/BottomScrollViewTest.java @@ -46,23 +46,23 @@ public class BottomScrollViewTest { @Test public void testNoNeedScroll() { createScrollView(20); - assertTrue("Scroll should not be required", mListener.scrolledToBottom); + assertTrue("Scroll should not be required", mListener.mScrolledToBottom); } @Test public void testNeedScroll() { createScrollView(110); - assertFalse("Scroll should be required", mListener.scrolledToBottom); + assertFalse("Scroll should be required", mListener.mScrolledToBottom); } @Test public void testScrollToBottom() { final BottomScrollView bottomScrollView = createScrollView(110); - assertFalse("Scroll should be required", mListener.scrolledToBottom); + assertFalse("Scroll should be required", mListener.mScrolledToBottom); bottomScrollView.scrollTo(0, 10); - assertTrue("Should already be scrolled to bottom", mListener.scrolledToBottom); + assertTrue("Should already be scrolled to bottom", mListener.mScrolledToBottom); } @Test @@ -90,7 +90,7 @@ public class BottomScrollViewTest { private static final int WIDTH = 10; private int mHeight; - public TestChildView(Context context, int height) { + TestChildView(Context context, int height) { super(context); mHeight = height; } @@ -107,7 +107,7 @@ public class BottomScrollViewTest { private static class TestBottomScrollView extends BottomScrollView { - public TestBottomScrollView(Context context) { + TestBottomScrollView(Context context) { super(context); } @@ -121,16 +121,16 @@ public class BottomScrollViewTest { private static class TestBottomScrollListener implements BottomScrollView.BottomScrollListener { - boolean scrolledToBottom = true; + boolean mScrolledToBottom = true; @Override public void onScrolledToBottom() { - scrolledToBottom = true; + mScrolledToBottom = true; } @Override public void onRequiresScroll() { - scrolledToBottom = false; + mScrolledToBottom = false; } } } diff --git a/library/test/src/com/android/setupwizardlib/test/ButtonBarItemTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/ButtonBarItemTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/ButtonBarItemTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/ButtonBarItemTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/ButtonItemTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/ButtonItemTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/ButtonItemTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/ButtonItemTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/DrawableLayoutDirectionHelperTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/DrawableLayoutDirectionHelperTest.java similarity index 99% rename from library/test/src/com/android/setupwizardlib/test/DrawableLayoutDirectionHelperTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/DrawableLayoutDirectionHelperTest.java index 1aba00c..95245b0 100644 --- a/library/test/src/com/android/setupwizardlib/test/DrawableLayoutDirectionHelperTest.java +++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/DrawableLayoutDirectionHelperTest.java @@ -131,7 +131,7 @@ public class DrawableLayoutDirectionHelperTest { private static class ForceRtlView extends View { - public ForceRtlView(Context context) { + ForceRtlView(Context context) { super(context); } diff --git a/library/test/src/com/android/setupwizardlib/test/GlifDimensionTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/GlifDimensionTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/GlifDimensionTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/GlifDimensionTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/GlifLayoutTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/GlifLayoutTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/GlifLayoutTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/GlifLayoutTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/GlifListLayoutTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/GlifListLayoutTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/GlifListLayoutTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/GlifListLayoutTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/GlifPatternDrawableTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/GlifPatternDrawableTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/GlifPatternDrawableTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/GlifPatternDrawableTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/IllustrationTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/IllustrationTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/IllustrationTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/IllustrationTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/ItemAdapterTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/ItemAdapterTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/ItemAdapterTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/ItemAdapterTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/ItemGroupTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/ItemGroupTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/ItemGroupTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/ItemGroupTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/ItemInflaterTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/ItemInflaterTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/ItemInflaterTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/ItemInflaterTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/ItemTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/ItemTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/ItemTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/ItemTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/ListViewRequireScrollHelperTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/ListViewRequireScrollHelperTest.java similarity index 98% rename from library/test/src/com/android/setupwizardlib/test/ListViewRequireScrollHelperTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/ListViewRequireScrollHelperTest.java index 0c8e848..58ceb6b 100644 --- a/library/test/src/com/android/setupwizardlib/test/ListViewRequireScrollHelperTest.java +++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/ListViewRequireScrollHelperTest.java @@ -104,7 +104,7 @@ public class ListViewRequireScrollHelperTest { public int scrollDistance = 0; public OnScrollListener listener; - public TestListView(Context context) { + TestListView(Context context) { super(context); setAdapter(new BaseAdapter() { @Override @@ -149,7 +149,7 @@ public class ListViewRequireScrollHelperTest { private static class TestNavigationBar extends NavigationBar { - public TestNavigationBar(Context context) { + TestNavigationBar(Context context) { super(context); } diff --git a/library/test/src/com/android/setupwizardlib/test/PartnerTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/PartnerTest.java similarity index 98% rename from library/test/src/com/android/setupwizardlib/test/PartnerTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/PartnerTest.java index 1398caa..414b62b 100644 --- a/library/test/src/com/android/setupwizardlib/test/PartnerTest.java +++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/PartnerTest.java @@ -181,7 +181,7 @@ public class PartnerTest { private Context mTestContext; private Resources mTestResources; - public TestPackageManager(Context testContext) { + TestPackageManager(Context testContext) { mTestContext = testContext; mTestResources = new TestResources(); } @@ -209,7 +209,7 @@ public class PartnerTest { public List partnerList; - public TestContext(Context context) { + TestContext(Context context) { super(context); } diff --git a/library/test/src/com/android/setupwizardlib/test/RequireScrollHelperTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/RequireScrollHelperTest.java similarity index 97% rename from library/test/src/com/android/setupwizardlib/test/RequireScrollHelperTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/RequireScrollHelperTest.java index b607752..f5e4bbd 100644 --- a/library/test/src/com/android/setupwizardlib/test/RequireScrollHelperTest.java +++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/RequireScrollHelperTest.java @@ -90,7 +90,7 @@ public class RequireScrollHelperTest { public BottomScrollListener listener; public int page = 0; - public TestBottomScrollView(Context context) { + TestBottomScrollView(Context context) { super(context); } @@ -112,7 +112,7 @@ public class RequireScrollHelperTest { private static class TestNavigationBar extends NavigationBar { - public TestNavigationBar(Context context) { + TestNavigationBar(Context context) { super(context); } diff --git a/library/test/src/com/android/setupwizardlib/test/SetupWizardLayoutTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardLayoutTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/SetupWizardLayoutTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardLayoutTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/SetupWizardListLayoutTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardListLayoutTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/SetupWizardListLayoutTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardListLayoutTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/SpanHelperTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/SpanHelperTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/SpanHelperTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/SpanHelperTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/StatusBarBackgroundLayoutTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/StatusBarBackgroundLayoutTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/StatusBarBackgroundLayoutTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/StatusBarBackgroundLayoutTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/SystemBarHelperTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java similarity index 99% rename from library/test/src/com/android/setupwizardlib/test/SystemBarHelperTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java index b761ff7..0ebf7cb 100644 --- a/library/test/src/com/android/setupwizardlib/test/SystemBarHelperTest.java +++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java @@ -237,7 +237,7 @@ public class SystemBarHelperTest { private int mNavigationBarColor = -1; private int mStatusBarColor = -1; - public TestWindow(Context context, View decorView) { + TestWindow(Context context, View decorView) { super(context); mDecorView = decorView; } diff --git a/library/test/src/com/android/setupwizardlib/test/WizardManagerHelperTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/WizardManagerHelperTest.java similarity index 100% rename from library/test/src/com/android/setupwizardlib/test/WizardManagerHelperTest.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/WizardManagerHelperTest.java diff --git a/library/test/src/com/android/setupwizardlib/test/util/MockWindow.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/util/MockWindow.java similarity index 92% rename from library/test/src/com/android/setupwizardlib/test/util/MockWindow.java rename to library/test/instrumentation/src/com/android/setupwizardlib/test/util/MockWindow.java index c9c228c..9358aad 100644 --- a/library/test/src/com/android/setupwizardlib/test/util/MockWindow.java +++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/util/MockWindow.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.android.setupwizardlib.test.util; import android.content.Context; diff --git a/library/test/src/com/android/setupwizardlib/test/LinkSpanTest.java b/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java similarity index 76% rename from library/test/src/com/android/setupwizardlib/test/LinkSpanTest.java rename to library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java index 266c7c8..1e9f195 100644 --- a/library/test/src/com/android/setupwizardlib/test/LinkSpanTest.java +++ b/library/test/robotest/src/com/android/setupwizardlib/span/LinkSpanTest.java @@ -14,29 +14,25 @@ * limitations under the License. */ -package com.android.setupwizardlib.test; +package com.android.setupwizardlib.span; import static org.junit.Assert.assertSame; +import static org.robolectric.RuntimeEnvironment.application; import android.content.Context; import android.content.ContextWrapper; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.widget.TextView; -import com.android.setupwizardlib.span.LinkSpan; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(AndroidJUnit4.class) -@SmallTest +@RunWith(RobolectricTestRunner.class) public class LinkSpanTest { @Test public void testOnClick() { - final TestContext context = new TestContext(InstrumentationRegistry.getContext()); + final TestContext context = new TestContext(application); final TextView textView = new TextView(context); final LinkSpan linkSpan = new LinkSpan("test_id"); @@ -47,8 +43,7 @@ public class LinkSpanTest { @Test public void testNonImplementingContext() { - final Context context = InstrumentationRegistry.getContext(); - final TextView textView = new TextView(context); + final TextView textView = new TextView(application); final LinkSpan linkSpan = new LinkSpan("test_id"); linkSpan.onClick(textView); @@ -61,7 +56,7 @@ public class LinkSpanTest { public LinkSpan clickedSpan = null; - public TestContext(Context base) { + TestContext(Context base) { super(base); }