-Espresso Web Basic Sample

-Restructured samples to a more sane structure based on test types
-Bug fixes

Change-Id: If3b8acedf0dbe4fde4187cb21509c71aba727c16

Author: slinzner

espresso/BasicSampleBundled/.classpath

@@ -1,11 +1,12 @@
-include ':espresso:BasicSample:app'
-include ':espresso:CustomMatcherSample:app'
-include ':espresso:MultiWindowSample:app'
-include ':espresso:DataAdapterSample:app'
-include ':espresso:IntentsBasicSample:app'
-include ':uiautomator:BasicSample:app'
-include ':testrunner:AndroidJunitRunnerSample:app'
-include ':unittesting:BasicSample:app'
-include ':unittesting:BasicUnitAndroidTest:app'
-include ':integrationtesting:ServiceTestRuleSample:app'
-include ':espresso:IntentsAdvancedSample:app'
+include ':ui:espresso:BasicSample:app'
+include ':ui:espresso:CustomMatcherSample:app'
+include ':ui:espresso:MultiWindowSample:app'
+include ':ui:espresso:DataAdapterSample:app'
+include ':ui:espresso:IntentsBasicSample:app'
+include ':uiespresso:IntentsAdvancedSample:app'
+include ':ui:espresso:WebBasicSample:app'
+include ':ui:uiautomator:BasicSample:app'
+include ':runner:AndroidJunitRunnerSample:app'
+include ':unit:BasicSample:app'
+include ':unit:BasicUnitAndroidTest:app'
+include ':integration:ServiceTestRuleSample:app'

espresso/BasicSampleBundled/.project

@@ -0,0 +1,33 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion '22.0.1'
+    defaultConfig {
+        applicationId "com.example.android.testing.espresso.web.BasicSample"
+        minSdkVersion 10
+        targetSdkVersion 22
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    packagingOptions {
+        exclude 'LICENSE.txt'
+    }
+    lintOptions {
+        abortOnError false
+    }
+    productFlavors {
+    }
+}
+
+dependencies {
+    // App dependencies
+    compile 'com.android.support:support-annotations:22.2.0'
+    compile 'com.google.guava:guava:18.0'
+    // Testing-only dependencies
+    androidTestCompile 'com.android.support.test:runner:0.3'
+    androidTestCompile 'com.android.support.test:rules:0.3'
+    androidTestCompile 'com.android.support.test.espresso:espresso-web:2.2'
+}

espresso/BasicSampleBundled/project.properties

