From a2bead972db28d0267ee23851f41f3d286bd7dc2 Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Thu, 6 Apr 2017 13:46:38 +0300
Subject: [PATCH 01/18] refactoring

---
 .idea/codeStyleSettings.xml            | 33 ++++++++++++++------------
 app/build.gradle                       | 12 ++++------
 app/src/main/res/values-v19/themes.xml |  7 ------
 deps.gradle                            | 10 ++++----
 4 files changed, 27 insertions(+), 35 deletions(-)
 delete mode 100644 app/src/main/res/values-v19/themes.xml

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 3fae6ef..a9d0c52 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -33,22 +33,25 @@
         <option name="RIGHT_MARGIN" value="100" />
         <AndroidXmlCodeStyleSettings>
           <option name="USE_CUSTOM_SETTINGS" value="true" />
-            <option name="LAYOUT_SETTINGS">
-                <value>
-                    <option name="INSERT_LINE_BREAK_AFTER_LAST_ATTRIBUTE" value="true" />
-                </value>
-            </option>
-            <option name="MANIFEST_SETTINGS">
-                <value>
-                    <option name="INSERT_LINE_BREAK_AFTER_LAST_ATTRIBUTE" value="true" />
-                </value>
-            </option>
-            <option name="OTHER_SETTINGS">
-                <value>
-                    <option name="INSERT_LINE_BREAK_AFTER_LAST_ATTRIBUTE" value="true" />
-                </value>
-            </option>
+          <option name="LAYOUT_SETTINGS">
+            <value>
+              <option name="INSERT_LINE_BREAK_AFTER_LAST_ATTRIBUTE" value="true" />
+            </value>
+          </option>
+          <option name="MANIFEST_SETTINGS">
+            <value>
+              <option name="INSERT_LINE_BREAK_AFTER_LAST_ATTRIBUTE" value="true" />
+            </value>
+          </option>
+          <option name="OTHER_SETTINGS">
+            <value>
+              <option name="INSERT_LINE_BREAK_AFTER_LAST_ATTRIBUTE" value="true" />
+            </value>
+          </option>
         </AndroidXmlCodeStyleSettings>
+        <MarkdownNavigatorCodeStyleSettings>
+          <option name="RIGHT_MARGIN" value="72" />
+        </MarkdownNavigatorCodeStyleSettings>
         <Objective-C-extensions>
           <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
           <option name="RELEASE_STYLE" value="IVAR" />
