PAINTROID-503 change Jenkinsfile

Catrobat · Oct 5, 2023 · 8dcf525 · 8dcf525
1 parent 67bb031
commit 8dcf525
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -115,7 +115,7 @@ pipeline {
 
                 stage('Device Tests') {
                     steps {
-                        sh "echo no | avdmanager create avd --force --name android28 --package 'system-images;android-28;default;x86_64'"
+                        sh "echo no | avdmanager create avd --force --name android28 --package 'system-images;android-28;default;x86_64' --skin 1080x1920"
                         sh "/home/user/android/sdk/emulator/emulator -no-window -no-boot-anim -noaudio -avd android28 > /dev/null 2>&1 &"
                         sh './gradlew -PenableCoverage -Pjenkins -Pemulator=android28 -Pci createDebugCoverageReport -i'
                     }

diff --git a/...oid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LandscapeIntegrationTest.kt b/...oid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LandscapeIntegrationTest.kt
@@ -24,12 +24,11 @@ import android.content.Context
 import android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
 import android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
 import android.graphics.Color
-import android.view.View
 import androidx.annotation.ArrayRes
 import androidx.annotation.ColorInt
-import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.scrollTo
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -47,15 +46,14 @@ import org.catrobat.paintroid.colorpicker.PresetSelectorView
 import org.catrobat.paintroid.colorpicker.RgbSelectorView
 import org.catrobat.paintroid.test.espresso.util.UiMatcher.withBackground
 import org.catrobat.paintroid.test.espresso.util.UiMatcher.withBackgroundColor
-import org.catrobat.paintroid.test.espresso.util.wrappers.BottomNavigationViewInteraction.onBottomNavigationView
-import org.catrobat.paintroid.test.espresso.util.wrappers.ColorPickerViewInteraction.onColorPickerView
-import org.catrobat.paintroid.test.espresso.util.wrappers.OptionsMenuViewInteraction.onOptionsMenu
-import org.catrobat.paintroid.test.espresso.util.wrappers.ToolBarViewInteraction.onToolBarView
-import org.catrobat.paintroid.test.espresso.util.wrappers.TopBarViewInteraction.onTopBarView
+import org.catrobat.paintroid.test.espresso.util.wrappers.BottomNavigationViewInteraction.Companion.onBottomNavigationView
+import org.catrobat.paintroid.test.espresso.util.wrappers.ColorPickerViewInteraction.Companion.onColorPickerView
+import org.catrobat.paintroid.test.espresso.util.wrappers.OptionsMenuViewInteraction.Companion.onOptionsMenu
+import org.catrobat.paintroid.test.espresso.util.wrappers.ToolBarViewInteraction.Companion.onToolBarView
+import org.catrobat.paintroid.test.espresso.util.wrappers.TopBarViewInteraction.Companion.onTopBarView
 import org.catrobat.paintroid.test.utils.ScreenshotOnFailRule
 import org.catrobat.paintroid.tools.Tool
 import org.catrobat.paintroid.tools.ToolType
-import org.catrobat.paintroid.tools.implementation.FillTool
 import org.catrobat.paintroid.tools.options.ToolOptionsViewController
 import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.`is`
@@ -86,11 +84,11 @@ class LandscapeIntegrationTest {
     fun setUp() {
         mainActivity = activityTestRule.activity
         idlingResource = mainActivity?.idlingResource
-        Espresso.registerIdlingResources(idlingResource)
+        IdlingRegistry.getInstance().register(idlingResource)
     }
 
     @After
-    fun tearDown() { Espresso.registerIdlingResources(idlingResource) }
+    fun tearDown() { IdlingRegistry.getInstance().unregister(idlingResource) }
 
     @Test
     fun testLandscapeMode() {
@@ -410,7 +408,6 @@ class LandscapeIntegrationTest {
     @Test
     fun testIfCurrentToolIsShownInBottomNavigation() {
         setOrientation(SCREEN_ORIENTATION_LANDSCAPE)
-       // toolOptionsViewController!!.animateBottomAndTopNavigation(false)
         for (toolType in ToolType.values()) {
             val tools = toolType == ToolType.IMPORTPNG ||
                 toolType == ToolType.COLORCHOOSER ||
@@ -421,15 +418,6 @@ class LandscapeIntegrationTest {
             if (tools) { continue }
             onToolBarView()
                 .performSelectTool(toolType)
-            Thread.sleep(1000)
-            currentTool
-            if(currentTool!!.toolType == ToolType.FILL)
-            {
-            // var curTool =  currentTool as FillToo
-
-
-             //   textToolOptionsView.getTopLayout().visibility == View.VISIBLE)
-            }
             onBottomNavigationView()
                 .checkShowsCurrentTool(toolType)
         }