From 2e6ccb456e2a3bcf2183eb96f3f952714693e836 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Thu, 15 Sep 2016 15:47:16 +0300 Subject: [PATCH 01/19] Test commit --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0451be5..7571543 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ android: - sys-img-armeabi-v7a-android-24 - extra-android-m2repository + before_script: - echo no | android create avd --force -n test -t android-24 --abi armeabi-v7a - emulator -avd test -no-skin -no-audio -no-window & From 4ebeb8e2331c952c08758161ec3efdc5c827ce20 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Thu, 15 Sep 2016 15:59:16 +0300 Subject: [PATCH 02/19] Updated --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7571543..0451be5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ android: - sys-img-armeabi-v7a-android-24 - extra-android-m2repository - before_script: - echo no | android create avd --force -n test -t android-24 --abi armeabi-v7a - emulator -avd test -no-skin -no-audio -no-window & From 357e598e163c955f741564c0a0e6efcaf3811120 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Thu, 15 Sep 2016 16:18:08 +0300 Subject: [PATCH 03/19] Fixed annotations version --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 5f30bd6..bf48de3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,6 +24,6 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:24.2.0' - androidTestCompile 'com.android.support:support-annotations:+' + androidTestCompile 'com.android.support:support-annotations:24.2.0' androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1' } From 30a698677df64a7d01deb7c11ece0acd35d780af Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 13:18:45 +0300 Subject: [PATCH 04/19] Test circle CI --- .../gettipsi/com/project1/DropdownTests.java | 44 +++++-------------- .../project1/action/UnlockKeyguardAction.java | 25 +++++++++++ circle.yml | 17 +++++++ 3 files changed, 54 insertions(+), 32 deletions(-) create mode 100644 app/src/androidTest/java/gettipsi/com/project1/action/UnlockKeyguardAction.java create mode 100644 circle.yml diff --git a/app/src/androidTest/java/gettipsi/com/project1/DropdownTests.java b/app/src/androidTest/java/gettipsi/com/project1/DropdownTests.java index dc81af5..91cd51b 100644 --- a/app/src/androidTest/java/gettipsi/com/project1/DropdownTests.java +++ b/app/src/androidTest/java/gettipsi/com/project1/DropdownTests.java @@ -1,13 +1,9 @@ package gettipsi.com.project1; -import android.app.KeyguardManager; -import android.content.Context; -import android.os.SystemClock; import android.support.test.espresso.assertion.ViewAssertions; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import android.view.WindowManager; import org.junit.Before; import org.junit.Rule; @@ -47,22 +43,6 @@ public class DropdownTests { @Before public void initValidData() { - final MainActivity activity = activityRule.getActivity(); - activity.runOnUiThread(new Runnable() { - @Override - public void run() { - KeyguardManager mKG = (KeyguardManager) activity.getSystemService(Context.KEYGUARD_SERVICE); - KeyguardManager.KeyguardLock mLock = mKG.newKeyguardLock("keyguard"); - mLock.disableKeyguard(); - - //turn the screen on - activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED - | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD - | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON - | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON - | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON); - } - }); items = Arrays.asList("One", "Two", "Three", "Four"); } @@ -82,22 +62,22 @@ public void checkItemsSelection() { .perform(new SetSelectedAction(0)) .check(matches(withSpinnerText(items.get(0).toString()))); - SystemClock.sleep(1000); +// SystemClock.sleep(1000); onView(withId(R.id.dropdownId)) .perform(new SetSelectedAction(1)) .check(matches(withSpinnerText(items.get(1).toString()))); - SystemClock.sleep(1000); +// SystemClock.sleep(1000); onView(withId(R.id.dropdownId)) .perform(new SetSelectedAction(2)) .check(matches(withSpinnerText(items.get(2).toString()))); - SystemClock.sleep(1000); +// SystemClock.sleep(1000); onView(withId(R.id.dropdownId)) .perform(new SetSelectedAction(3)) .check(matches(withSpinnerText(items.get(3).toString()))); - SystemClock.sleep(1000); +// SystemClock.sleep(1000); } @@ -108,22 +88,22 @@ public void checkItemsWithNameSelection() { .perform(new SelectElementWithNameAction(items.get(0).toString())) .check(matches(withSpinnerText(items.get(0).toString()))); - SystemClock.sleep(1000); +// SystemClock.sleep(1000); onView(withId(R.id.dropdownId)) .perform(new SelectElementWithNameAction(items.get(1).toString())) .check(matches(withSpinnerText(items.get(1).toString()))); - SystemClock.sleep(1000); +// SystemClock.sleep(1000); onView(withId(R.id.dropdownId)) .perform(new SelectElementWithNameAction(items.get(2).toString())) .check(matches(withSpinnerText(items.get(2).toString()))); - SystemClock.sleep(1000); +// SystemClock.sleep(1000); onView(withId(R.id.dropdownId)) .perform(new SelectElementWithNameAction(items.get(3).toString())) .check(matches(withSpinnerText(items.get(3).toString()))); - SystemClock.sleep(1000); +// SystemClock.sleep(1000); } @Test @@ -131,22 +111,22 @@ public void checkItemsClickSelection() { setupItems(); String item = items.get(0).toString(); onView(withId(R.id.dropdownId)).perform(click()); - onData(allOf(is(instanceOf(String.class)), is(item))).perform(click()); + onData(allOf(is(instanceOf(String.class)))).atPosition(0).perform(click()); onView(withId(R.id.dropdownId)).check(matches(withSpinnerText(containsString(item)))); String item1 = items.get(1).toString(); onView(withId(R.id.dropdownId)).perform(click()); - onData(allOf(is(instanceOf(String.class)), is(item1))).perform(click()); + onData(allOf(is(instanceOf(String.class)))).atPosition(1).perform(click()); onView(withId(R.id.dropdownId)).check(matches(withSpinnerText(containsString(item1)))); String item2 = items.get(2).toString(); onView(withId(R.id.dropdownId)).perform(click()); - onData(allOf(is(instanceOf(String.class)), is(item2))).perform(click()); + onData(allOf(is(instanceOf(String.class)))).atPosition(2).perform(click()); onView(withId(R.id.dropdownId)).check(matches(withSpinnerText(containsString(item2)))); String item3 = items.get(3).toString(); onView(withId(R.id.dropdownId)).perform(click()); - onData(allOf(is(instanceOf(String.class)), is(item3))).perform(click()); + onData(allOf(is(instanceOf(String.class)))).atPosition(3).perform(click()); onView(withId(R.id.dropdownId)).check(matches(withSpinnerText(containsString(item3)))); } diff --git a/app/src/androidTest/java/gettipsi/com/project1/action/UnlockKeyguardAction.java b/app/src/androidTest/java/gettipsi/com/project1/action/UnlockKeyguardAction.java new file mode 100644 index 0000000..fd7bd68 --- /dev/null +++ b/app/src/androidTest/java/gettipsi/com/project1/action/UnlockKeyguardAction.java @@ -0,0 +1,25 @@ +package gettipsi.com.project1.action; + +import android.support.test.espresso.UiController; +import android.support.test.espresso.ViewAction; +import android.view.View; + +import org.hamcrest.Matcher; + +public class UnlockKeyguardAction implements ViewAction { + + @Override + public Matcher getConstraints() { + return null; + } + + @Override + public String getDescription() { + return null; + } + + @Override + public void perform(UiController uiController, View view) { + + } +} diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..81e6d0a --- /dev/null +++ b/circle.yml @@ -0,0 +1,17 @@ +general: + artifacts: + - /home/ubuntu/your-app-name/app/build/outputs/apk/ + +machine: + environment: + ANDROID_HOME: /usr/local/android-sdk-linux + +dependencies: + override: + - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-24.0.2,android-24,extra-google-m2repository,extra-google-google_play_services,extra-android-support + - ANDROID_HOME=/usr/local/android-sdk-linux ./gradlew dependencies + +test: + override: + - (./gradlew assemble): + timeout: 360 From 862f42c74d1b52f1e30717608d27ad892b42d7e7 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 13:32:00 +0300 Subject: [PATCH 05/19] Test circle CI new config --- circle.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 81e6d0a..009f373 100644 --- a/circle.yml +++ b/circle.yml @@ -8,10 +8,26 @@ machine: dependencies: override: - - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-24.0.2,android-24,extra-google-m2repository,extra-google-google_play_services,extra-android-support + - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-24.0.2,android-24,sys-img-armeabi-v7a-android-24,extra-google-m2repository,extra-google-google_play_services,extra-android-support - ANDROID_HOME=/usr/local/android-sdk-linux ./gradlew dependencies test: override: - (./gradlew assemble): timeout: 360 + +test: + override: + - $ANDROID_HOME/tools/emulator -avd testing -no-window -no-boot-anim -no-audio: + background: true + parallel: true + - circle-android wait-for-boot + - adb shell input keyevent 82: + background: true + - ./gradlew connectedAndroidTest + - ADB_INSTALL_TIMEOUT=10 ./gradlew clean spoon --stacktrace --info + - test ! -d app/build/outputs || cp -r app/build/outputs $CIRCLE_ARTIFACTS + - test ! -d app/build/reports || cp -r app/build/reports $CIRCLE_TEST_REPORTS + - test ! -d app/build/spoon || cp -r app/build/spoon $CIRCLE_TEST_REPORTS + - cp -r /home/ubuntu/TestApp/app/build/outputs $CIRCLE_ARTIFACTS + - cp -r /home/ubuntu/TestApp/app/build/outputs/androidTest-results From 050bb2e7ba4bb7fc0b59949c513be1187a142ae6 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 13:48:32 +0300 Subject: [PATCH 06/19] Downgrade library version --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bf48de3..c3834cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:24.2.0' - androidTestCompile 'com.android.support:support-annotations:24.2.0' + compile 'com.android.support:appcompat-v7:23.0.1' + androidTestCompile 'com.android.support:support-annotations:23.0.1' androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1' } From 6b6514c0e6d141de2ec11dafee08edd7f8262bd5 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 14:23:27 +0300 Subject: [PATCH 07/19] Added emulator run --- circle.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/circle.yml b/circle.yml index 009f373..155d9ef 100644 --- a/circle.yml +++ b/circle.yml @@ -17,14 +17,16 @@ test: timeout: 360 test: + pre: + - emulator -avd circleci-android24 -no-audio -no-window: + background: true + parallel: true + - circle-android wait-for-boot + - sleep 30 + - adb shell input keyevent 82 + override: - - $ANDROID_HOME/tools/emulator -avd testing -no-window -no-boot-anim -no-audio: - background: true - parallel: true - - circle-android wait-for-boot - - adb shell input keyevent 82: - background: true - - ./gradlew connectedAndroidTest + - ./gradlew connectedAndroidTest -PdisablePreDex - ADB_INSTALL_TIMEOUT=10 ./gradlew clean spoon --stacktrace --info - test ! -d app/build/outputs || cp -r app/build/outputs $CIRCLE_ARTIFACTS - test ! -d app/build/reports || cp -r app/build/reports $CIRCLE_TEST_REPORTS From 239f3e0656e55db100a213f37fe3cbcf69ef803a Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 14:26:42 +0300 Subject: [PATCH 08/19] New test --- circle.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/circle.yml b/circle.yml index 155d9ef..865a00f 100644 --- a/circle.yml +++ b/circle.yml @@ -17,15 +17,13 @@ test: timeout: 360 test: - pre: - - emulator -avd circleci-android24 -no-audio -no-window: - background: true - parallel: true - - circle-android wait-for-boot - - sleep 30 - - adb shell input keyevent 82 - override: + - emulator -avd circleci-android24 -no-audio -no-window: + background: true + parallel: true + - circle-android wait-for-boot + - sleep 30 + - adb shell input keyevent 82 - ./gradlew connectedAndroidTest -PdisablePreDex - ADB_INSTALL_TIMEOUT=10 ./gradlew clean spoon --stacktrace --info - test ! -d app/build/outputs || cp -r app/build/outputs $CIRCLE_ARTIFACTS From 22ef1d52ce81744f8b1cf7cf60aef288a166b5d5 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 15:40:25 +0300 Subject: [PATCH 09/19] New config settings test --- circle.yml | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/circle.yml b/circle.yml index 865a00f..9ee936f 100644 --- a/circle.yml +++ b/circle.yml @@ -17,17 +17,24 @@ test: timeout: 360 test: + pre: + - emulator -avd circleci-android22 -no-audio -no-window: + background: true + parallel: true + - circle-android wait-for-boot + - sleep 30 + - adb shell input keyevent 82 override: - - emulator -avd circleci-android24 -no-audio -no-window: - background: true - parallel: true - - circle-android wait-for-boot - - sleep 30 - - adb shell input keyevent 82 +# - emulator -avd circleci-android24 -no-audio -no-window: +# background: true +# parallel: true +# - circle-android wait-for-boot +# - sleep 30 +# - adb shell input keyevent 82 - ./gradlew connectedAndroidTest -PdisablePreDex - - ADB_INSTALL_TIMEOUT=10 ./gradlew clean spoon --stacktrace --info - - test ! -d app/build/outputs || cp -r app/build/outputs $CIRCLE_ARTIFACTS - - test ! -d app/build/reports || cp -r app/build/reports $CIRCLE_TEST_REPORTS - - test ! -d app/build/spoon || cp -r app/build/spoon $CIRCLE_TEST_REPORTS - - cp -r /home/ubuntu/TestApp/app/build/outputs $CIRCLE_ARTIFACTS - - cp -r /home/ubuntu/TestApp/app/build/outputs/androidTest-results +# - ADB_INSTALL_TIMEOUT=10 ./gradlew clean spoon --stacktrace --info +# - test ! -d app/build/outputs || cp -r app/build/outputs $CIRCLE_ARTIFACTS +# - test ! -d app/build/reports || cp -r app/build/reports $CIRCLE_TEST_REPORTS +# - test ! -d app/build/spoon || cp -r app/build/spoon $CIRCLE_TEST_REPORTS +# - cp -r /home/ubuntu/TestApp/app/build/outputs $CIRCLE_ARTIFACTS +# - cp -r /home/ubuntu/TestApp/app/build/outputs/androidTest-results From d40d2a61e2f0d3e16e08dcc34b395aee65d7f1a0 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 15:42:48 +0300 Subject: [PATCH 10/19] New config settings test --- circle.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index 9ee936f..ad3d070 100644 --- a/circle.yml +++ b/circle.yml @@ -11,10 +11,10 @@ dependencies: - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-24.0.2,android-24,sys-img-armeabi-v7a-android-24,extra-google-m2repository,extra-google-google_play_services,extra-android-support - ANDROID_HOME=/usr/local/android-sdk-linux ./gradlew dependencies -test: - override: - - (./gradlew assemble): - timeout: 360 +#test: +# override: +# - (./gradlew assemble): +# timeout: 360 test: pre: From 5eedb38991d4af07ed72d14912629fb75d1fbd87 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 15:47:12 +0300 Subject: [PATCH 11/19] New config settings test --- circle.yml | 56 ++++++++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/circle.yml b/circle.yml index ad3d070..a41f7d8 100644 --- a/circle.yml +++ b/circle.yml @@ -1,40 +1,30 @@ -general: - artifacts: - - /home/ubuntu/your-app-name/app/build/outputs/apk/ - machine: - environment: - ANDROID_HOME: /usr/local/android-sdk-linux + environment: + PATH: "~/$CIRCLE_PROJECT_REPONAME/gradle-2.9/bin:$PATH" + TERM: "dumb" + ADB_INSTALL_TIMEOUT: "10" + GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' dependencies: - override: - - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-24.0.2,android-24,sys-img-armeabi-v7a-android-24,extra-google-m2repository,extra-google-google_play_services,extra-android-support - - ANDROID_HOME=/usr/local/android-sdk-linux ./gradlew dependencies - -#test: -# override: -# - (./gradlew assemble): -# timeout: 360 + pre: + - wget "https://services.gradle.org/distributions/gradle-2.9-bin.zip"; unzip gradle-2.9-bin.zip + - echo y | android update sdk --no-ui --all --filter tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository,android-24 + - echo y | android update sdk --no-ui --all --filter build-tools-24.0.2 test: - pre: - - emulator -avd circleci-android22 -no-audio -no-window: + override: + # start the emulator + - emulator -avd circleci-android24 -no-audio -no-window: background: true parallel: true - - circle-android wait-for-boot - - sleep 30 - - adb shell input keyevent 82 - override: -# - emulator -avd circleci-android24 -no-audio -no-window: -# background: true -# parallel: true -# - circle-android wait-for-boot -# - sleep 30 -# - adb shell input keyevent 82 - - ./gradlew connectedAndroidTest -PdisablePreDex -# - ADB_INSTALL_TIMEOUT=10 ./gradlew clean spoon --stacktrace --info -# - test ! -d app/build/outputs || cp -r app/build/outputs $CIRCLE_ARTIFACTS -# - test ! -d app/build/reports || cp -r app/build/reports $CIRCLE_TEST_REPORTS -# - test ! -d app/build/spoon || cp -r app/build/spoon $CIRCLE_TEST_REPORTS -# - cp -r /home/ubuntu/TestApp/app/build/outputs $CIRCLE_ARTIFACTS -# - cp -r /home/ubuntu/TestApp/app/build/outputs/androidTest-results + # wait for it to have booted + - circle-android wait-for-boot + # unlock the emulator screen + - sleep 30 + - adb shell input keyevent 82 + # run tests against the emulator. + - ./gradlew connectedAndroidTest -PdisablePreDex + # copy the build outputs to artifacts + - cp -r app/build/outputs $CIRCLE_ARTIFACTS + # copy the test results to the test results directory. + - cp -r app/build/outputs/androidTest-results/* $CIRCLE_TEST_REPORTS \ No newline at end of file From 97048798725282a5a1dfce17a432d89c8b70e190 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 15:57:48 +0300 Subject: [PATCH 12/19] New config settings test --- circle.yml | 54 +++++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/circle.yml b/circle.yml index a41f7d8..d8113cc 100644 --- a/circle.yml +++ b/circle.yml @@ -1,30 +1,34 @@ +general: + artifacts: + - /home/ubuntu/your-app-name/app/build/outputs/apk/ + machine: - environment: - PATH: "~/$CIRCLE_PROJECT_REPONAME/gradle-2.9/bin:$PATH" - TERM: "dumb" - ADB_INSTALL_TIMEOUT: "10" - GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' + environment: + ANDROID_HOME: /usr/local/android-sdk-linux dependencies: - pre: - - wget "https://services.gradle.org/distributions/gradle-2.9-bin.zip"; unzip gradle-2.9-bin.zip - - echo y | android update sdk --no-ui --all --filter tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository,android-24 - - echo y | android update sdk --no-ui --all --filter build-tools-24.0.2 + override: + - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-24.0.2,android-24,sys-img-armeabi-v7a-android-24,extra-google-m2repository,extra-google-google_play_services,extra-android-support + - echo n | android create avd -n testing -f -t android-24 + - ANDROID_HOME=/usr/local/android-sdk-linux ./gradlew dependencies + +test: + override: + - (./gradlew assemble): + timeout: 360 test: - override: - # start the emulator - - emulator -avd circleci-android24 -no-audio -no-window: - background: true - parallel: true - # wait for it to have booted - - circle-android wait-for-boot - # unlock the emulator screen - - sleep 30 - - adb shell input keyevent 82 - # run tests against the emulator. - - ./gradlew connectedAndroidTest -PdisablePreDex - # copy the build outputs to artifacts - - cp -r app/build/outputs $CIRCLE_ARTIFACTS - # copy the test results to the test results directory. - - cp -r app/build/outputs/androidTest-results/* $CIRCLE_TEST_REPORTS \ No newline at end of file + override: + - emulator -avd testing -no-audio -no-window: + background: true + parallel: true + - circle-android wait-for-boot + - sleep 30 + - adb shell input keyevent 82 + - ./gradlew connectedAndroidTest -PdisablePreDex + - ADB_INSTALL_TIMEOUT=10 ./gradlew clean spoon --stacktrace --info + - test ! -d app/build/outputs || cp -r app/build/outputs $CIRCLE_ARTIFACTS + - test ! -d app/build/reports || cp -r app/build/reports $CIRCLE_TEST_REPORTS + - test ! -d app/build/spoon || cp -r app/build/spoon $CIRCLE_TEST_REPORTS + - cp -r /home/ubuntu/TestApp/app/build/outputs $CIRCLE_ARTIFACTS + - cp -r /home/ubuntu/TestApp/app/build/outputs/androidTest-results From 74281f8c713433ffd55acbedcc444f5451fdde22 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 21:35:43 +0300 Subject: [PATCH 13/19] Changed filepath --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index d8113cc..1303c32 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ general: artifacts: - - /home/ubuntu/your-app-name/app/build/outputs/apk/ + - /home/ubuntu/Project1/app/build/outputs/apk/ machine: environment: From 51e36926da105e828726a5304d0619c69d5f9bf3 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 21:50:33 +0300 Subject: [PATCH 14/19] Changed emulator version --- circle.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 1303c32..7ac7f03 100644 --- a/circle.yml +++ b/circle.yml @@ -9,7 +9,6 @@ machine: dependencies: override: - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-24.0.2,android-24,sys-img-armeabi-v7a-android-24,extra-google-m2repository,extra-google-google_play_services,extra-android-support - - echo n | android create avd -n testing -f -t android-24 - ANDROID_HOME=/usr/local/android-sdk-linux ./gradlew dependencies test: @@ -19,7 +18,7 @@ test: test: override: - - emulator -avd testing -no-audio -no-window: + - emulator -avd circleci-android22 -no-audio -no-window: background: true parallel: true - circle-android wait-for-boot From 4076706989144e62f3ddf91275c7fd4f5a726d6b Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 22:10:14 +0300 Subject: [PATCH 15/19] Removed useless commands --- circle.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/circle.yml b/circle.yml index 7ac7f03..5145fce 100644 --- a/circle.yml +++ b/circle.yml @@ -22,12 +22,5 @@ test: background: true parallel: true - circle-android wait-for-boot - - sleep 30 - adb shell input keyevent 82 - ./gradlew connectedAndroidTest -PdisablePreDex - - ADB_INSTALL_TIMEOUT=10 ./gradlew clean spoon --stacktrace --info - - test ! -d app/build/outputs || cp -r app/build/outputs $CIRCLE_ARTIFACTS - - test ! -d app/build/reports || cp -r app/build/reports $CIRCLE_TEST_REPORTS - - test ! -d app/build/spoon || cp -r app/build/spoon $CIRCLE_TEST_REPORTS - - cp -r /home/ubuntu/TestApp/app/build/outputs $CIRCLE_ARTIFACTS - - cp -r /home/ubuntu/TestApp/app/build/outputs/androidTest-results From 71dee5d811144ea9fa987aca84002f56fda77ff5 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 22:45:49 +0300 Subject: [PATCH 16/19] Added copying reports into artifacts --- circle.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/circle.yml b/circle.yml index 5145fce..8ba8812 100644 --- a/circle.yml +++ b/circle.yml @@ -22,5 +22,10 @@ test: background: true parallel: true - circle-android wait-for-boot + - sleep 30 - adb shell input keyevent 82 - ./gradlew connectedAndroidTest -PdisablePreDex + - test ! -d app/build/outputs || cp -r app/build/outputs $CIRCLE_ARTIFACTS + - test ! -d app/build/reports || cp -r app/build/reports $CIRCLE_TEST_REPORTS + - cp -r /home/ubuntu/TestApp/app/build/outputs $CIRCLE_ARTIFACTS + - cp -r /home/ubuntu/TestApp/app/build/outputs/androidTest-results From fbaa347ece0782a83a18231d321d07d871428744 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 23:04:29 +0300 Subject: [PATCH 17/19] Fixed filepath again --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 8ba8812..0c79e65 100644 --- a/circle.yml +++ b/circle.yml @@ -27,5 +27,5 @@ test: - ./gradlew connectedAndroidTest -PdisablePreDex - test ! -d app/build/outputs || cp -r app/build/outputs $CIRCLE_ARTIFACTS - test ! -d app/build/reports || cp -r app/build/reports $CIRCLE_TEST_REPORTS - - cp -r /home/ubuntu/TestApp/app/build/outputs $CIRCLE_ARTIFACTS - - cp -r /home/ubuntu/TestApp/app/build/outputs/androidTest-results + - cp -r /home/ubuntu/Project1/app/build/outputs $CIRCLE_ARTIFACTS + - cp -r /home/ubuntu/Project1/app/build/outputs/androidTest-results From f11d9a012592a3c46de3b2e4f4d313d8083a9088 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 23:20:42 +0300 Subject: [PATCH 18/19] Fixed filepath again again --- circle.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/circle.yml b/circle.yml index 0c79e65..f72e969 100644 --- a/circle.yml +++ b/circle.yml @@ -22,10 +22,7 @@ test: background: true parallel: true - circle-android wait-for-boot - - sleep 30 - adb shell input keyevent 82 - ./gradlew connectedAndroidTest -PdisablePreDex - test ! -d app/build/outputs || cp -r app/build/outputs $CIRCLE_ARTIFACTS - test ! -d app/build/reports || cp -r app/build/reports $CIRCLE_TEST_REPORTS - - cp -r /home/ubuntu/Project1/app/build/outputs $CIRCLE_ARTIFACTS - - cp -r /home/ubuntu/Project1/app/build/outputs/androidTest-results From 37c64871f25cc4e95a0aa253c4e8ab5be00fc2c9 Mon Sep 17 00:00:00 2001 From: dmitriy Date: Mon, 19 Sep 2016 23:42:34 +0300 Subject: [PATCH 19/19] Fixed filepath again again --- .../java/gettipsi/com/project1/DropdownTests.java | 14 ++++++++++++++ circle.yml | 3 +++ 2 files changed, 17 insertions(+) diff --git a/app/src/androidTest/java/gettipsi/com/project1/DropdownTests.java b/app/src/androidTest/java/gettipsi/com/project1/DropdownTests.java index 91cd51b..7bc51a9 100644 --- a/app/src/androidTest/java/gettipsi/com/project1/DropdownTests.java +++ b/app/src/androidTest/java/gettipsi/com/project1/DropdownTests.java @@ -1,5 +1,7 @@ package gettipsi.com.project1; +import android.app.KeyguardManager; +import android.content.Context; import android.support.test.espresso.assertion.ViewAssertions; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; @@ -43,6 +45,18 @@ public class DropdownTests { @Before public void initValidData() { + activityRule.getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + try { + KeyguardManager mKeyGuardManager = (KeyguardManager) activityRule.getActivity().getSystemService(Context.KEYGUARD_SERVICE); + KeyguardManager.KeyguardLock mLock = mKeyGuardManager.newKeyguardLock(Context.KEYGUARD_SERVICE); + mLock.disableKeyguard(); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); items = Arrays.asList("One", "Two", "Three", "Four"); } diff --git a/circle.yml b/circle.yml index f72e969..4f8a8bb 100644 --- a/circle.yml +++ b/circle.yml @@ -22,7 +22,10 @@ test: background: true parallel: true - circle-android wait-for-boot + - sleep 30 - adb shell input keyevent 82 - ./gradlew connectedAndroidTest -PdisablePreDex - test ! -d app/build/outputs || cp -r app/build/outputs $CIRCLE_ARTIFACTS - test ! -d app/build/reports || cp -r app/build/reports $CIRCLE_TEST_REPORTS +# - cp -r /home/ubuntu/Project1/app/build/outputs $CIRCLE_ARTIFACTS +# - cp -r /home/ubuntu/Project1/app/build/outputs/androidTest-results