@@ -0,0 +1,135 @@
+/*
+ * Copyright 2015, 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.example.android.testing.espresso.web.BasicSample;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import android.content.Intent;
+import android.support.test.espresso.web.sugar.Web;
+import android.support.test.espresso.web.webdriver.DriverAtoms;
+import android.support.test.espresso.web.webdriver.Locator;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.LargeTest;
+import android.webkit.WebView;
+
+import static android.support.test.espresso.web.assertion.WebViewAssertions.webMatches;
+import static android.support.test.espresso.web.sugar.Web.onWebView;
+import static android.support.test.espresso.web.webdriver.DriverAtoms.clearElement;
+import static android.support.test.espresso.web.webdriver.DriverAtoms.findElement;
+import static android.support.test.espresso.web.webdriver.DriverAtoms.getText;
+import static android.support.test.espresso.web.webdriver.DriverAtoms.webClick;
+import static org.hamcrest.Matchers.containsString;
+
+/**
+ * Basic sample that shows the usage of Espresso web showcasing {@link Web#onWebView()} API.
+ * <p>
+ * The sample has a simple layout which contains a single {@link WebView}. The HTML page displays
+ * a form with an input tag and buttons to submit the form.
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class WebViewActivityTest {
+
+    private static final String MACCHIATO = "Macchiato";
+    private static final String DOPPIO = "Doppio";
+
+    /**
+     * A JUnit {@link Rule @Rule} to launch your activity under test. This is a replacement
+     * for {@link ActivityInstrumentationTestCase2}.
+     * <p>
+     * Rules are interceptors which are executed for each test method and will run before
+     * any of your setup code in the {@link Before @Before} method.
+     * <p>
+     * {@link ActivityTestRule} will create and launch of the activity for you and also expose
+     * the activity under test. To get a reference to the activity you can use
+     * the {@link ActivityTestRule#getActivity()} method.
+     */
+    @Rule
+    public ActivityTestRule<WebViewActivity> mActivityRule = new ActivityTestRule<WebViewActivity>(
+            WebViewActivity.class, false, false) {
+        @Override
+        protected void afterActivityLaunched() {
+            // Technically we do not need to do this - WebViewActivity has javascript turned on.
+            // Other WebViews in your app may have javascript turned off, however since the only way
+            // to automate WebViews is through javascript, it must be enabled.
+            onWebView().forceJavascriptEnabled();
+        }
+    };
+
+    @Test
+    public void typeTextInInput_clickButton_SubmitsForm() {
+        // Lazily launch the Activity with a custom start Intent per test
+        mActivityRule.launchActivity(withWebFormIntent());
+
+        // Selects the WebView in your layout. If you have multiple WebViews you can also use a
+        // matcher to select a given WebView, onWebView(withId(R.id.web_view)).
+        onWebView()
+                // Find the input element by ID
+                .withElement(findElement(Locator.ID, "text_input"))
+                // Clear previous input
+                .perform(clearElement())
+                // Enter text into the input element
+                .perform(DriverAtoms.webKeys(MACCHIATO))
+                // Find the submit button
+                .withElement(findElement(Locator.ID, "submitBtn"))
+                // Simulate a click via javascript
+                .perform(webClick())
+                // Find the response element by ID
+                .withElement(findElement(Locator.ID, "response"))
+                // Verify that the response page contains the entered text
+                .check(webMatches(getText(), containsString(MACCHIATO)));
+    }
+
+    @Test
+    public void typeTextInInput_clickButton_ChangesText() {
+        // Lazily launch the Activity with a custom start Intent per test
+        mActivityRule.launchActivity(withWebFormIntent());
+
+        // Selects the WebView in your layout. If you have multiple WebViews you can also use a
+        // matcher to select a given WebView, onWebView(withId(R.id.web_view)).
+        onWebView()
+                // Find the input element by ID
+                .withElement(findElement(Locator.ID, "text_input"))
+                // Clear previous input
+                .perform(clearElement())
+                // Enter text into the input element
+                .perform(DriverAtoms.webKeys(DOPPIO))
+                // Find the change text button.
+                .withElement(findElement(Locator.ID, "changeTextBtn"))
+                // Click on it.
+                .perform(webClick())
+                // Find the message element by ID
+                .withElement(findElement(Locator.ID, "message"))
+                // Verify that the text is displayed
+                .check(webMatches(getText(), containsString(DOPPIO)));
+    }
+
+    /**
+     * @return start {@link Intent} for the simple web form URL.
+     */
+    private static Intent withWebFormIntent() {
+        Intent basicFormIntent = new Intent();
+        basicFormIntent.putExtra(WebViewActivity.KEY_URL_TO_LOAD, WebViewActivity.WEB_FORM_URL);
+        return basicFormIntent;
+    }
+
+}

espresso/BasicSample/.gitignore renamed to integration/ServiceTestRuleSample/.gitignore

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+~ Copyright (C) 2015 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.android.testing.espresso.web.BasicSample" >
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="com.example.android.testing.espresso.web.BasicSample.WebViewActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

integrationtesting/ServiceTestRuleSample/README.md renamed to integration/ServiceTestRuleSample/README.md

@@ -0,0 +1,77 @@
+<!--
+  ~ Copyright (C) 2015 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.
+  -->
+<!doctype html>
+<html>
+<head>
+    <title>Hello Espresso Web</title>
+
+    <meta charset="utf-8"/>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <style type="text/css">
+        body {
+        background-color: #f0f0f2;
+        margin: 0;
+        padding: 0;
+        font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+        }
+        div {
+        width: 600px;
+        margin: 5em auto;
+        padding: 50px;
+        background-color: #fff;
+        border-radius: 1em;
+        }
+        #message {
+        margin: 0 auto 12px auto;
+        }
+        a:link, a:visited {
+        color: #38488f;
+        text-decoration: none;
+        }
+        @media (max-width: 700px) {
+        body {
+        background-color: #fff;
+        }
+        div {
+        width: auto;
+        margin: 0 auto;
+        border-radius: 0;
+        padding: 1em;
+        }
+        }
+    </style>
+</head>
+<body>
+<div>
+    <h1>Hello Espresso Web!</h1>
+
+    <form action="web_form_response.html" method="GET">
+        <p id="message">Need some Espresso</p>
+        <input type="text" name="text_input" id="text_input" placeholder="type something"/><br>
+        <input type="button" value="Change Text" onclick="changeText()" id="changeTextBtn"/><br>
+        <input type="submit" value="Change Text And Submit" id="submitBtn"/><br>
+    </form>
+</div>
+<script>
+    function changeText() {
+        var typedText = document.getElementById('text_input').value;
+        document.getElementById('message').innerHTML=typedText;
+    }
+</script>
+</body>
+</html>
+