From b1a482542117840d813446b56bf592c263debb7a Mon Sep 17 00:00:00 2001 From: farhan-arshad-dev Date: Tue, 16 Oct 2018 11:41:52 +0500 Subject: [PATCH] Resolve DiscoveryLaunchScreenshotTest issue. - LEARNER-5799 - Move the png's to there respective directory. - Add androidTestCompile "com.crittercism.dexmaker:dexmaker-dx:1.4" to properly support Mockito. Ref Doc: https://github.com/linkedin/dexmaker/issues/22 --- OpenEdXMobile/build.gradle | 2 ++ ...s_testScreenshot_withCourseDiscoveryDisabled.png | Bin ...ts_testScreenshot_withCourseDiscoveryEnabled.png | Bin .../test}/DiscoveryLaunchScreenshotTests.java | 2 +- 4 files changed, 3 insertions(+), 1 deletion(-) rename OpenEdXMobile/{discovery_screenshots => screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_}/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryDisabled.png (100%) rename OpenEdXMobile/{discovery_screenshots => screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_}/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryEnabled.png (100%) rename OpenEdXMobile/src/androidTest/java/org/edx/mobile/test/{ => screenshot/test}/DiscoveryLaunchScreenshotTests.java (93%) diff --git a/OpenEdXMobile/build.gradle b/OpenEdXMobile/build.gradle index 95a961e222..3cc5c4f82c 100644 --- a/OpenEdXMobile/build.gradle +++ b/OpenEdXMobile/build.gradle @@ -225,6 +225,8 @@ dependencies { androidTestImplementation ("org.mockito:mockito-core:1.10.19"){ exclude group: 'org.hamcrest' } + androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:1.4" + } configurations { diff --git a/OpenEdXMobile/discovery_screenshots/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryDisabled.png b/OpenEdXMobile/screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryDisabled.png similarity index 100% rename from OpenEdXMobile/discovery_screenshots/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryDisabled.png rename to OpenEdXMobile/screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryDisabled.png diff --git a/OpenEdXMobile/discovery_screenshots/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryEnabled.png b/OpenEdXMobile/screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryEnabled.png similarity index 100% rename from OpenEdXMobile/discovery_screenshots/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryEnabled.png rename to OpenEdXMobile/screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryEnabled.png diff --git a/OpenEdXMobile/src/androidTest/java/org/edx/mobile/test/DiscoveryLaunchScreenshotTests.java b/OpenEdXMobile/src/androidTest/java/org/edx/mobile/test/screenshot/test/DiscoveryLaunchScreenshotTests.java similarity index 93% rename from OpenEdXMobile/src/androidTest/java/org/edx/mobile/test/DiscoveryLaunchScreenshotTests.java rename to OpenEdXMobile/src/androidTest/java/org/edx/mobile/test/screenshot/test/DiscoveryLaunchScreenshotTests.java index 115098ab3f..88ab152b7b 100644 --- a/OpenEdXMobile/src/androidTest/java/org/edx/mobile/test/DiscoveryLaunchScreenshotTests.java +++ b/OpenEdXMobile/src/androidTest/java/org/edx/mobile/test/screenshot/test/DiscoveryLaunchScreenshotTests.java @@ -1,4 +1,4 @@ -package org.edx.mobile.test; +package org.edx.mobile.test.screenshot.test; import org.edx.mobile.view.DiscoveryLaunchActivity; import org.edx.mobile.view.DiscoveryLaunchPresenter;