diff --git a/app/build.gradle b/app/build.gradle
index 177d613..5280717 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,6 @@ android {
 
     dexOptions {
         preDexLibraries = !isCI
-        incremental = !isCI
     }
 
     packagingOptions {
@@ -76,6 +75,10 @@ android {
         lintConfig file("$projectDir/lint.xml")
         warningsAsErrors true
     }
+
+    configurations.all {
+//        resolutionStrategy.force "com.android.support:support-annotations:$versions.support"
+    }
 }
 
 repositories {
@@ -88,18 +91,13 @@ dependencies {
 //    compile retrofitLibs
 //    compile okHttpLibs
 
+    compile 'com.google.code.gson:gson:2.4'
     compile 'com.jakewharton:butterknife:7.0.0' // view injection
     compile 'com.github.bumptech.glide:glide:3.7.0'
 
     testCompile unitTestLibs
     androidTestCompile androidTestsLibs
 
-    compile 'com.google.code.gson:gson:2.4'
-}
-
-configurations {
-    testCompile.exclude module: 'commons-logging'
-    testCompile.exclude module: 'httpclient'
 }
 
 apply from: "quality.gradle"
\ No newline at end of file
diff --git a/app/src/main/res/values-v19/themes.xml b/app/src/main/res/values-v19/themes.xml
deleted file mode 100644
index c007e13..0000000
--- a/app/src/main/res/values-v19/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="AppTheme" parent="BaseAppTheme">
-        <item name="android:windowTranslucentStatus">true</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/deps.gradle b/deps.gradle
index f238b41..eeb22fa 100644
--- a/deps.gradle
+++ b/deps.gradle
@@ -9,10 +9,9 @@ ext {
             TARGET_SDK_VERSION : 25
     ]
     supportDeps = [
-            appcompatV7      : "com.android.support:appcompat-v7:$versions.support",
-            recyclerView     : "com.android.support:recyclerview-v7:$versions.support",
-            supportAnnotation: "com.android.support:support-annotations:$versions.support",
-//          design           : "com.android.support:design:$versions.support",
+            appcompatV7 : "com.android.support:appcompat-v7:$versions.support",
+            recyclerView: "com.android.support:recyclerview-v7:$versions.support",
+            design      : "com.android.support:design:$versions.support"
 //          gridLayout       : "com.android.support:gridlayout-v7:$versions.support"
 //          cardView         : "com.android.support:cardview-v7:$versions.support"
 //          palette          : "com.android.support:palette-v7:$versions.support"
@@ -33,7 +32,6 @@ ext {
     unitTests = [
             supportAnnotation: "com.android.support:support-annotations:$versions.support",
             junit            : 'junit:junit:4.12',
-            robolectric      : 'org.robolectric:robolectric:3.0',
             assertj          : 'com.squareup.assertj:assertj-android:1.0.0'
     ]
     androidTests = [
@@ -50,4 +48,4 @@ ext {
     rxJavaLibs = rxJava.values()
     unitTestLibs = unitTests.values()
     androidTestsLibs = androidTests.values() + supportLibs
-}
+}
\ No newline at end of file

From 839a23453580db159831184084e9392a948fa977 Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Thu, 6 Apr 2017 13:47:18 +0300
Subject: [PATCH 02/18] add spoon dependency

---
 app/build.gradle | 1 +
 build.gradle     | 1 +
 deps.gradle      | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5280717..ab85221 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'me.tatarka.retrolambda'
+apply plugin: 'spoon'
 apply from: 'checkstyle/checkstyle.gradle'
 
 apply from: '../deps.gradle'
diff --git a/build.gradle b/build.gradle
index 14c234d..684caef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,6 +6,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'me.tatarka:gradle-retrolambda:3.2.5' // use Java 8 lambdas on android
+        classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.2'
     }
 }
 
diff --git a/deps.gradle b/deps.gradle
index eeb22fa..a1d8f62 100644
--- a/deps.gradle
+++ b/deps.gradle
@@ -39,7 +39,8 @@ ext {
             espressoContrib: "com.android.support.test.espresso:espresso-contrib:$versions.espressoVersion",
             espressoIntents: "com.android.support.test.espresso:espresso-intents:$versions.espressoVersion",
             testRunner     : "com.android.support.test:runner:0.5",
-            testRules      : "com.android.support.test:rules:0.5"
+            testRules      : "com.android.support.test:rules:0.5",
+            spoon          : 'com.squareup.spoon:spoon-client:1.6.4'
     ]
 
     supportLibs = supportDeps.values()

From b7756d2242f08756573f7ecd09088abf6d4a7a9a Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Thu, 6 Apr 2017 13:47:37 +0300
Subject: [PATCH 03/18] add id for title view on main screen

---
 app/src/main/res/layout/fragment_main.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index c781802..5196178 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -8,6 +9,7 @@
     >
 
     <TextView
+        android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"

From 87e24951d501ec82073c16f4397eb3d4274e1202 Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Thu, 6 Apr 2017 13:47:53 +0300
Subject: [PATCH 04/18] make ui tests works

---
 app/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/build.gradle b/app/build.gradle
index ab85221..1ecfcbb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,6 +22,7 @@ android {
         applicationId APPLICATION_ID
         versionCode 1
         versionName '1.0-beta'
+        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }
 
     productFlavors {

From d347db8a83f2fcaafc71625f731063f036ecf96e Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Thu, 6 Apr 2017 13:48:13 +0300
Subject: [PATCH 05/18] add test rule which take screenshot when test fails

---
 .../android/ScreenshotActivityRule.java       | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 app/src/androidTest/java/com/flatstack/android/ScreenshotActivityRule.java

diff --git a/app/src/androidTest/java/com/flatstack/android/ScreenshotActivityRule.java b/app/src/androidTest/java/com/flatstack/android/ScreenshotActivityRule.java
new file mode 100644
index 0000000..9e3f182
--- /dev/null
+++ b/app/src/androidTest/java/com/flatstack/android/ScreenshotActivityRule.java
@@ -0,0 +1,37 @@
+package com.flatstack.android;
+
+import android.app.Activity;
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.espresso.Espresso;
+import android.support.test.espresso.base.DefaultFailureHandler;
+import android.support.test.rule.ActivityTestRule;
+
+import com.squareup.spoon.Spoon;
+
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+/**
+ * Created by ereminilya on 6/4/17.
+ */
+
+public class ScreenshotActivityRule<T extends Activity> extends ActivityTestRule<T> {
+
+    public ScreenshotActivityRule(Class<T> activityClass) {
+        super(activityClass);
+    }
+
+    @Override
+    public Statement apply(Statement base, Description description) {
+        String testClassName = description.getClassName();
+        String testMethodName = description.getMethodName();
+        Context context = InstrumentationRegistry.getTargetContext();
+        Espresso.setFailureHandler((error, matcher) -> {
+            Spoon.screenshot(getActivity(), "failure", testClassName, testMethodName);
+            new DefaultFailureHandler(context).handle(error, matcher);
+        });
+        return super.apply(base, description);
+    }
+
+}

From 647988b87dbad486de682447df06e987dd14a012 Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Thu, 6 Apr 2017 13:48:25 +0300
Subject: [PATCH 06/18] write simple UI test

---
 .../com/flatstack/android/MainScreenTest.java | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 app/src/androidTest/java/com/flatstack/android/MainScreenTest.java

diff --git a/app/src/androidTest/java/com/flatstack/android/MainScreenTest.java b/app/src/androidTest/java/com/flatstack/android/MainScreenTest.java
new file mode 100644
index 0000000..f5b74cb
--- /dev/null
+++ b/app/src/androidTest/java/com/flatstack/android/MainScreenTest.java
@@ -0,0 +1,34 @@
+package com.flatstack.android;
+
+import android.support.test.runner.AndroidJUnit4;
+
+import com.flatstack.android.main_screen.MainActivity;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.allOf;
+
+/**
+ * Created by ereminilya on 6/4/17.
+ */
+
+@RunWith(AndroidJUnit4.class)
+public class MainScreenTest {
+
+    @Rule
+    public ScreenshotActivityRule<MainActivity> testRule =
+            new ScreenshotActivityRule<>(MainActivity.class);
+
+    @Test
+    public void whenAppLaunch_androidBaseVisible() throws Exception {
+        onView(allOf(withId(R.id.title), withText(R.string.app_name)))
+                .check(matches(isDisplayed()));
+    }
+}
\ No newline at end of file

From b7b9f6bf4c103b584329726b2b79732364ed5741 Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Thu, 6 Apr 2017 14:25:37 +0300
Subject: [PATCH 07/18] run unit tests on circle ci

---
 app/build.gradle                        | 19 ++++++++++++++++
 app/set_animation_permissions.sh        | 15 +++++++++++++
 app/src/androidTest/AndroidManifest.xml | 13 +++++++++++
 build.gradle                            |  5 ++++-
 circle.yml                              | 30 ++++++++++++++++++++-----
 5 files changed, 75 insertions(+), 7 deletions(-)
 create mode 100755 app/set_animation_permissions.sh
 create mode 100644 app/src/androidTest/AndroidManifest.xml

diff --git a/app/build.gradle b/app/build.gradle
index 1ecfcbb..926415c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,7 +99,26 @@ dependencies {
 
     testCompile unitTestLibs
     androidTestCompile androidTestsLibs
+}
+
+// Grant animation permissions to avoid test failure because of ui sync.
+task grantAnimationPermissions(type: Exec, dependsOn: ['installStagingDebug', 'installProductionDebug']) {
+    group = 'test'
+    description = 'Grant permissions for testing.'
+
+    def absolutePath = file('..') // Get project absolute path
+    commandLine "$absolutePath/app/set_animation_permissions.sh com.flatstack.android".split(" ")
+}
 
+// Source: http://stackoverflow.com/q/29908110/112705
+afterEvaluate {
+    // When launching individual tests from Android Studio, it seems that only the assemble tasks
+    // get called directly, not the install* versions
+    tasks.each { task ->
+        if (task.name.endsWith('AndroidTest')) {
+            task.dependsOn grantAnimationPermissions
+        }
+    }
 }
 
 apply from: "quality.gradle"
\ No newline at end of file
diff --git a/app/set_animation_permissions.sh b/app/set_animation_permissions.sh
new file mode 100755
index 0000000..b25127e
--- /dev/null
+++ b/app/set_animation_permissions.sh
@@ -0,0 +1,15 @@
+adb=$ANDROID_HOME/platform-tools/adb
+package=$1
+
+if [ "$#" = 0 ]; then
+    echo "No parameters found, run with sh set_animation_permissions.sh <package>"
+    exit 0
+fi
+
+# get all the devices
+devices=$($adb devices | grep -v 'List of devices' | cut -f1 | grep '.')
+
+for device in $devices; do
+    echo "Setting permissions to device" $device "for package" $package
+    $adb -s $device shell pm grant $package android.permission.SET_ANIMATION_SCALE
+done
\ No newline at end of file
diff --git a/app/src/androidTest/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml
new file mode 100644
index 0000000..899bbbc
--- /dev/null
+++ b/app/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.flatstack.android"
+    >
+
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <!-- Disable animations on debug builds so that the animations do not interfere with Espresso
+          tests.  Adding this permission to the manifest is not sufficient - you must also grant the
+          permission over adb! -->
+    <uses-permission android:name="android.permission.SET_ANIMATION_SCALE"/>
+
+</manifest>
diff --git a/build.gradle b/build.gradle
index 684caef..a49fa0d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,10 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'me.tatarka:gradle-retrolambda:3.2.5' // use Java 8 lambdas on android
-        classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.2'
+        classpath('com.stanfy.spoon:spoon-gradle-plugin:1.2.2') {
+            exclude module: 'guava'
+        }
+        classpath 'com.google.guava:guava:17.0'
     }
 }
 
diff --git a/circle.yml b/circle.yml
index 5325d82..e765e33 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,19 +1,37 @@
 machine:
    environment:
-     ANDROID_HOME: /usr/local/android-sdk-linux
-     GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
+      TERM: "dumb"
+      ADB_INSTALL_TIMEOUT: "10"
+      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
    java:
-     version: oraclejdk8
+      version: oraclejdk8
+
+general:
+  artifacts:
+    - "/home/ubuntu/android-base/app/build/reports"
 
 dependencies:
   pre:
-    - echo y | android update sdk --no-ui --all --filter "tools,platform-tools,android-25,extra-google-m2repository"
-    - echo y | android update sdk --no-ui --all --filter "build-tools-25.0.1"
-    - echo y | android update sdk --no-ui --all --filter "extra-android-m2repository"
+    - chmod +x set_animation_permissions.sh
 
 test:
+  pre:
+    - emulator -avd circleci-android22 -no-audio -no-window:
+        background: true
+        parallel: true
   override:
     - ./gradlew checkstyle lintProductionRelease testProductionReleaseUnitTest
+    - circle-android wait-for-boot
+    - sleep 30
+    - adb shell input keyevent 82
+    - adb shell settings put global window_animation_scale 0.0

+    - adb shell settings put global transition_animation_scale 0.0
+    - adb shell settings put global animator_duration_scale 0.0
+    - (./gradlew spoon):
+        timeout: 1200
+    - cp -r app/build/outputs $CIRCLE_ARTIFACTS
+    - cp -r app/spoon $CIRCLE_ARTIFACTS
+    - cp -r app/build/outputs/androidTest-results/* $CIRCLE_TEST_REPORTS
 
 #deployment:
 #  production: # just a label; label names are completely up to you

From 1779bbecce3f7e029755e004d9bd2c65044a1dc3 Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Thu, 6 Apr 2017 16:35:49 +0300
Subject: [PATCH 08/18] fix script path

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index e765e33..dba34ff 100644
--- a/circle.yml
+++ b/circle.yml
@@ -12,7 +12,7 @@ general:
 
 dependencies:
   pre:
-    - chmod +x set_animation_permissions.sh
+    - chmod +x app/set_animation_permissions.sh
 
 test:
   pre:

From 9ef8f39690ee308f880eb5987be99da2afef0a7b Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Fri, 7 Apr 2017 17:11:39 +0300
Subject: [PATCH 09/18] accept licence while installation on CI

---
 circle.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/circle.yml b/circle.yml
index dba34ff..9eb4c03 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,10 +1,10 @@
 machine:
-   environment:
-      TERM: "dumb"
-      ADB_INSTALL_TIMEOUT: "10"
-      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
    java:
-      version: oraclejdk8
+       version: oraclejdk8
+     environment:
+       TERM: "dumb"
+       ADB_INSTALL_TIMEOUT: "10"
+       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
 
 general:
   artifacts:
@@ -13,6 +13,9 @@ general:
 dependencies:
   pre:
     - chmod +x app/set_animation_permissions.sh
+    - echo y | android update sdk --no-ui --all --filter "tools,platform-tools,android-25,extra-google-m2repository"
+    - echo y | android update sdk --no-ui --all --filter "build-tools-25.0.1"
+    - echo y | android update sdk --no-ui --all --filter "extra-android-m2repository"
 
 test:
   pre:

From 7fb092b5894da3ce3b21a8eb45f4d01fdc0cdf68 Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Fri, 7 Apr 2017 17:22:01 +0300
Subject: [PATCH 10/18] fix paddings

---
 circle.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/circle.yml b/circle.yml
index 9eb4c03..d73f876 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,10 +1,10 @@
 machine:
-   java:
-       version: oraclejdk8
-     environment:
-       TERM: "dumb"
-       ADB_INSTALL_TIMEOUT: "10"
-       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
+  java:
+    version: oraclejdk8
+  environment:
+    TERM: "dumb"
+    ADB_INSTALL_TIMEOUT: "10"
+    GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
 
 general:
   artifacts:

From d9f3f2ff7605075524ecdac1e1bed3dcf7b4d69d Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Mon, 10 Apr 2017 12:12:42 +0300
Subject: [PATCH 11/18] persist spoon reports in artifacts

---
 circle.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/circle.yml b/circle.yml
index d73f876..20082da 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,6 +9,7 @@ machine:
 general:
   artifacts:
     - "/home/ubuntu/android-base/app/build/reports"
+    - "/home/ubuntu/android-base/app/build/spoon"
 
 dependencies:
   pre:

From 3331cecbafed00f0d00ea8f81f05beac42a052d7 Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Mon, 10 Apr 2017 12:12:56 +0300
Subject: [PATCH 12/18] run spoon only on production debug

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 20082da..3f4333f 100644
--- a/circle.yml
+++ b/circle.yml
@@ -31,7 +31,7 @@ test:
     - adb shell settings put global window_animation_scale 0.0

     - adb shell settings put global transition_animation_scale 0.0
     - adb shell settings put global animator_duration_scale 0.0
-    - (./gradlew spoon):
+    - (./gradlew spoonProductionDebugAndroidTest):
         timeout: 1200
     - cp -r app/build/outputs $CIRCLE_ARTIFACTS
     - cp -r app/spoon $CIRCLE_ARTIFACTS

From 10f6a6072a2066c4819f67366139b3f5a5075ded Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Mon, 10 Apr 2017 22:17:10 +0300
Subject: [PATCH 13/18] add sd card for emulator

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 3f4333f..76dc9f6 100644
--- a/circle.yml
+++ b/circle.yml
@@ -20,7 +20,7 @@ dependencies:
 
 test:
   pre:
-    - emulator -avd circleci-android22 -no-audio -no-window:
+    - emulator -avd circleci-android22 -no-audio -no-window -sdcard mysdcard.img:
         background: true
         parallel: true
   override:

From 8081887aaedce0a34fb0e7c94107406e8d372f18 Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Mon, 10 Apr 2017 22:17:26 +0300
Subject: [PATCH 14/18] rid off unnecessary copy operations

---
 circle.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index 76dc9f6..ddfceb2 100644
--- a/circle.yml
+++ b/circle.yml
@@ -33,9 +33,6 @@ test:
     - adb shell settings put global animator_duration_scale 0.0
     - (./gradlew spoonProductionDebugAndroidTest):
         timeout: 1200
-    - cp -r app/build/outputs $CIRCLE_ARTIFACTS
-    - cp -r app/spoon $CIRCLE_ARTIFACTS
-    - cp -r app/build/outputs/androidTest-results/* $CIRCLE_TEST_REPORTS
 
 #deployment:
 #  production: # just a label; label names are completely up to you

From 6e92f5528891e1c008ecbe6fd27f14289c1ae37c Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Mon, 10 Apr 2017 22:17:39 +0300
Subject: [PATCH 15/18] add broken test to verify screenshots is saving

---
 .../java/com/flatstack/android/MainScreenTest.java          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/androidTest/java/com/flatstack/android/MainScreenTest.java b/app/src/androidTest/java/com/flatstack/android/MainScreenTest.java
index f5b74cb..5b23e51 100644
--- a/app/src/androidTest/java/com/flatstack/android/MainScreenTest.java
+++ b/app/src/androidTest/java/com/flatstack/android/MainScreenTest.java
@@ -31,4 +31,10 @@ public void whenAppLaunch_androidBaseVisible() throws Exception {
         onView(allOf(withId(R.id.title), withText(R.string.app_name)))
                 .check(matches(isDisplayed()));
     }
+
+    @Test
+    public void brokenTest() throws Exception {
+        onView(allOf(withId(R.id.title), withText("non existent text")))
+                .check(matches(isDisplayed()));
+    }
 }
\ No newline at end of file

From bd840fc96647b57229419e846217da0804a80bce Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Mon, 10 Apr 2017 23:07:18 +0300
Subject: [PATCH 16/18] use different emulator, speed up ui tests

---
 circle.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/circle.yml b/circle.yml
index ddfceb2..ed7791c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,7 +3,7 @@ machine:
     version: oraclejdk8
   environment:
     TERM: "dumb"
-    ADB_INSTALL_TIMEOUT: "10"
+    ADB_INSTALL_TIMEOUT: 5000
     GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
 
 general:
@@ -18,15 +18,21 @@ dependencies:
     - echo y | android update sdk --no-ui --all --filter "build-tools-25.0.1"
     - echo y | android update sdk --no-ui --all --filter "extra-android-m2repository"
 
+  post:
+    # Create the android emulator
+    - echo n | android create avd -n test_android_17 -f -t android-17
+    #  [HINT] Circle-CI already have built-in emulator (circleci-android22), but it's so heavy.
+    # Make a SD Card image file for the android emulator
+    - mksdcard -l e 128M sdcard.img
+
 test:
   pre:
-    - emulator -avd circleci-android22 -no-audio -no-window -sdcard mysdcard.img:
+    - emulator -avd test_android_17 -no-audio -no-boot-anim -no-window -sdcard sdcard.img:
         background: true
         parallel: true
   override:
     - ./gradlew checkstyle lintProductionRelease testProductionReleaseUnitTest
-    - circle-android wait-for-boot
-    - sleep 30
+    - circle-android wait-for-boot; sleep 10
     - adb shell input keyevent 82
     - adb shell settings put global window_animation_scale 0.0

     - adb shell settings put global transition_animation_scale 0.0

From 3a12ee17e65973ac2446a78d1e28fa4076031877 Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Mon, 10 Apr 2017 23:32:24 +0300
Subject: [PATCH 17/18] playing with timeouts

---
 app/build.gradle | 1 +
 circle.yml       | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 926415c..93563d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,6 +23,7 @@ android {
         versionCode 1
         versionName '1.0-beta'
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+        com.android.ddmlib.DdmPreferences.setTimeOut(60000)
     }
 
     productFlavors {
diff --git a/circle.yml b/circle.yml
index ed7791c..d6fdce2 100644
--- a/circle.yml
+++ b/circle.yml
@@ -32,13 +32,13 @@ test:
         parallel: true
   override:
     - ./gradlew checkstyle lintProductionRelease testProductionReleaseUnitTest
-    - circle-android wait-for-boot; sleep 10
+    - circle-android wait-for-boot
+    - sleep 20
     - adb shell input keyevent 82
     - adb shell settings put global window_animation_scale 0.0

     - adb shell settings put global transition_animation_scale 0.0
     - adb shell settings put global animator_duration_scale 0.0
-    - (./gradlew spoonProductionDebugAndroidTest):
-        timeout: 1200
+    - ./gradlew spoonProductionDebugAndroidTest
 
 #deployment:
 #  production: # just a label; label names are completely up to you

From 19dea64446ce15ef1276cfdba8fad7065f3a2aa1 Mon Sep 17 00:00:00 2001
From: Ilya Eremin <partissanei@gmail.com>
Date: Tue, 11 Apr 2017 00:01:14 +0300
Subject: [PATCH 18/18] rid off broken test

---
 .../java/com/flatstack/android/MainScreenTest.java          | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/src/androidTest/java/com/flatstack/android/MainScreenTest.java b/app/src/androidTest/java/com/flatstack/android/MainScreenTest.java
index 5b23e51..f5b74cb 100644
--- a/app/src/androidTest/java/com/flatstack/android/MainScreenTest.java
+++ b/app/src/androidTest/java/com/flatstack/android/MainScreenTest.java
@@ -31,10 +31,4 @@ public void whenAppLaunch_androidBaseVisible() throws Exception {
         onView(allOf(withId(R.id.title), withText(R.string.app_name)))
                 .check(matches(isDisplayed()));
     }
-
-    @Test
-    public void brokenTest() throws Exception {
-        onView(allOf(withId(R.id.title), withText("non existent text")))
-                .check(matches(isDisplayed()));
-    }
 }
\ No newline at end of file