From 0757c1fb869bf54c4005f1d81ec96ca3b66db88e Mon Sep 17 00:00:00 2001 From: omen273 <38621722+omen273@users.noreply.github.com> Date: Sun, 24 Jan 2021 23:32:11 +0100 Subject: [PATCH 1/7] 76-fix --- app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt index ec42376c..e21ef25c 100644 --- a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt +++ b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt @@ -79,6 +79,7 @@ fun generateCrossword(): Crossword { chooseFirstTopic() onView(isRoot()).perform(waitForView(withId(R.id.ok_play))) onView(withId(R.id.ok_play)).perform(ViewActions.click()) + onView(isRoot()).perform(waitForView(withId(R.id.crossword))) Espresso.pressBack() Espresso.pressBack() return getLastCrossword() From 1388893b52f7252de5912c498f0255deeb162837 Mon Sep 17 00:00:00 2001 From: omen273 <38621722+omen273@users.noreply.github.com> Date: Mon, 25 Jan 2021 09:21:54 +0100 Subject: [PATCH 2/7] 76-try-to-fix --- app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt index e21ef25c..65e1cb67 100644 --- a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt +++ b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt @@ -79,6 +79,8 @@ fun generateCrossword(): Crossword { chooseFirstTopic() onView(isRoot()).perform(waitForView(withId(R.id.ok_play))) onView(withId(R.id.ok_play)).perform(ViewActions.click()) + val start = System.currentTimeMillis() + waitForCondition("", { System.currentTimeMillis() - start > 2500 }) onView(isRoot()).perform(waitForView(withId(R.id.crossword))) Espresso.pressBack() Espresso.pressBack() From a82301198809f90e12e5b98d366f1647343dfa95 Mon Sep 17 00:00:00 2001 From: omen273 <38621722+omen273@users.noreply.github.com> Date: Mon, 25 Jan 2021 09:59:31 +0100 Subject: [PATCH 3/7] 76-try-to-fix --- .../java/com/example/crosswordToLearn/Utils.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt index 65e1cb67..4b9a00bd 100644 --- a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt +++ b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt @@ -80,7 +80,7 @@ fun generateCrossword(): Crossword { onView(isRoot()).perform(waitForView(withId(R.id.ok_play))) onView(withId(R.id.ok_play)).perform(ViewActions.click()) val start = System.currentTimeMillis() - waitForCondition("", { System.currentTimeMillis() - start > 2500 }) + waitForCondition("", { System.currentTimeMillis() - start > 10000 }) onView(isRoot()).perform(waitForView(withId(R.id.crossword))) Espresso.pressBack() Espresso.pressBack() @@ -93,16 +93,13 @@ fun chooseFirstTopic() { } fun getLastCrossword(): Crossword { - Log.i("TEST", "getLastCrossword()") val imagesPath = File( getContext().getExternalFilesDir(null), MainActivity.IMAGE_DIRECTORY ) var last: File? = imagesPath.listFiles()?.iterator()?.next() - if (imagesPath.exists()) { - for (file in imagesPath.listFiles()) { - if (last!!.lastModified()!! < file.lastModified()) last = file - } + for (file in imagesPath.listFiles()) { + if (last!!.lastModified()!! < file.lastModified()) last = file } val crosswordName = last?.name?.removeSuffix(MainActivity.IMAGE_FORMAT) + GameActivity.DATA_SUFFIX From 7e1ec5f4e3b85cfb86076cd30d4156f945162481 Mon Sep 17 00:00:00 2001 From: omen273 <38621722+omen273@users.noreply.github.com> Date: Mon, 25 Jan 2021 14:20:04 +0100 Subject: [PATCH 4/7] 76-try-to-fix --- .../androidTest/java/com/example/crosswordToLearn/Utils.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt index 4b9a00bd..802acff5 100644 --- a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt +++ b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt @@ -80,10 +80,12 @@ fun generateCrossword(): Crossword { onView(isRoot()).perform(waitForView(withId(R.id.ok_play))) onView(withId(R.id.ok_play)).perform(ViewActions.click()) val start = System.currentTimeMillis() - waitForCondition("", { System.currentTimeMillis() - start > 10000 }) + waitForCondition("", { System.currentTimeMillis() - start > 30000 }) onView(isRoot()).perform(waitForView(withId(R.id.crossword))) Espresso.pressBack() Espresso.pressBack() + val start1 = System.currentTimeMillis() + waitForCondition("", { System.currentTimeMillis() - start1 > 30000 }) return getLastCrossword() } From b81819fee3e5006e0e55fd06cf9a75dfca2dd4f9 Mon Sep 17 00:00:00 2001 From: omen273 <38621722+omen273@users.noreply.github.com> Date: Mon, 25 Jan 2021 14:55:19 +0100 Subject: [PATCH 5/7] 76-try-to-fix --- .../androidTest/java/com/example/crosswordToLearn/Utils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt index 802acff5..db6d7722 100644 --- a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt +++ b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt @@ -80,12 +80,12 @@ fun generateCrossword(): Crossword { onView(isRoot()).perform(waitForView(withId(R.id.ok_play))) onView(withId(R.id.ok_play)).perform(ViewActions.click()) val start = System.currentTimeMillis() - waitForCondition("", { System.currentTimeMillis() - start > 30000 }) + waitForCondition("", { System.currentTimeMillis() - start > 10000 }) onView(isRoot()).perform(waitForView(withId(R.id.crossword))) Espresso.pressBack() Espresso.pressBack() val start1 = System.currentTimeMillis() - waitForCondition("", { System.currentTimeMillis() - start1 > 30000 }) + waitForCondition("", { System.currentTimeMillis() - start1 > 10000 }) return getLastCrossword() } From 76726007e81156da1084b9876f67422ae2dbda67 Mon Sep 17 00:00:00 2001 From: omen273 <38621722+omen273@users.noreply.github.com> Date: Mon, 25 Jan 2021 19:31:35 +0100 Subject: [PATCH 6/7] 76-try-to-fix --- .../java/com/example/crosswordToLearn/Utils.kt | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt index db6d7722..8171e271 100644 --- a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt +++ b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt @@ -2,7 +2,6 @@ package com.example.crosswordToLearn import android.content.Context import android.content.Intent -import android.util.Log import android.view.View import android.view.ViewGroup import android.view.WindowManager @@ -14,7 +13,6 @@ import androidx.test.espresso.Espresso.onView import androidx.test.espresso.action.ViewActions import androidx.test.espresso.assertion.ViewAssertions import androidx.test.espresso.matcher.RootMatchers -import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.espresso.util.HumanReadables import androidx.test.espresso.util.TreeIterables @@ -80,12 +78,12 @@ fun generateCrossword(): Crossword { onView(isRoot()).perform(waitForView(withId(R.id.ok_play))) onView(withId(R.id.ok_play)).perform(ViewActions.click()) val start = System.currentTimeMillis() - waitForCondition("", { System.currentTimeMillis() - start > 10000 }) + waitForCondition("", { System.currentTimeMillis() - start > 1000 }) onView(isRoot()).perform(waitForView(withId(R.id.crossword))) Espresso.pressBack() Espresso.pressBack() val start1 = System.currentTimeMillis() - waitForCondition("", { System.currentTimeMillis() - start1 > 10000 }) + waitForCondition("", { System.currentTimeMillis() - start1 > 1000 }) return getLastCrossword() } @@ -99,13 +97,9 @@ fun getLastCrossword(): Crossword { getContext().getExternalFilesDir(null), MainActivity.IMAGE_DIRECTORY ) - var last: File? = imagesPath.listFiles()?.iterator()?.next() - for (file in imagesPath.listFiles()) { - if (last!!.lastModified()!! < file.lastModified()) last = file - } + val last: File = imagesPath.listFiles()?.maxByOrNull { it.lastModified() } ?: throw RuntimeException("Screen shoot doesn't exist") val crosswordName = - last?.name?.removeSuffix(MainActivity.IMAGE_FORMAT) + GameActivity.DATA_SUFFIX - + last.name.removeSuffix(MainActivity.IMAGE_FORMAT) + GameActivity.DATA_SUFFIX return getContext().openFileInput(crosswordName).use { buildCrossword { UClickJsonFormatter().read(this, it) } } From 027b437e365d60ca80dddee793cf14f321d4a158 Mon Sep 17 00:00:00 2001 From: omen273 <38621722+omen273@users.noreply.github.com> Date: Thu, 28 Jan 2021 10:36:12 +0100 Subject: [PATCH 7/7] 76 deleted some waiting for view --- .../androidTest/java/com/example/crosswordToLearn/Utils.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt index 8171e271..6b14c0a5 100644 --- a/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt +++ b/app/src/androidTest/java/com/example/crosswordToLearn/Utils.kt @@ -77,13 +77,9 @@ fun generateCrossword(): Crossword { chooseFirstTopic() onView(isRoot()).perform(waitForView(withId(R.id.ok_play))) onView(withId(R.id.ok_play)).perform(ViewActions.click()) - val start = System.currentTimeMillis() - waitForCondition("", { System.currentTimeMillis() - start > 1000 }) onView(isRoot()).perform(waitForView(withId(R.id.crossword))) Espresso.pressBack() Espresso.pressBack() - val start1 = System.currentTimeMillis() - waitForCondition("", { System.currentTimeMillis() - start1 > 1000 }) return getLastCrossword() } @@ -97,7 +93,8 @@ fun getLastCrossword(): Crossword { getContext().getExternalFilesDir(null), MainActivity.IMAGE_DIRECTORY ) - val last: File = imagesPath.listFiles()?.maxByOrNull { it.lastModified() } ?: throw RuntimeException("Screen shoot doesn't exist") + val last: File = imagesPath.listFiles()?.maxByOrNull { it.lastModified() } + ?: throw RuntimeException("Screen shoot doesn't exist") val crosswordName = last.name.removeSuffix(MainActivity.IMAGE_FORMAT) + GameActivity.DATA_SUFFIX return getContext().openFileInput(crosswordName).use {