From 9800b955c98e2ddb72c5a2169e8371d92981e27c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20V=C3=A9gh?= <63366204+Toml499@users.noreply.github.com> Date: Tue, 8 Aug 2023 13:11:57 +0200 Subject: [PATCH] IDE-150 Refactoring UI Espresso Tests and TestUtils (#4748) --- .../test/catblocks/AddBrickCatblocksTest.kt | 15 +---- .../catroid/test/utils/TestUtils.java | 2 +- .../uiespresso/annotations/FlakyTestTest.java | 4 +- .../app/AddUserListToActiveFormulaUITest.java | 30 +++------- .../app/BroadcastBrickMessageUpdateTest.java | 10 +--- .../content/brick/app/ChangeVariableTest.java | 16 ++--- .../app/DeleteItemOfUserListBrickTest.java | 4 +- .../content/brick/app/DeleteLookBrickTest.kt | 20 ++----- .../DeleteUserDefinedReceiverBrickTest.java | 12 +--- .../brick/app/EmptyEventBrickTest.java | 12 +--- .../brick/app/InsertItemToUserListTest.java | 4 +- .../app/LoadProjectAIExtensionSettingsTest.kt | 4 +- .../brick/app/PhiroColorBrickFormulaTest.java | 4 +- .../brick/app/PhiroColorBrickNumberTest.java | 4 +- .../brick/app/PlaySoundAndWaitBrickTest.java | 16 +---- .../content/brick/app/PlaySoundBrickTest.java | 16 +---- .../brick/app/PointToBrickAdditionalTest.java | 13 +--- .../brick/app/ReplaceItemInUserListTest.java | 4 +- .../content/brick/app/SceneBricksTest.java | 30 +++------- .../brick/app/SetBackgroundBrickTest.java | 4 +- .../content/brick/app/SetLookBrickTest.java | 4 +- .../app/SetPenColorBrickFormulaTest.java | 4 +- .../brick/app/SetPenColorBrickNumberTest.java | 4 +- .../brick/app/SetVariableBrickTest.java | 3 +- .../ShowTextColorSizeAlignmentBrickTest.java | 5 +- .../SpeechAIExtensionSettingsBricksTest.kt | 3 +- .../content/brick/app/VariableBrickTest.java | 4 +- .../brick/app/VisualPlacementBrickTest.java | 18 ++---- .../app/VisualPlacementConditionTest.java | 20 ++----- .../app/WhenBackgroundChangesToBrickTest.java | 18 +----- .../content/brick/rtl/RtlBrickTest.java | 7 +-- .../content/brick/stage/CameraResourceTest.kt | 14 ++--- .../brick/stage/FaceDetectionResourceTest.kt | 4 +- .../brick/stage/FadeParticleEffectTest.kt | 21 ++----- .../brick/stage/FlashBrickStageTest.java | 4 +- .../stage/InsertItemToUserListStageTest.java | 4 +- .../content/brick/stage/OpenUrlBrickTest.java | 4 +- .../brick/stage/ParticleAdditivityTest.kt | 19 ++---- .../brick/stage/ParticleEffectsTest.kt | 17 ++---- .../brick/stage/PlaySoundBrickStageTest.java | 17 ++---- .../brick/stage/SayBubbleBrickStageTest.java | 24 ++------ .../stage/SayForBubbleBrickStageTest.java | 22 +++---- .../stage/SceneTransitionBrickStageTest.java | 7 +-- ...ceneTransitionWithSoundBrickStageTest.java | 13 ++-- ...TransitionWithVibrationBrickStageTest.java | 15 ++--- .../brick/stage/SetParticleColorTest.kt | 28 ++------- .../brick/stage/StartListeningStageTest.kt | 16 +---- .../brick/stage/TextDetectionResourceTest.kt | 4 +- .../stage/ThinkBubbleBrickStageTest.java | 22 +++---- .../stage/ThinkForBubbleBrickStageTest.java | 21 +++---- .../brick/stage/VibrationBrickStageTest.java | 4 +- .../stage/WhenNfcBrickHardwareStageTest.java | 15 ++--- .../WhenNfcBrickStageFromScriptTest.java | 17 ++---- .../brick/stage/WhenNfcBrickStageTest.java | 15 ++--- .../content/brick/utils/BrickTestUtils.java | 13 ---- ...dcastAndWaitBrickMessageContainerTest.java | 25 +++----- ...dcastReceiveBrickMessageContainerTest.java | 25 +++----- ...roadcastSendBrickMessageContainerTest.java | 17 ++---- .../FormulaEditorAddVariableTest.java | 4 +- .../FormulaEditorBrickViewOnClickTest.java | 14 ++--- .../FormulaEditorDeleteVariableTest.java | 5 +- .../FormulaEditorEditTextTest.java | 4 +- .../FormulaEditorEditVariableTest.java | 4 +- .../FormulaEditorFragmentHelpUrlTest.java | 38 +++++------- .../FormulaEditorFragmentTest.java | 38 +++++------- .../FormulaEditorFunctionListTest.java | 3 +- .../FormulaEditorKeyboardTest.java | 37 ++++-------- .../FormulaEditorMovementPropertiesTest.java | 4 +- ...FormulaEditorMultiplayerVariablesTest.java | 5 +- .../FormulaEditorRegexAssistantTest.java | 3 +- .../FormulaEditorRegexDetectionTest.java | 3 +- .../FormulaEditorRenameVariableTest.java | 4 +- .../FormulaEditorSortDataListTest.kt | 4 +- .../formulaeditor/FormulaEditorTest.java | 39 +++++------- .../FormulaEditorTouchesActorOrObjectTest.kt | 4 +- .../formulaeditor/FormulaEditorUndoTest.java | 4 +- .../FormulaEditorUserDefinedBrickTest.java | 18 +++--- .../FormulaEditorVariableScopeTest.java | 35 ++++------- .../LookFromGalleryIntentDismissTest.java | 18 +----- .../gallery/LookFromGalleryIntentTest.java | 17 +----- .../PocketPaintEditLookIntentTest.java | 11 +--- .../PocketPaintNewLookDiscardIntentTest.java | 16 +---- .../PocketPaintNewLookIntentTest.java | 18 +----- .../SoundFromGalleryIntentDismissTest.java | 18 +----- .../gallery/SoundFromGalleryIntentTest.java | 17 +----- .../SpriteActivityVisualPlacementTest.java | 4 +- .../VisualPlacementActivityTest.java | 4 +- .../CameraPermissionSpriteActivityTest.java | 16 +---- .../pocketmusic/PocketMusicActivityTest.java | 2 +- ...AndWaitForDeletedClonesRegressionTest.java | 16 ++--- .../BroadcastForClonesRegressionTest.java | 16 ++--- ...oadcastForDeletedClonesRegressionTest.java | 16 ++--- .../BroadcastReceiverRegressionTest.java | 2 +- .../uiespresso/stage/DeleteSpriteCloneTest.kt | 17 ++---- .../DisabledBrickInClonesRegressionTest.java | 17 ++---- .../uiespresso/stage/LookUndoTest.java | 17 +----- .../stage/MultipleBroadcastsTest.java | 2 +- .../uiespresso/stage/StagePausedTest.java | 22 +------ .../stage/StageResourceFailedTest.java | 12 +--- .../uiespresso/stage/StageScreenshotTest.java | 16 ++--- .../uiespresso/stage/StageSimpleTest.java | 17 ++---- .../uiespresso/stage/StartStageTouchTest.java | 21 ++----- .../ActionBarFormulaEditorTitleTest.java | 4 +- ...itingFormulaEditorOneSceneProjectTest.java | 4 +- ...tingFormulaEditorTwoScenesProjectTest.java | 15 +---- .../actionbar/ActionBarUndoSpinnerTest.java | 4 +- .../ActionModeDataFragmentTitleTest.java | 3 +- .../ui/actionbar/ActionModeMergeTest.java | 13 +--- ...tActivityNumberOfBricksRegressionTest.java | 14 +---- .../ui/activity/ProjectActivityTest.java | 9 +-- .../ui/activity/ProjectUploadDialogTest.kt | 12 +--- .../ui/dialog/AddNewActorOrLookDialogTest.kt | 4 +- .../ui/dialog/AddSpriteFromBackpackTest.kt | 4 +- .../ui/dialog/DisableHintDialogTest.java | 2 +- ...rComputeDialogUserDefinedBrickInputTest.kt | 5 +- .../ui/dialog/HtmlExtractorDialogTest.java | 3 +- .../ui/dialog/JsonExtractorDialogTest.java | 3 +- .../LegoSensorPortConfigDialogTest.java | 3 +- .../RegularExpressionAssistantDialogTest.java | 3 +- .../DataListFragmentExplanationTextTest.kt | 4 +- ...taListFragmentUserDefinedBrickInputTest.kt | 4 +- .../fragment/DataListFragmentUserListsTest.kt | 4 +- .../DataListFragmentUserVariablesTest.kt | 4 +- .../ui/fragment/ProjectOptionsTest.java | 4 +- .../ui/fragment/RemoveTabsTest.java | 5 +- .../ui/fragment/SortProjectsTest.java | 2 +- .../SpriteListFragmentWithObjectTest.kt | 4 +- .../uiespresso/ui/fragment/UndoTest.java | 4 +- .../ui/fragment/UserDefinedBrickTest.java | 3 +- .../hints/HintsShownInCorrectActivityTest.kt | 4 +- ...ragmentActivityRecreateRegressionTest.java | 4 +- ...ialogActivityRecreationRegressionTest.java | 4 +- ...eDialogActivityRecreateRegressionTest.java | 4 +- .../ui/tabs/SpriteActivityTabsTest.java | 4 +- .../catroid/uiespresso/util/UiTestUtils.kt | 59 ++++++++++++++++--- 135 files changed, 486 insertions(+), 1059 deletions(-) diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/catblocks/AddBrickCatblocksTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/test/catblocks/AddBrickCatblocksTest.kt index fb41d0ecd0c..6ca45a27812 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/test/catblocks/AddBrickCatblocksTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/catblocks/AddBrickCatblocksTest.kt @@ -30,12 +30,12 @@ import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import org.catrobat.catroid.R import org.catrobat.catroid.UiTestCatroidApplication -import org.catrobat.catroid.content.Project -import org.catrobat.catroid.content.Sprite import org.catrobat.catroid.content.StartScript +import org.catrobat.catroid.test.utils.TestUtils import org.catrobat.catroid.ui.SpriteActivity import org.catrobat.catroid.ui.recyclerview.fragment.CatblocksScriptFragment import org.catrobat.catroid.ui.settingsfragments.SettingsFragment +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.junit.After import org.junit.Assert @@ -60,7 +60,7 @@ class AddBrickCatblocksTest { fun setUp() { CatblocksScriptFragment.testingMode = true SettingsFragment.setUseCatBlocks(ApplicationProvider.getApplicationContext(), true) - createProject() + UiTestUtils.createProjectWithOutDefaultScript(TestUtils.DEFAULT_TEST_PROJECT_NAME) baseActivityTestRule.launchActivity() } @@ -100,13 +100,4 @@ class AddBrickCatblocksTest { Assert.fail("Added script is not a StartScript: " + addedScript.javaClass.simpleName) } } - - private fun createProject() { - val projectName = javaClass.simpleName - val project = Project(ApplicationProvider.getApplicationContext(), projectName) - val sprite = Sprite("testSprite") - project.defaultScene.addSprite(sprite) - UiTestCatroidApplication.projectManager.currentProject = project - UiTestCatroidApplication.projectManager.currentSprite = sprite - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/utils/TestUtils.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/utils/TestUtils.java index cf831a78ae7..603c1a3b5f4 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/test/utils/TestUtils.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/utils/TestUtils.java @@ -54,7 +54,7 @@ public final class TestUtils { public static final String DEFAULT_TEST_PROJECT_NAME = "testProject"; public static final String DEFAULT_TEST_SPRITE_NAME = "testSprite"; - + public static final int DEFAULT_TEST_SCRIPT_INDEX = 0; public static final double DELTA = 0.00001; private TestUtils() { diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/annotations/FlakyTestTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/annotations/FlakyTestTest.java index 8b17d783c52..0c97904f54e 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/annotations/FlakyTestTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/annotations/FlakyTestTest.java @@ -27,7 +27,7 @@ import org.catrobat.catroid.rules.FlakyTestRule; import org.catrobat.catroid.runner.Flaky; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.BeforeClass; @@ -61,7 +61,7 @@ public static void setUpBeforeClass() throws Exception { @Before public void setUp() throws Exception { - BrickTestUtils.createProjectAndGetStartScript("flakyTestTest"); + UiTestUtils.createProjectAndGetStartScript("flakyTestTest"); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/AddUserListToActiveFormulaUITest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/AddUserListToActiveFormulaUITest.java index b006c3008a6..801c82a5346 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/AddUserListToActiveFormulaUITest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/AddUserListToActiveFormulaUITest.java @@ -23,16 +23,15 @@ package org.catrobat.catroid.uiespresso.content.brick.app; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.SetXBrick; import org.catrobat.catroid.formulaeditor.UserList; import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; import org.junit.Before; @@ -44,8 +43,6 @@ import java.util.ArrayList; import java.util.List; -import androidx.test.core.app.ApplicationProvider; - import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.Category.FUNCTIONS; import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor; @@ -123,7 +120,12 @@ public static Iterable data() { @Before public void setUp() throws Exception { - createProjectWithUserLists(); + Project project = UiTestUtils.createDefaultTestProject("AddUserListToActiveFormulaUITest"); + Script script = UiTestUtils.getDefaultTestScript(project); + Sprite sprite = UiTestUtils.getDefaultTestSprite(project); + projectUserList.forEach(project::addUserList); + spriteUserList.forEach(sprite::addUserList); + script.addBrick(new SetXBrick()); baseActivityTestRule.launchActivity(); } @@ -150,22 +152,4 @@ private String generateExpectedOutput(String expectedUserListName) { return getResourcesString(formulaName) + "( *" + expectedUserListName + "* , 1 ) "; } } - - private void createProjectWithUserLists() { - Project project = new Project(ApplicationProvider.getApplicationContext(), AddUserListToActiveFormulaUITest - .class.getSimpleName()); - Sprite sprite = new Sprite("testSprite"); - Script script = new StartScript(); - - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); - - projectUserList.forEach(project::addUserList); - spriteUserList.forEach(sprite::addUserList); - - script.addBrick(new SetXBrick()); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastBrickMessageUpdateTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastBrickMessageUpdateTest.java index 9d1f2854046..e7ac4e134d5 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastBrickMessageUpdateTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastBrickMessageUpdateTest.java @@ -49,7 +49,6 @@ import java.util.Arrays; import java.util.List; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; @@ -172,8 +171,8 @@ private void switchScene() { } private void createTestProjectWithBricks(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite firstSprite = new Sprite("spriteScene1"); + Project project = UiTestUtils.createDefaultTestProject(projectName); + Sprite firstSprite = UiTestUtils.getDefaultTestSprite(project); secondSprite = new Sprite("spriteScene2"); Script script = new BroadcastScript(defaultMessage); @@ -194,14 +193,9 @@ private void createTestProjectWithBricks(String projectName) { Scene firstScene = new Scene("Scene1", project); secondScene = new Scene("Scene2", project); - - firstScene.addSprite(firstSprite); secondScene.addSprite(secondSprite); project.addScene(firstScene); project.addScene(secondScene); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(firstSprite); - ProjectManager.getInstance().setCurrentlyEditedScene(firstScene); } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeVariableTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeVariableTest.java index dac4ef317ab..2491a6ead68 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeVariableTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeVariableTest.java @@ -27,7 +27,7 @@ import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.bricks.ChangeVariableBrick; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -61,7 +61,11 @@ public class ChangeVariableTest { @Before public void setUp() throws Exception { - createProject(); + Script script = UiTestUtils + .createProjectAndGetStartScript("ChangeVariableTest"); + changeVariableBrick = new ChangeVariableBrick(10); + script.addBrick(changeVariableBrick); + script.getBrickList().size(); baseActivityTestRule.launchActivity(); } @@ -134,12 +138,4 @@ private void performNewVariableFromFormulaEditor(int brickId, String variableNam .performClose(); pressBack(); } - - public void createProject() { - Script script = BrickTestUtils - .createProjectAndGetStartScript("ChangeVariableTest"); - changeVariableBrick = new ChangeVariableBrick(10); - script.addBrick(changeVariableBrick); - script.getBrickList().size(); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteItemOfUserListBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteItemOfUserListBrickTest.java index 454688c6d39..36139a58e08 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteItemOfUserListBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteItemOfUserListBrickTest.java @@ -31,8 +31,8 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -74,7 +74,7 @@ public class DeleteItemOfUserListBrickTest { public void setUp() throws Exception { brickPosition = 1; deleteItemOfUserListBrick = new DeleteItemOfUserListBrick(); - BrickTestUtils.createProjectAndGetStartScript("deleteItemOfUserListBrickTest1") + UiTestUtils.createProjectAndGetStartScript("deleteItemOfUserListBrickTest1") .addBrick(deleteItemOfUserListBrick); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteLookBrickTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteLookBrickTest.kt index 05bea7e4884..c67ce02eb9f 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteLookBrickTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteLookBrickTest.kt @@ -23,7 +23,6 @@ package org.catrobat.catroid.uiespresso.content.brick.app -import androidx.test.core.app.ApplicationProvider.getApplicationContext import androidx.test.espresso.Espresso.onView import androidx.test.espresso.Espresso.pressBack import androidx.test.espresso.NoMatchingViewException @@ -34,18 +33,17 @@ import androidx.test.espresso.matcher.ViewMatchers.isRoot import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.base.Stopwatch -import org.catrobat.catroid.ProjectManager import org.catrobat.catroid.R import org.catrobat.catroid.WaitForConditionAction.Companion.waitFor -import org.catrobat.catroid.content.Project +import org.catrobat.catroid.content.Script import org.catrobat.catroid.content.Sprite -import org.catrobat.catroid.content.StartScript import org.catrobat.catroid.content.bricks.DeleteLookBrick import org.catrobat.catroid.content.bricks.PaintNewLookBrick import org.catrobat.catroid.test.utils.TestUtils import org.catrobat.catroid.testsuites.annotations.Cat.AppUi import org.catrobat.catroid.testsuites.annotations.Level.Smoke import org.catrobat.catroid.ui.SpriteActivity +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.actions.CustomActions.wait import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.junit.After @@ -55,16 +53,14 @@ import org.junit.Rule import org.junit.Test import org.junit.experimental.categories.Category import org.junit.runner.RunWith -import org.koin.java.KoinJavaComponent.inject import java.util.concurrent.TimeUnit.MILLISECONDS @Category(AppUi::class, Smoke::class) @RunWith(AndroidJUnit4::class) class DeleteLookBrickTest { private lateinit var sprite: Sprite - private lateinit var script: StartScript + private lateinit var script: Script private val projectName = "DeleteLookBrickTest" - private val projectManager by inject(ProjectManager::class.java) @get:Rule var baseActivityTestRule = FragmentActivityTestRule( @@ -75,15 +71,11 @@ class DeleteLookBrickTest { @Before fun setUp() { - val project = Project(getApplicationContext(), projectName) - sprite = Sprite("testSprite") - script = StartScript() + val project = UiTestUtils.createDefaultTestProject(projectName) + script = UiTestUtils.getDefaultTestScript(project) script.addBrick(PaintNewLookBrick()) + sprite = UiTestUtils.getDefaultTestSprite(project) sprite.addScript(script) - project.defaultScene.addSprite(sprite) - projectManager.currentProject = project - projectManager.currentSprite = sprite - projectManager.currentlyEditedScene = project.defaultScene Intents.init() baseActivityTestRule.launchActivity() } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteUserDefinedReceiverBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteUserDefinedReceiverBrickTest.java index 4e1a69380ce..c5ef8ed430d 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteUserDefinedReceiverBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteUserDefinedReceiverBrickTest.java @@ -25,7 +25,6 @@ import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.content.Project; -import org.catrobat.catroid.content.Scene; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.content.StartScript; @@ -38,6 +37,7 @@ import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.ui.SpriteActivity; import org.catrobat.catroid.ui.recyclerview.controller.SpriteController; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.catrobat.catroid.userbrick.UserDefinedBrickInput; import org.catrobat.catroid.userbrick.UserDefinedBrickLabel; @@ -50,7 +50,6 @@ import java.io.IOException; import java.util.Collections; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; @@ -113,7 +112,7 @@ public void testDifferentUserDefinedBrickNotDeleted() { } private void createProject(String projectName) throws IOException, CloneNotSupportedException { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); + Project project = UiTestUtils.createDefaultTestProject(projectName); ProjectManager projectManager = ProjectManager.getInstance(); SpriteController controller = new SpriteController(); @@ -129,12 +128,7 @@ private void createProject(String projectName) throws IOException, CloneNotSuppo createUserDefinedScripts(); createStartScript(); - Scene scene = project.getDefaultScene(); - project.getDefaultScene().addSprite(sprite); - - copiedSprite = controller.copy(sprite, project, scene); - - projectManager.setCurrentProject(project); + copiedSprite = controller.copy(sprite, project, project.getDefaultScene()); projectManager.setCurrentSprite(sprite); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/EmptyEventBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/EmptyEventBrickTest.java index fd373560552..8caca9475f4 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/EmptyEventBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/EmptyEventBrickTest.java @@ -23,10 +23,8 @@ package org.catrobat.catroid.uiespresso.content.brick.app; -import org.catrobat.catroid.content.EmptyScript; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; -import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.content.bricks.Brick; import org.catrobat.catroid.content.bricks.DeleteLookBrick; import org.catrobat.catroid.content.bricks.ShowBrick; @@ -34,6 +32,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.ProjectListActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -41,7 +40,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static junit.framework.Assert.assertFalse; @@ -66,14 +64,10 @@ public class EmptyEventBrickTest { @Before public void setUp() throws Exception { - project = new Project(ApplicationProvider.getApplicationContext(), - PROJECT_NAME); - Sprite sprite = new Sprite(SPRITE_NAME); - Script script = new EmptyScript(); + project = UiTestUtils.createDefaultTestProject(PROJECT_NAME); + Script script = UiTestUtils.getDefaultTestScript(project); script.addBrick(new ShowBrick()); script.addBrick(new DeleteLookBrick()); - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); XstreamSerializer.getInstance().saveProject(project); baseActivityTestRule.launchActivity(null); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/InsertItemToUserListTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/InsertItemToUserListTest.java index 6aa16f90877..98898ce1ad6 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/InsertItemToUserListTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/InsertItemToUserListTest.java @@ -30,8 +30,8 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -71,7 +71,7 @@ public void setUp() throws Exception { valueToInsert1 = 2018; indexToInsert = 1; userListName = "NewList"; - BrickTestUtils.createProjectAndGetStartScript("addItemToUserListTest") + UiTestUtils.createProjectAndGetStartScript("addItemToUserListTest") .addBrick(new InsertItemIntoUserListBrick(valueToInsert, indexToInsert)); baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LoadProjectAIExtensionSettingsTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LoadProjectAIExtensionSettingsTest.kt index e6a70401129..ed871e3d9b1 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LoadProjectAIExtensionSettingsTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LoadProjectAIExtensionSettingsTest.kt @@ -128,7 +128,7 @@ import org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_SHOW_ import org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_SHOW_AI_SPEECH_RECOGNITION_SENSORS import org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_SHOW_AI_SPEECH_SYNTHETIZATION_SENSORS import org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_SHOW_AI_TEXT_RECOGNITION_SENSORS -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule import org.junit.After import org.junit.Before @@ -639,7 +639,7 @@ class LoadProjectAIExtensionSettingsTest( allAIExtensionSettings.forEach { setting -> setSettingToBoolean(setting, false) } - script = createProjectAndGetStartScript(projectName) + script = UiTestUtils.createProjectAndGetStartScript(projectName) baseActivityTestRule.launchActivity(null) } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroColorBrickFormulaTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroColorBrickFormulaTest.java index 33a9e95325b..561702c2739 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroColorBrickFormulaTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroColorBrickFormulaTest.java @@ -29,7 +29,7 @@ import org.catrobat.catroid.formulaeditor.Formula; import org.catrobat.catroid.formulaeditor.FormulaElement; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -83,7 +83,7 @@ public static Collection data() { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript("PhiroColorBrickTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("PhiroColorBrickTest"); Object[] parameters = {red, green, blue}; ArrayList formula = new ArrayList<>(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroColorBrickNumberTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroColorBrickNumberTest.java index 0f337a7f369..54f05665269 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroColorBrickNumberTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroColorBrickNumberTest.java @@ -28,7 +28,7 @@ import org.catrobat.catroid.content.bricks.PhiroRGBLightBrick; import org.catrobat.catroid.formulaeditor.Formula; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -84,7 +84,7 @@ public static Collection data() { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript("PhiroColorBrickTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("PhiroColorBrickTest"); Object[] parameters = {red, green, blue}; ArrayList formula = new ArrayList<>(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PlaySoundAndWaitBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PlaySoundAndWaitBrickTest.java index d82b4d686fe..b836a76cf79 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PlaySoundAndWaitBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PlaySoundAndWaitBrickTest.java @@ -31,17 +31,15 @@ import org.catrobat.catroid.common.SoundInfo; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; -import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.PlaySoundAndWaitBrick; import org.catrobat.catroid.content.bricks.PlaySoundBrick; import org.catrobat.catroid.io.ResourceImporter; -import org.catrobat.catroid.io.SoundManager; import org.catrobat.catroid.io.XstreamSerializer; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; import org.catrobat.catroid.uiespresso.annotations.Device; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.actions.CustomActions; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.After; @@ -55,7 +53,6 @@ import java.io.IOException; import java.util.List; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.rule.GrantPermissionRule; @@ -245,15 +242,8 @@ private void recordNewSound(int durationMillis) { private void createProject() throws IOException { String projectName = "playSoundAndWaitBrickTest"; - SoundManager.getInstance(); - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("testSprite"); - Script startScript = new StartScript(); - - sprite.addScript(startScript); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); + Project project = UiTestUtils.createDefaultTestProject(projectName); + Script startScript = UiTestUtils.getDefaultTestScript(project); XstreamSerializer.getInstance().saveProject(project); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PlaySoundBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PlaySoundBrickTest.java index 6f227787314..d23d868a950 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PlaySoundBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PlaySoundBrickTest.java @@ -31,14 +31,12 @@ import org.catrobat.catroid.common.SoundInfo; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; -import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.PlaySoundBrick; import org.catrobat.catroid.io.ResourceImporter; -import org.catrobat.catroid.io.SoundManager; import org.catrobat.catroid.io.XstreamSerializer; import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.actions.CustomActions; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.After; @@ -51,7 +49,6 @@ import java.io.IOException; import java.util.List; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.rule.GrantPermissionRule; @@ -187,15 +184,8 @@ public void testRenameSound() { } private void createProject() throws IOException { - SoundManager.getInstance(); - Project project = new Project(ApplicationProvider.getApplicationContext(), getClass().getSimpleName()); - Sprite sprite = new Sprite("testSprite"); - Script startScript = new StartScript(); - - sprite.addScript(startScript); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); + Project project = UiTestUtils.createDefaultTestProject("PlaySoundBrickTest"); + Script startScript = UiTestUtils.getDefaultTestScript(project); XstreamSerializer.getInstance().saveProject(project); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PointToBrickAdditionalTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PointToBrickAdditionalTest.java index bed0915c901..4dc898befc1 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PointToBrickAdditionalTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PointToBrickAdditionalTest.java @@ -30,12 +30,8 @@ import android.net.Uri; import android.os.Environment; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; -import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; -import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.CloneBrick; import org.catrobat.catroid.content.bricks.PointToBrick; import org.catrobat.catroid.io.ResourceImporter; @@ -170,17 +166,10 @@ public void tearDown() throws Exception { } private void createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("testSprite"); - Script script = new StartScript(); + Script script = UiTestUtils.createProjectAndGetStartScript(projectName); script.addBrick(new PointToBrick()); script.addBrick(new PointToBrick()); script.addBrick(new CloneBrick()); - - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ReplaceItemInUserListTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ReplaceItemInUserListTest.java index da327ca3087..ad03030c36c 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ReplaceItemInUserListTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ReplaceItemInUserListTest.java @@ -28,8 +28,8 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -62,7 +62,7 @@ public class ReplaceItemInUserListTest { @Before public void setUp() throws Exception { - BrickTestUtils.createProjectAndGetStartScript("ReplaceItemInUserListBrick") + UiTestUtils.createProjectAndGetStartScript("ReplaceItemInUserListBrick") .addBrick(new ReplaceItemInUserListBrick(1.0, 1)); brickPosition = 1; baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SceneBricksTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SceneBricksTest.java index f0ae9de620e..88231874914 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SceneBricksTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SceneBricksTest.java @@ -23,16 +23,13 @@ package org.catrobat.catroid.uiespresso.content.brick.app; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; -import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; -import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.SceneStartBrick; import org.catrobat.catroid.content.bricks.SceneTransitionBrick; import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; import org.junit.Before; @@ -60,7 +57,13 @@ public class SceneBricksTest { @Before public void setUp() throws Exception { - createProject(this.getClass().getSimpleName()); + String sceneName = "New Scene"; + Script script = UiTestUtils.createProjectAndGetStartScript(this.getClass().getSimpleName()); + + script.addBrick(new SceneStartBrick(sceneName)); + script.addBrick(new SceneStartBrick(sceneName)); + script.addBrick(new SceneTransitionBrick(sceneName)); + script.addBrick(new SceneTransitionBrick(sceneName)); baseActivityTestRule.launchActivity(); } @@ -103,21 +106,4 @@ public void testAllSceneBricksSpinnersShowTheNewAddedScene() { public void tearDown() throws Exception { TestUtils.deleteProjects(this.getClass().getSimpleName()); } - - private void createProject(String projectName) { - String sceneName = "New Scene"; - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("testSprite"); - Script script = new StartScript(); - - script.addBrick(new SceneStartBrick(sceneName)); - script.addBrick(new SceneStartBrick(sceneName)); - script.addBrick(new SceneTransitionBrick(sceneName)); - script.addBrick(new SceneTransitionBrick(sceneName)); - - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetBackgroundBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetBackgroundBrickTest.java index a7f31b4e04e..178375e0cea 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetBackgroundBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetBackgroundBrickTest.java @@ -29,7 +29,7 @@ import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; import org.catrobat.catroid.ui.WebViewActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -64,7 +64,7 @@ public class SetBackgroundBrickTest { @Before public void setUp() throws Exception { brickPosition = 1; - BrickTestUtils.createProjectAndGetStartScript("SetBackgroundBrickTest") + UiTestUtils.createProjectAndGetStartScript("SetBackgroundBrickTest") .addBrick(new SetBackgroundBrick()); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetLookBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetLookBrickTest.java index baf827846ab..1c5c1308220 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetLookBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetLookBrickTest.java @@ -29,7 +29,7 @@ import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; import org.catrobat.catroid.ui.WebViewActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -64,7 +64,7 @@ public class SetLookBrickTest { @Before public void setUp() throws Exception { brickPosition = 1; - BrickTestUtils.createProjectAndGetStartScript("SetBackgroundBrickTest") + UiTestUtils.createProjectAndGetStartScript("SetBackgroundBrickTest") .addBrick(new SetLookBrick()); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetPenColorBrickFormulaTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetPenColorBrickFormulaTest.java index d2a1fcf5560..08611d7ac3d 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetPenColorBrickFormulaTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetPenColorBrickFormulaTest.java @@ -28,6 +28,7 @@ import org.catrobat.catroid.formulaeditor.Formula; import org.catrobat.catroid.formulaeditor.FormulaElement; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -42,7 +43,6 @@ import static org.catrobat.catroid.formulaeditor.FormulaElement.ElementType.NUMBER; import static org.catrobat.catroid.formulaeditor.FormulaElement.ElementType.OPERATOR; import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; -import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript; import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor; import static androidx.test.espresso.action.ViewActions.click; @@ -93,7 +93,7 @@ public void setUp() throws Exception { formula.add(new Formula(addFormula)); } - createProjectAndGetStartScript("SetPenColorBrickTest") + UiTestUtils.createProjectAndGetStartScript("SetPenColorBrickTest") .addBrick(new SetPenColorBrick(formula.get(0), formula.get(1), formula.get(2))); formula.clear(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetPenColorBrickNumberTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetPenColorBrickNumberTest.java index 66bb0e83a37..655780f1ab9 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetPenColorBrickNumberTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetPenColorBrickNumberTest.java @@ -27,6 +27,7 @@ import org.catrobat.catroid.content.bricks.SetPenColorBrick; import org.catrobat.catroid.formulaeditor.Formula; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -39,7 +40,6 @@ import java.util.Collection; import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; -import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript; import static org.catrobat.catroid.uiespresso.content.brick.utils.ColorPickerInteractionWrapper.onColorPickerPresetButton; import static org.hamcrest.Matchers.containsString; @@ -91,7 +91,7 @@ public void setUp() { formula.add(new Formula((Integer) color)); } - createProjectAndGetStartScript("SetPenColorBrickTest") + UiTestUtils.createProjectAndGetStartScript("SetPenColorBrickTest") .addBrick(new SetPenColorBrick(formula.get(0), formula.get(1), formula.get(2))); formula.clear(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetVariableBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetVariableBrickTest.java index 512d6fb8b42..68fc045038b 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetVariableBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetVariableBrickTest.java @@ -28,7 +28,6 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; @@ -69,7 +68,7 @@ public class SetVariableBrickTest { public void setUp() throws Exception { SetVariableBrick setVariableTestBrick1 = new SetVariableBrick(10); SetVariableBrick setVariableTestBrick2 = new SetVariableBrick(0); - Script script = BrickTestUtils.createProjectAndGetStartScript("setVariableTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("setVariableTest"); script.addBrick(setVariableTestBrick1); script.addBrick(setVariableTestBrick2); baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ShowTextColorSizeAlignmentBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ShowTextColorSizeAlignmentBrickTest.java index e0ee5770f0c..a65fa70ebce 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ShowTextColorSizeAlignmentBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ShowTextColorSizeAlignmentBrickTest.java @@ -31,6 +31,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; import org.junit.Before; @@ -44,7 +45,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; -import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript; import static org.catrobat.catroid.uiespresso.content.brick.utils.ColorPickerInteractionWrapper.onColorPickerPresetButton; import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor; import static org.hamcrest.Matchers.containsString; @@ -80,7 +80,8 @@ public void tearDown() { @Before public void setUp() { brickPosition = 1; - createProjectAndGetStartScript(ShowTextColorSizeAlignmentBrickTest.class.getSimpleName()) + UiTestUtils + .createProjectAndGetStartScript(ShowTextColorSizeAlignmentBrickTest.class.getSimpleName()) .addBrick(new ShowTextColorSizeAlignmentBrick(0, 0, 100, "#000000")); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SpeechAIExtensionSettingsBricksTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SpeechAIExtensionSettingsBricksTest.kt index 0ffaa43d068..5dc09218404 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SpeechAIExtensionSettingsBricksTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SpeechAIExtensionSettingsBricksTest.kt @@ -43,7 +43,6 @@ import org.catrobat.catroid.content.bricks.SpeakBrick import org.catrobat.catroid.content.bricks.StartListeningBrick import org.catrobat.catroid.ui.SpriteActivity import org.catrobat.catroid.ui.settingsfragments.SettingsFragment -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.matchers.BrickCategoryListMatchers import org.catrobat.catroid.uiespresso.util.matchers.BrickPrototypeListMatchers @@ -136,7 +135,7 @@ class SpeechAIExtensionSettingsBricksTest( @Before @Throws(Exception::class) fun setUp() { - val script = BrickTestUtils.createProjectAndGetStartScript("projectName") + val script = UiTestUtils.createProjectAndGetStartScript("projectName") script.addBrick(ChangeSizeByNBrick(0.0)) baseActivityTestRule.launchActivity() diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VariableBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VariableBrickTest.java index 4c870ae02d8..9be5485f0ae 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VariableBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VariableBrickTest.java @@ -34,6 +34,7 @@ import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; import org.catrobat.catroid.ui.settingsfragments.SettingsFragment; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -46,7 +47,6 @@ import static org.catrobat.catroid.ui.SpriteActivity.EXTRA_FRAGMENT_POSITION; import static org.catrobat.catroid.ui.SpriteActivity.FRAGMENT_SCRIPTS; import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; -import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript; import static org.hamcrest.Matchers.not; import static androidx.test.core.app.ApplicationProvider.getApplicationContext; @@ -72,7 +72,7 @@ public class VariableBrickTest { @Before public void setUp() throws Exception { setBrickPosition = 1; - Script script = createProjectAndGetStartScript("variableBricksTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("variableBricksTest"); script.addBrick(new SetVariableBrick()); script.addBrick(new ChangeVariableBrick()); baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VisualPlacementBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VisualPlacementBrickTest.java index d3aea3fb8a3..0b4460c3e5b 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VisualPlacementBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VisualPlacementBrickTest.java @@ -25,12 +25,10 @@ import android.util.Log; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.GlideToBrick; import org.catrobat.catroid.content.bricks.PlaceAtBrick; import org.catrobat.catroid.content.bricks.ShowTextBrick; @@ -43,6 +41,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.catrobat.catroid.visualplacement.VisualPlacementActivity; import org.junit.After; @@ -57,7 +56,6 @@ import java.util.Arrays; import java.util.Collection; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.intent.Intents; import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; @@ -133,21 +131,13 @@ public void setUp() throws Exception { } public Script createProject() { - Project project = new Project(ApplicationProvider.getApplicationContext(), VisualPlacementBrickTest.class.getSimpleName()); - Sprite sprite = new Sprite("testSprite"); - Script script = new StartScript(); - ProjectManager projectManager = ProjectManager.getInstance(); + Project project = UiTestUtils.createDefaultTestProject(TestUtils.DEFAULT_TEST_PROJECT_NAME); + Sprite sprite = UiTestUtils.getDefaultTestSprite(project); userVariable = new UserVariable("userVariable"); - sprite.addScript(script); sprite.addUserVariable(userVariable); - project.getDefaultScene().addSprite(sprite); - projectManager.setCurrentProject(project); - projectManager.setCurrentSprite(sprite); - projectManager.setCurrentlyEditedScene(project.getDefaultScene()); - projectManager.getCurrentSprite().addUserVariable(userVariable); - return script; + return UiTestUtils.getDefaultTestScript(project); } @Test diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VisualPlacementConditionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VisualPlacementConditionTest.java index 7ba40b5434a..0f35ca26194 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VisualPlacementConditionTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VisualPlacementConditionTest.java @@ -25,12 +25,10 @@ import android.util.Log; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.GlideToBrick; import org.catrobat.catroid.content.bricks.ShowTextColorSizeAlignmentBrick; import org.catrobat.catroid.content.bricks.UserVariableBrickWithVisualPlacement; @@ -40,6 +38,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; import org.junit.Before; @@ -53,8 +52,6 @@ import java.util.Arrays; import java.util.Collection; -import androidx.test.core.app.ApplicationProvider; - import static org.catrobat.catroid.uiespresso.content.brick.app.VisualPlacementBrickTest.isFormulaEditorShownImmediatelyWithTapOnEditText; import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; @@ -119,21 +116,14 @@ public void setUp() throws Exception { } public Script createProject() { - Project project = new Project(ApplicationProvider.getApplicationContext(), VisualPlacementBrickTest.class.getSimpleName()); - Sprite sprite = new Sprite("testSprite"); - Script script = new StartScript(); - ProjectManager projectManager = ProjectManager.getInstance(); + Project project = + UiTestUtils.createDefaultTestProject(TestUtils.DEFAULT_TEST_PROJECT_NAME); + Sprite sprite = UiTestUtils.getDefaultTestSprite(project); userVariable = new UserVariable("userVariable"); - sprite.addScript(script); sprite.addUserVariable(userVariable); - project.getDefaultScene().addSprite(sprite); - projectManager.setCurrentProject(project); - projectManager.setCurrentSprite(sprite); - projectManager.setCurrentlyEditedScene(project.getDefaultScene()); - projectManager.getCurrentSprite().addUserVariable(userVariable); - return script; + return UiTestUtils.getDefaultTestScript(project); } @Test diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/WhenBackgroundChangesToBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/WhenBackgroundChangesToBrickTest.java index 6d064e7d549..79852660c4a 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/WhenBackgroundChangesToBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/WhenBackgroundChangesToBrickTest.java @@ -26,13 +26,11 @@ import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.common.LookData; -import org.catrobat.catroid.content.Project; -import org.catrobat.catroid.content.Script; -import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.content.WhenBackgroundChangesScript; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -42,7 +40,6 @@ import java.util.List; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.intent.Intents; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -66,17 +63,8 @@ public class WhenBackgroundChangesToBrickTest { @Before public void setUp() throws Exception { brickPosition = 0; - Project project = new Project(ApplicationProvider.getApplicationContext(), - "WhenBackgroundChangesToBrickTest"); - Sprite sprite = new Sprite("testSprite"); - Script script = new WhenBackgroundChangesScript(); - - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); - + UiTestUtils.createProjectWithCustomScript("WhenBackgroundChangesToBrickTest", + new WhenBackgroundChangesScript()); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/rtl/RtlBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/rtl/RtlBrickTest.java index 7e38411ff6a..d02bfbf6185 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/rtl/RtlBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/rtl/RtlBrickTest.java @@ -749,18 +749,13 @@ private void checkIfBrickAtPositionIsRtl(Class brickClass, int position, int bri private void createProject(String projectName) { String nameSpriteTwo = "testSpriteTwo"; - - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite spriteOne = new Sprite("testSpriteOne"); - project.getDefaultScene().addSprite(spriteOne); + Project project = UiTestUtils.createDefaultTestProject(projectName); Sprite spriteTwo = new Sprite(nameSpriteTwo); Script script = new StartScript(); spriteTwo.addScript(script); project.getDefaultScene().addSprite(spriteTwo); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); ProjectManager.getInstance().setCurrentSprite(spriteTwo); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/CameraResourceTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/CameraResourceTest.kt index 486fcc5157e..c65549ad617 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/CameraResourceTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/CameraResourceTest.kt @@ -36,8 +36,8 @@ import org.catrobat.catroid.testsuites.annotations.Cat.AppUi import org.catrobat.catroid.testsuites.annotations.Cat.Quarantine import org.catrobat.catroid.testsuites.annotations.Level.Functional import org.catrobat.catroid.ui.SpriteActivity -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.junit.Assert import org.junit.Assert.assertFalse @@ -60,7 +60,7 @@ class CameraResourceTest { @Category(AppUi::class, Functional::class, Quarantine::class) @Test fun cameraResourceNotUsedTest() { - val script = BrickTestUtils.createProjectAndGetStartScript("cameraResourceNotUsed") + val script = UiTestUtils.createProjectAndGetStartScript("cameraResourceNotUsed") val lastBrickInScript = ScriptEvaluationGateBrick.appendToScript(script) baseActivityTestRule.launchActivity() @@ -73,7 +73,7 @@ class CameraResourceTest { @Category(AppUi::class, Functional::class, Quarantine::class) @Test fun cameraOnTest() { - val script = BrickTestUtils.createProjectAndGetStartScript("cameraOnTest").also { + val script = UiTestUtils.createProjectAndGetStartScript("cameraOnTest").also { it.addBrick(CameraBrick(ON)) } val lastBrickInScript = ScriptEvaluationGateBrick.appendToScript(script) @@ -89,7 +89,7 @@ class CameraResourceTest { @Category(AppUi::class, Functional::class, Quarantine::class) @Test fun cameraStagePausedTest() { - val script = BrickTestUtils.createProjectAndGetStartScript("cameraStagePausedTest").also { + val script = UiTestUtils.createProjectAndGetStartScript("cameraStagePausedTest").also { it.addBrick(CameraBrick(ON)) } val lastBrickInScript = ScriptEvaluationGateBrick.appendToScript(script) @@ -105,7 +105,7 @@ class CameraResourceTest { @Category(AppUi::class, Functional::class, Quarantine::class) @Test fun cameraOffTest() { - val script = BrickTestUtils.createProjectAndGetStartScript("cameraOffTest").also { + val script = UiTestUtils.createProjectAndGetStartScript("cameraOffTest").also { it.addBrick(CameraBrick(!ON)) } val lastBrickInScript = ScriptEvaluationGateBrick.appendToScript(script) @@ -120,7 +120,7 @@ class CameraResourceTest { @Category(AppUi::class, Functional::class, Quarantine::class) @Test fun cameraFacingFrontTest() { - val script = BrickTestUtils.createProjectAndGetStartScript("cameraFacingFrontTest").also { + val script = UiTestUtils.createProjectAndGetStartScript("cameraFacingFrontTest").also { it.addBrick(ChooseCameraBrick(FRONT)) it.addBrick(CameraBrick(ON)) } @@ -137,7 +137,7 @@ class CameraResourceTest { @Category(AppUi::class, Functional::class, Quarantine::class) @Test fun cameraFacingBackTest() { - val script = BrickTestUtils.createProjectAndGetStartScript("cameraFacingBackTest").also { + val script = UiTestUtils.createProjectAndGetStartScript("cameraFacingBackTest").also { it.addBrick(ChooseCameraBrick(!FRONT)) it.addBrick(CameraBrick(ON)) } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/FaceDetectionResourceTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/FaceDetectionResourceTest.kt index fa5015074d2..60e10225fb6 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/FaceDetectionResourceTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/FaceDetectionResourceTest.kt @@ -37,8 +37,8 @@ import org.catrobat.catroid.testsuites.annotations.Cat.AppUi import org.catrobat.catroid.testsuites.annotations.Cat.Quarantine import org.catrobat.catroid.testsuites.annotations.Level.Functional import org.catrobat.catroid.ui.SpriteActivity -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.junit.Assert import org.junit.Assert.assertFalse @@ -105,7 +105,7 @@ class FaceDetectionResourceTest { private fun createProject(type: FormulaElement.ElementType, value: String) { formula = Formula(FormulaElement(type, value, null)) - val script = BrickTestUtils.createProjectAndGetStartScript("FaceDetectionResourceTest").also { + val script = UiTestUtils.createProjectAndGetStartScript("FaceDetectionResourceTest").also { it.addBrick(SetSizeToBrick(formula)) } lastBrickInScript = ScriptEvaluationGateBrick.appendToScript(script) diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/FadeParticleEffectTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/FadeParticleEffectTest.kt index a84708e69b2..fc0e9e437c9 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/FadeParticleEffectTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/FadeParticleEffectTest.kt @@ -24,7 +24,6 @@ package org.catrobat.catroid.uiespresso.content.brick.stage import android.content.Intent -import androidx.test.core.app.ApplicationProvider.getApplicationContext import androidx.test.espresso.Espresso.onView import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.matcher.ViewMatchers.isRoot @@ -34,7 +33,6 @@ import org.catrobat.catroid.R import org.catrobat.catroid.content.Project import org.catrobat.catroid.content.Script import org.catrobat.catroid.content.Sprite -import org.catrobat.catroid.content.StartScript import org.catrobat.catroid.content.WhenClonedScript import org.catrobat.catroid.content.bricks.CloneBrick import org.catrobat.catroid.content.bricks.DeleteThisCloneBrick @@ -46,6 +44,7 @@ import org.catrobat.catroid.content.bricks.SetGravityBrick import org.catrobat.catroid.content.bricks.WaitBrick import org.catrobat.catroid.formulaeditor.Formula import org.catrobat.catroid.ui.SpriteActivity +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.actions.CustomActions.wait import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.junit.Assert.assertEquals @@ -77,7 +76,9 @@ class FadeParticleEffectTest { @Before fun setUp() { - createProject() + project = UiTestUtils.createDefaultTestProject(PROJECT_NAME) + script = UiTestUtils.getDefaultTestScript(project) + sprite = UiTestUtils.getDefaultTestSprite(project) baseActivityTestRule.launchActivity(Intent()) } @@ -155,18 +156,4 @@ class FadeParticleEffectTest { } } } - - private fun createProject() { - project = Project(getApplicationContext(), PROJECT_NAME) - script = StartScript() - - sprite = Sprite("sprite") - sprite.addScript(script) - - project.defaultScene.addSprite(sprite) - - projectManager.currentProject = project - projectManager.currentSprite = sprite - projectManager.currentlyEditedScene = project.defaultScene - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/FlashBrickStageTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/FlashBrickStageTest.java index d4529d9e3be..77c29db7b9c 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/FlashBrickStageTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/FlashBrickStageTest.java @@ -28,6 +28,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.hardware.SensorTestArduinoServerConnection; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; @@ -39,7 +40,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; -import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript; import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.action.ViewActions.click; @@ -56,7 +56,7 @@ public class FlashBrickStageTest { @Before public void setUp() throws Exception { flashBrickPosition = 1; - createProjectAndGetStartScript("flashBrickTest").addBrick(new FlashBrick()); + UiTestUtils.createProjectAndGetStartScript("flashBrickTest").addBrick(new FlashBrick()); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/InsertItemToUserListStageTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/InsertItemToUserListStageTest.java index 5056e825119..9e077ec8957 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/InsertItemToUserListStageTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/InsertItemToUserListStageTest.java @@ -27,7 +27,7 @@ import org.catrobat.catroid.formulaeditor.Formula; import org.catrobat.catroid.formulaeditor.UserList; import org.catrobat.catroid.stage.StageActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.actions.CustomActions; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; @@ -55,7 +55,7 @@ public void setUp() throws Exception { valueToInsert = 99.99f; userList = new UserList("LIST"); Integer indexToInsert = 1; - BrickTestUtils.createProjectAndGetStartScript("addItemToUserListStageTest") + UiTestUtils.createProjectAndGetStartScript("addItemToUserListStageTest") .addBrick(new InsertItemIntoUserListBrick(new Formula(valueToInsert), new Formula(indexToInsert), userList)); baseActivityTestRule.launchActivity(null); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/OpenUrlBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/OpenUrlBrickTest.java index 572a11820fd..5fd45b01d65 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/OpenUrlBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/OpenUrlBrickTest.java @@ -36,6 +36,7 @@ import org.catrobat.catroid.content.bricks.OpenUrlBrick; import org.catrobat.catroid.io.StorageOperations; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.actions.CustomActions; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.hamcrest.Matcher; @@ -53,7 +54,6 @@ import static org.catrobat.catroid.common.FlavoredConstants.DEFAULT_ROOT_DIRECTORY; import static org.catrobat.catroid.ui.fragment.FormulaEditorFragment.DO_NOT_SHOW_WARNING; import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; -import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript; import static org.hamcrest.Matchers.allOf; import static androidx.test.espresso.Espresso.onView; @@ -94,7 +94,7 @@ public void setUp() { .commit(); openUrlBrickPosition = 1; - Script script = createProjectAndGetStartScript(projectName); + Script script = UiTestUtils.createProjectAndGetStartScript(projectName); script.addBrick(new OpenUrlBrick()); baseActivityTestRule.launchActivity(new Intent()); Intents.init(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ParticleAdditivityTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ParticleAdditivityTest.kt index 10c5119f029..a7ca749e902 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ParticleAdditivityTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ParticleAdditivityTest.kt @@ -25,7 +25,6 @@ package org.catrobat.catroid.uiespresso.content.brick.stage import android.content.Intent import android.util.Log -import androidx.test.core.app.ApplicationProvider.getApplicationContext import androidx.test.espresso.Espresso.onView import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.matcher.ViewMatchers @@ -33,10 +32,8 @@ import androidx.test.espresso.matcher.ViewMatchers.isRoot import org.catrobat.catroid.ProjectManager import org.catrobat.catroid.R import org.catrobat.catroid.common.FlavoredConstants -import org.catrobat.catroid.content.Project import org.catrobat.catroid.content.Script import org.catrobat.catroid.content.Sprite -import org.catrobat.catroid.content.StartScript import org.catrobat.catroid.content.bricks.CloneBrick import org.catrobat.catroid.content.bricks.ParticleEffectAdditivityBrick import org.catrobat.catroid.content.bricks.ParticleEffectAdditivityBrick.Companion.OFF @@ -45,6 +42,7 @@ import org.catrobat.catroid.content.bricks.WaitBrick import org.catrobat.catroid.io.StorageOperations import org.catrobat.catroid.stage.StageActivity import org.catrobat.catroid.ui.SpriteActivity +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.actions.CustomActions.wait import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.junit.After @@ -79,7 +77,9 @@ class ParticleAdditivityTest { @Before fun setUp() { - createProject() + val project = UiTestUtils.createDefaultTestProject(PROJECT_NAME) + sprite = UiTestUtils.getDefaultTestSprite(project) + script = UiTestUtils.getDefaultTestScript(project) baseActivityTestRule.launchActivity(Intent()) } @@ -156,15 +156,4 @@ class ParticleAdditivityTest { Log.d(javaClass.simpleName, Log.getStackTraceString(e)) } } - - private fun createProject() { - val project = Project(getApplicationContext(), PROJECT_NAME) - sprite = Sprite("testSprite") - script = StartScript() - sprite.addScript(script) - project.defaultScene.addSprite(sprite) - projectManager.currentProject = project - projectManager.currentSprite = sprite - projectManager.currentlyEditedScene = project.defaultScene - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ParticleEffectsTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ParticleEffectsTest.kt index fdf186fa63a..0dfeaa30c79 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ParticleEffectsTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ParticleEffectsTest.kt @@ -24,7 +24,6 @@ package org.catrobat.catroid.uiespresso.content.brick.stage import android.content.Intent -import androidx.test.core.app.ApplicationProvider.getApplicationContext import androidx.test.espresso.Espresso.onView import androidx.test.espresso.Espresso.pressBack import androidx.test.espresso.action.ViewActions.click @@ -33,7 +32,6 @@ import androidx.test.espresso.matcher.ViewMatchers.isRoot import androidx.test.espresso.matcher.ViewMatchers.withText import org.catrobat.catroid.ProjectManager import org.catrobat.catroid.R -import org.catrobat.catroid.content.Project import org.catrobat.catroid.content.Scene import org.catrobat.catroid.content.Script import org.catrobat.catroid.content.Sprite @@ -45,6 +43,7 @@ import org.catrobat.catroid.content.bricks.SceneStartBrick import org.catrobat.catroid.content.bricks.SceneTransitionBrick import org.catrobat.catroid.content.bricks.WaitBrick import org.catrobat.catroid.ui.SpriteActivity +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.actions.CustomActions.wait import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.hamcrest.core.StringContains @@ -127,12 +126,12 @@ class ParticleEffectsTest { } private fun createProject() { - val project = Project(getApplicationContext(), PROJECT_NAME) - sprite = Sprite("testSprite") - script = StartScript() + val project = UiTestUtils.createDefaultTestProject(PROJECT_NAME) + script = UiTestUtils.getDefaultTestScript(project) + sprite = UiTestUtils.getDefaultTestSprite(project) + val touchDownScript = WhenTouchDownScript() touchDownScript.addBrick(SceneStartBrick("scene2")) - sprite.addScript(script) sprite.addScript(touchDownScript) scene2 = Scene("scene2", project) @@ -141,12 +140,6 @@ class ParticleEffectsTest { script2.addBrick(SceneTransitionBrick(project.defaultScene.name)) sprite2.addScript(script2) scene2.addSprite(sprite2) - - project.defaultScene.addSprite(sprite) project.addScene(scene2) - - projectManager.currentProject = project - projectManager.currentSprite = sprite - projectManager.currentlyEditedScene = project.defaultScene } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/PlaySoundBrickStageTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/PlaySoundBrickStageTest.java index f62519d5d2f..16643fca127 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/PlaySoundBrickStageTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/PlaySoundBrickStageTest.java @@ -28,15 +28,13 @@ import org.catrobat.catroid.common.SoundInfo; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; -import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.PlaySoundBrick; import org.catrobat.catroid.io.ResourceImporter; import org.catrobat.catroid.io.SoundManager; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.hardware.SensorTestArduinoServerConnection; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; @@ -49,7 +47,6 @@ import java.io.IOException; import java.util.List; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; @@ -115,14 +112,8 @@ private void createProjectWithSound() throws IOException { String projectName = "playSoundStageTest"; SoundManager.getInstance(); - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("testSprite"); - Script startScript = new StartScript(); - - sprite.addScript(startScript); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); + Project project = UiTestUtils.createDefaultTestProject(projectName); + Script startScript = UiTestUtils.getDefaultTestScript(project); startScript.addBrick(new PlaySoundBrick()); @@ -143,7 +134,7 @@ private void createProjectWithSound() throws IOException { private void createProjectWithOutSound() { String projectName = "playNoSoundStageTest"; SoundManager.getInstance(); - Script startScript = BrickTestUtils.createProjectAndGetStartScript(projectName); + Script startScript = UiTestUtils.createProjectAndGetStartScript(projectName); startScript.addBrick(new PlaySoundBrick()); } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SayBubbleBrickStageTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SayBubbleBrickStageTest.java index 747e1cb886a..1349cfed571 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SayBubbleBrickStageTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SayBubbleBrickStageTest.java @@ -23,16 +23,15 @@ package org.catrobat.catroid.uiespresso.content.brick.stage; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.SayBubbleBrick; import org.catrobat.catroid.stage.StageActivity; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -40,7 +39,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static junit.framework.Assert.assertNotNull; @@ -56,7 +54,11 @@ public class SayBubbleBrickStageTest { @Before public void setUp() throws Exception { - createProject("sayBubbleBrickTest"); + Project project = UiTestUtils.createDefaultTestProject("sayBubbleBrickTest"); + sprite = UiTestUtils.getDefaultTestSprite(project); + Script script = UiTestUtils.getDefaultTestScript(project); + script.addBrick(new SayBubbleBrick("say something")); + lastBrickInScript = ScriptEvaluationGateBrick.appendToScript(script); baseActivityTestRule.launchActivity(null); } @@ -66,18 +68,4 @@ public void sayBubbleBrickStageTest() { lastBrickInScript.waitUntilEvaluated(3000); assertNotNull(StageActivity.stageListener.getBubbleActorForSprite(sprite)); } - - private void createProject(String projectName) { - String sayString = "say something"; - - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - sprite = new Sprite("testSprite"); - Script script = new StartScript(); - script.addBrick(new SayBubbleBrick(sayString)); - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - lastBrickInScript = ScriptEvaluationGateBrick.appendToScript(script); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SayForBubbleBrickStageTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SayForBubbleBrickStageTest.java index 8189e7cfee8..3c58fbc5435 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SayForBubbleBrickStageTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SayForBubbleBrickStageTest.java @@ -23,7 +23,6 @@ package org.catrobat.catroid.uiespresso.content.brick.stage; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; @@ -36,6 +35,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.actions.CustomActions; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; @@ -44,7 +44,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.matcher.ViewMatchers; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -70,7 +69,7 @@ public class SayForBubbleBrickStageTest { @Before public void setUp() throws Exception { - createProject("sayBubbleBrickTest"); + createProject(); baseActivityTestRule.launchActivity(null); } @@ -88,18 +87,13 @@ public void sayForBubbleBrickStageTest() { assertNull(StageActivity.stageListener.getBubbleActorForSprite(sprite)); } - private void createProject(String projectName) { - String sayString = "say something"; - float duration = 2f; - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - sprite = new Sprite("testSprite"); - Script script = new WhenTouchDownScript(); - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); + private void createProject() { + Project project = UiTestUtils.createProjectWithCustomScript("sayBubbleBrickTest", + new WhenTouchDownScript()); + Script script = UiTestUtils.getDefaultTestScript(project); + sprite = UiTestUtils.getDefaultTestSprite(project); - script.addBrick(new SayForBubbleBrick(sayString, duration)); + script.addBrick(new SayForBubbleBrick("say something", 2f)); lastBrickInScript = ScriptEvaluationGateBrick.appendToScript(script); Script whenStarted = new StartScript(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SceneTransitionBrickStageTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SceneTransitionBrickStageTest.java index 1eee33cd77c..1d8bc31244a 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SceneTransitionBrickStageTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SceneTransitionBrickStageTest.java @@ -23,7 +23,6 @@ package org.catrobat.catroid.uiespresso.content.brick.stage; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Scene; import org.catrobat.catroid.content.Script; @@ -37,7 +36,9 @@ import org.catrobat.catroid.formulaeditor.Operators; import org.catrobat.catroid.formulaeditor.UserVariable; import org.catrobat.catroid.stage.StageActivity; +import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.UserVariableAssertions; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; @@ -75,7 +76,7 @@ public void testContinueScene() { } private void createProject() { - Project project = new Project(ApplicationProvider.getApplicationContext(), getClass().getSimpleName()); + Project project = UiTestUtils.createDefaultTestProject(TestUtils.DEFAULT_TEST_PROJECT_NAME); Scene firstScene = project.getDefaultScene(); Scene secondScene = new Scene("Scene 2", project); @@ -89,8 +90,6 @@ private void createProject() { Sprite firstBackground = firstScene.getBackgroundSprite(); Script firstStartScript = new StartScript(); - ProjectManager.getInstance().setCurrentProject(project); - firstBrickInScript = ScriptEvaluationGateBrick.appendToScript(firstStartScript); firstStartScript.addBrick(new SetVariableBrick(new Formula(1), firstVariable)); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SceneTransitionWithSoundBrickStageTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SceneTransitionWithSoundBrickStageTest.java index 93171703bf7..fe6d2d3ab7d 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SceneTransitionWithSoundBrickStageTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SceneTransitionWithSoundBrickStageTest.java @@ -41,6 +41,7 @@ import org.catrobat.catroid.stage.StageActivity; import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.After; import org.junit.Before; @@ -52,7 +53,6 @@ import java.io.File; import java.io.IOException; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; @@ -128,19 +128,14 @@ private MediaPlayer getMediaplayer() { } private void createProject(String projectName) throws IOException { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Script script = new StartScript(); - Sprite sprite = project.getDefaultScene().getBackgroundSprite(); + Project project = UiTestUtils.createDefaultTestProject(projectName); + Script script = UiTestUtils.getDefaultTestScript(project); XstreamSerializer.getInstance().saveProject(project); firstSceneName = project.getDefaultScene().getName(); Scene secondScene = new Scene("Scene 2", project); - - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - projectManager.setCurrentProject(project); - projectManager.setCurrentSprite(sprite); project.addScene(secondScene); + PlaySoundBrick soundBrick = new PlaySoundBrick(); soundFile = ResourceImporter.createSoundFileFromResourcesInDirectory( InstrumentationRegistry.getInstrumentation().getContext().getResources(), diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SceneTransitionWithVibrationBrickStageTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SceneTransitionWithVibrationBrickStageTest.java index ce2bda9c589..11cefe3a4a7 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SceneTransitionWithVibrationBrickStageTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SceneTransitionWithVibrationBrickStageTest.java @@ -23,7 +23,6 @@ package org.catrobat.catroid.uiespresso.content.brick.stage; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Scene; import org.catrobat.catroid.content.Script; @@ -33,14 +32,15 @@ import org.catrobat.catroid.content.bricks.VibrationBrick; import org.catrobat.catroid.content.bricks.WaitBrick; import org.catrobat.catroid.stage.StageActivity; +import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static junit.framework.TestCase.assertFalse; @@ -65,7 +65,9 @@ public class SceneTransitionWithVibrationBrickStageTest { @Before public void setUp() throws Exception { - createProject(); + project = UiTestUtils.createDefaultTestProject(TestUtils.DEFAULT_TEST_PROJECT_NAME); + createVibrationScene(); + createCalmScene(); baseActivityTestRule.launchActivity(null); } @@ -82,13 +84,6 @@ public void testVibrationContinueOnSceneTransition() { assertTrue(baseActivityTestRule.getActivity().vibrationManager.hasActiveVibration()); } - private void createProject() { - project = new Project(ApplicationProvider.getApplicationContext(), getClass().getSimpleName()); - ProjectManager.getInstance().setCurrentProject(project); - createVibrationScene(); - createCalmScene(); - } - private void createVibrationScene() { Scene firstScene = project.getDefaultScene(); firstSceneName = firstScene.getName(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SetParticleColorTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SetParticleColorTest.kt index 96b69a9f982..2bcd7bdd486 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SetParticleColorTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/SetParticleColorTest.kt @@ -24,21 +24,19 @@ package org.catrobat.catroid.uiespresso.content.brick.stage import android.content.Intent -import androidx.test.core.app.ApplicationProvider.getApplicationContext import androidx.test.espresso.Espresso.onView import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers.isRoot import org.catrobat.catroid.ProjectManager import org.catrobat.catroid.R -import org.catrobat.catroid.content.Project import org.catrobat.catroid.content.Script import org.catrobat.catroid.content.Sprite -import org.catrobat.catroid.content.StartScript import org.catrobat.catroid.content.bricks.FadeParticleEffectBrick import org.catrobat.catroid.content.bricks.SetParticleColorBrick import org.catrobat.catroid.content.bricks.WaitBrick import org.catrobat.catroid.ui.SpriteActivity +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.actions.CustomActions.wait import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.junit.Assert.assertTrue @@ -74,7 +72,11 @@ class SetParticleColorTest { @Before fun setUp() { - createProject() + script = UiTestUtils.createProjectAndGetStartScript(PROJECT_NAME) + script.addBrick(SetParticleColorBrick(blueString)) + script.addBrick(FadeParticleEffectBrick()) + script.addBrick(WaitBrick(1000)) + script.addBrick(SetParticleColorBrick(greenString)) baseActivityTestRule.launchActivity(Intent()) } @@ -86,22 +88,4 @@ class SetParticleColorTest { onView(isRoot()).perform(wait(1000)) assertTrue(particleColor().contentEquals(greenArray)) } - - private fun createProject() { - val project = Project(getApplicationContext(), PROJECT_NAME) - script = StartScript() - script.addBrick(SetParticleColorBrick(blueString)) - script.addBrick(FadeParticleEffectBrick()) - script.addBrick(WaitBrick(1000)) - script.addBrick(SetParticleColorBrick(greenString)) - - sprite = Sprite("sprite") - sprite.addScript(script) - - project.defaultScene.addSprite(sprite) - - projectManager.currentProject = project - projectManager.currentSprite = sprite - projectManager.currentlyEditedScene = project.defaultScene - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/StartListeningStageTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/StartListeningStageTest.kt index c562c164e2f..64ec166d8b8 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/StartListeningStageTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/StartListeningStageTest.kt @@ -29,10 +29,7 @@ import androidx.test.core.app.ApplicationProvider import androidx.test.espresso.Espresso.onView import androidx.test.espresso.matcher.ViewMatchers.isRoot import androidx.test.rule.GrantPermissionRule -import org.catrobat.catroid.ProjectManager import org.catrobat.catroid.content.Project -import org.catrobat.catroid.content.Sprite -import org.catrobat.catroid.content.StartScript import org.catrobat.catroid.content.bricks.StartListeningBrick import org.catrobat.catroid.formulaeditor.UserVariable import org.catrobat.catroid.stage.StageActivity @@ -40,6 +37,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat.CatrobatLanguage import org.catrobat.catroid.testsuites.annotations.Cat.SensorBox import org.catrobat.catroid.testsuites.annotations.Cat.SettingsAndPermissions import org.catrobat.catroid.testsuites.annotations.Level.Functional +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.actions.CustomActions import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule import org.junit.Assert.assertEquals @@ -97,18 +95,10 @@ class StartListeningStageTest { } private fun createProject(projectName: String) { - project = Project(ApplicationProvider.getApplicationContext(), projectName) - val sprite = Sprite("testSprite") - - val startScript = StartScript() + project = UiTestUtils.createDefaultTestProject(projectName) + val startScript = UiTestUtils.getDefaultTestScript(project) val userVariable = UserVariable(userVariableName) startScript.addBrick(StartListeningBrick(userVariable)) - sprite.addScript(startScript) - - project.defaultScene.addSprite(sprite) - ProjectManager.getInstance().currentProject = project - ProjectManager.getInstance().currentSprite = sprite - project.addUserVariable(userVariable) } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/TextDetectionResourceTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/TextDetectionResourceTest.kt index 04ebb28323b..fc1c7995cd7 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/TextDetectionResourceTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/TextDetectionResourceTest.kt @@ -40,8 +40,8 @@ import org.catrobat.catroid.testsuites.annotations.Cat.AppUi import org.catrobat.catroid.testsuites.annotations.Cat.Quarantine import org.catrobat.catroid.testsuites.annotations.Level.Functional import org.catrobat.catroid.ui.SpriteActivity -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue @@ -109,7 +109,7 @@ class TextDetectionResourceTest { private fun createProject(type: FormulaElement.ElementType, value: String) { formula = Formula(FormulaElement(type, value, null)) - val script = BrickTestUtils.createProjectAndGetStartScript("TextDetectionResourceTest") + val script = UiTestUtils.createProjectAndGetStartScript("TextDetectionResourceTest") .also { it.addBrick(SetSizeToBrick(formula)) } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ThinkBubbleBrickStageTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ThinkBubbleBrickStageTest.java index 7ceef9fbb4f..0a3f2a1539e 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ThinkBubbleBrickStageTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ThinkBubbleBrickStageTest.java @@ -23,16 +23,15 @@ package org.catrobat.catroid.uiespresso.content.brick.stage; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.ThinkBubbleBrick; import org.catrobat.catroid.stage.StageActivity; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -40,7 +39,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static junit.framework.Assert.assertNotNull; @@ -56,7 +54,7 @@ public class ThinkBubbleBrickStageTest { @Before public void setUp() throws Exception { - createProject("thinkBubbleBrickTest"); + createProject(); baseActivityTestRule.launchActivity(null); } @@ -67,17 +65,11 @@ public void thinkBubbleBrickStageTest() { assertNotNull(StageActivity.stageListener.getBubbleActorForSprite(sprite)); } - private void createProject(String projectName) { - String thinkString = "say something"; - - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - sprite = new Sprite("testSprite"); - Script script = new StartScript(); - script.addBrick(new ThinkBubbleBrick(thinkString)); - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); + private void createProject() { + Project project = UiTestUtils.createDefaultTestProject("thinkBubbleBrickTest"); + Script script = UiTestUtils.getDefaultTestScript(project); + sprite = UiTestUtils.getDefaultTestSprite(project); + script.addBrick(new ThinkBubbleBrick("say something")); lastBrickInScript = ScriptEvaluationGateBrick.appendToScript(script); } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ThinkForBubbleBrickStageTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ThinkForBubbleBrickStageTest.java index f90b32d69d6..228a595a8e9 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ThinkForBubbleBrickStageTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/ThinkForBubbleBrickStageTest.java @@ -23,7 +23,6 @@ package org.catrobat.catroid.uiespresso.content.brick.stage; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; @@ -36,6 +35,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -43,7 +43,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static junit.framework.Assert.assertNotNull; @@ -68,7 +67,7 @@ public class ThinkForBubbleBrickStageTest { @Before public void setUp() throws Exception { - createProject("thinkBubbleBrickTest"); + createProject(); baseActivityTestRule.launchActivity(null); } @@ -85,18 +84,12 @@ public void thinkForBubbleBrickStageTest() { assertNull(StageActivity.stageListener.getBubbleActorForSprite(sprite)); } - private void createProject(String projectName) { - String sayString = "think something"; - float duration = 2f; - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - sprite = new Sprite("testSprite"); - Script script = new WhenTouchDownScript(); - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); + private void createProject() { + Project project = UiTestUtils.createProjectWithCustomScript("thinkBubbleBrickTest", new WhenTouchDownScript()); + Script script = UiTestUtils.getDefaultTestScript(project); + sprite = UiTestUtils.getDefaultTestSprite(project); - script.addBrick(new ThinkForBubbleBrick(sayString, duration)); + script.addBrick(new ThinkForBubbleBrick("think something", 2f)); lastBrickInScript = ScriptEvaluationGateBrick.appendToScript(script); Script whenStarted = new StartScript(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/VibrationBrickStageTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/VibrationBrickStageTest.java index fefa55d81be..d8406c6c6ee 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/VibrationBrickStageTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/VibrationBrickStageTest.java @@ -29,7 +29,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.hardware.SensorTestArduinoServerConnection; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; @@ -55,7 +55,7 @@ public class VibrationBrickStageTest { @Before public void setUp() throws Exception { vibrationBrickPosition = 1; - Script script = BrickTestUtils.createProjectAndGetStartScript("vibrationBrickTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("vibrationBrickTest"); script.addBrick(new VibrationBrick()); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/WhenNfcBrickHardwareStageTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/WhenNfcBrickHardwareStageTest.java index 592b6ea039a..cc4161987e6 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/WhenNfcBrickHardwareStageTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/WhenNfcBrickHardwareStageTest.java @@ -23,10 +23,8 @@ package org.catrobat.catroid.uiespresso.content.brick.stage; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.content.Project; -import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.content.WhenNfcScript; import org.catrobat.catroid.content.bricks.ChangeVariableBrick; import org.catrobat.catroid.content.bricks.SetVariableBrick; @@ -38,6 +36,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.hardware.SensorTestArduinoServerConnection; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; @@ -46,7 +45,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; @@ -84,7 +82,9 @@ public void setUp() throws Exception { } private void createProjectWithNfcAndSetVariable() { - Project project = new Project(ApplicationProvider.getApplicationContext(), "whenNfcBrickHardwareTest"); + Project project = UiTestUtils.createProjectWithCustomScript("whenNfcBrickHardwareTest", + new WhenNfcScript()); + WhenNfcScript script = (WhenNfcScript) UiTestUtils.getDefaultTestScript(project); numDetectedTags = new UserVariable(NUM_DETECTED_TAGS); readTagId = new UserVariable(READ_TAG_ID); @@ -94,8 +94,6 @@ private void createProjectWithNfcAndSetVariable() { project.addUserVariable(readTagId); project.addUserVariable(readTagMessage); - Sprite sprite = new Sprite("testSprite"); - WhenNfcScript script = new WhenNfcScript(); ChangeVariableBrick changeVariableBrickNumDetectedTags = new ChangeVariableBrick(new Formula(1), numDetectedTags); script.addBrick(changeVariableBrickNumDetectedTags); @@ -107,11 +105,6 @@ private void createProjectWithNfcAndSetVariable() { setVariableBrickMessage.setUserVariable(readTagMessage); script.addBrick(setVariableBrickMessage); - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - numDetectedTags.setValue(0); whenNfcBrickPosition = 0; } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/WhenNfcBrickStageFromScriptTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/WhenNfcBrickStageFromScriptTest.java index a6f915f9359..8f7a02ea8c6 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/WhenNfcBrickStageFromScriptTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/WhenNfcBrickStageFromScriptTest.java @@ -31,7 +31,6 @@ import org.catrobat.catroid.common.NfcTagData; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; -import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.content.WhenNfcScript; import org.catrobat.catroid.content.bricks.ChangeVariableBrick; import org.catrobat.catroid.content.bricks.SetVariableBrick; @@ -43,6 +42,7 @@ import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; import org.catrobat.catroid.uiespresso.content.brick.utils.UiNFCTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -52,7 +52,6 @@ import java.util.List; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static junit.framework.Assert.assertEquals; @@ -148,8 +147,9 @@ private void gotoNfcFragment(int nfcBrickPosition) { .perform(click()); } - private Script createProjectWithNfcAndSetVariable() { - Project project = new Project(ApplicationProvider.getApplicationContext(), "nfcTestProject"); + private void createProjectWithNfcAndSetVariable() { + Project project = UiTestUtils.createProjectWithCustomScript("nfcTestProject", new WhenNfcScript()); + Script script = UiTestUtils.getDefaultTestScript(project); numDetectedTags = new UserVariable(NUM_DETECTED_TAGS); readTagId = new UserVariable(READ_TAG_ID); @@ -159,9 +159,6 @@ private Script createProjectWithNfcAndSetVariable() { project.addUserVariable(readTagId); project.addUserVariable(readTagMessage); - Sprite sprite = new Sprite("testSprite"); - WhenNfcScript script = new WhenNfcScript(); - SetVariableBrick setVariableBrickId = new SetVariableBrick(Sensors.NFC_TAG_ID); setVariableBrickId.setUserVariable(readTagId); script.addBrick(setVariableBrickId); @@ -173,11 +170,6 @@ private Script createProjectWithNfcAndSetVariable() { ChangeVariableBrick changeVariableBrickNumDetectedTags = new ChangeVariableBrick(new Formula(1), numDetectedTags); script.addBrick(changeVariableBrickNumDetectedTags); - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - tagDataList = ProjectManager.getInstance().getCurrentSprite().getNfcTagList(); NfcTagData firstTagData = new NfcTagData(); @@ -193,6 +185,5 @@ private Script createProjectWithNfcAndSetVariable() { numDetectedTags.setValue(0); nfcBrickPosition = 0; scriptUnderTest = script; - return script; } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/WhenNfcBrickStageTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/WhenNfcBrickStageTest.java index a0295b5ac68..bb0ee0a2727 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/WhenNfcBrickStageTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/WhenNfcBrickStageTest.java @@ -42,6 +42,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.uiespresso.content.brick.utils.UiNFCTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -50,8 +51,6 @@ import java.util.List; -import androidx.test.core.app.ApplicationProvider; - import static org.catrobat.catroid.uiespresso.content.brick.utils.UiNFCTestUtils.NUM_DETECTED_TAGS; import static org.catrobat.catroid.uiespresso.content.brick.utils.UiNFCTestUtils.READ_TAG_ID; import static org.catrobat.catroid.uiespresso.content.brick.utils.UiNFCTestUtils.READ_TAG_MESSAGE; @@ -81,7 +80,9 @@ public class WhenNfcBrickStageTest { private WhenNfcScript scriptUnderTest; private WhenNfcScript createProjectWithNfcAndSetVariable() { - Project project = new Project(ApplicationProvider.getApplicationContext(), "nfcStageTestProject"); + Project project = UiTestUtils.createProjectWithCustomScript("nfcStageTestProject", new WhenNfcScript()); + WhenNfcScript script = (WhenNfcScript) UiTestUtils.getDefaultTestScript(project); + Sprite sprite = UiTestUtils.getDefaultTestSprite(project); numDetectedTags = new UserVariable(NUM_DETECTED_TAGS); readTagId = new UserVariable(READ_TAG_ID); @@ -91,9 +92,6 @@ private WhenNfcScript createProjectWithNfcAndSetVariable() { project.addUserVariable(readTagId); project.addUserVariable(readTagMessage); - Sprite sprite = new Sprite("testSprite"); - WhenNfcScript script = new WhenNfcScript(); - SetVariableBrick setVariableBrickId = new SetVariableBrick(Sensors.NFC_TAG_ID); setVariableBrickId.setUserVariable(readTagId); script.addBrick(setVariableBrickId); @@ -106,11 +104,6 @@ private WhenNfcScript createProjectWithNfcAndSetVariable() { numDetectedTags); script.addBrick(changeVariableBrickNumDetectedTags); - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - tagDataList = ProjectManager.getInstance().getCurrentSprite().getNfcTagList(); tagDataList.add(firstTagData); tagDataList.add(secondTagData); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/utils/BrickTestUtils.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/utils/BrickTestUtils.java index bd10833c689..84642c52be8 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/utils/BrickTestUtils.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/utils/BrickTestUtils.java @@ -36,19 +36,6 @@ private BrickTestUtils() { throw new AssertionError(); } - public static Script createProjectAndGetStartScript(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("testSprite"); - Script script = new StartScript(); - - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); - return script; - } - public static Script createEmptyCastProjectAndGetStartScript(String projectName) { Project project = new Project(ApplicationProvider.getApplicationContext(), projectName, false, true); Sprite sprite = new Sprite("testSprite"); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/messagecontainer/BroadcastAndWaitBrickMessageContainerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/messagecontainer/BroadcastAndWaitBrickMessageContainerTest.java index 4a325cbd3de..622849e0b06 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/messagecontainer/BroadcastAndWaitBrickMessageContainerTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/messagecontainer/BroadcastAndWaitBrickMessageContainerTest.java @@ -28,7 +28,6 @@ import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.BroadcastMessageBrick; import org.catrobat.catroid.content.bricks.BroadcastWaitBrick; import org.catrobat.catroid.rules.FlakyTestRule; @@ -37,6 +36,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; import org.junit.Before; @@ -78,7 +78,12 @@ public class BroadcastAndWaitBrickMessageContainerTest { @Before public void setUp() throws Exception { - createProject(this.getClass().getSimpleName()); + project = UiTestUtils.createDefaultTestProject(this.getClass().getSimpleName()); + sprite = UiTestUtils.getDefaultTestSprite(project); + Script script = UiTestUtils.getDefaultTestScript(project); + + broadcastMessageBrick = new BroadcastWaitBrick(defaultMessage); + script.addBrick(broadcastMessageBrick); baseActivityTestRule.launchActivity(); } @@ -129,20 +134,4 @@ public void testBroadcastAndWaitBrickOmitSaveUnusedMessages() { onView(withText(uselessMessage)) .check(doesNotExist()); } - - private void createProject(String projectName) { - project = new Project(ApplicationProvider.getApplicationContext(), projectName); - sprite = new Sprite("testSprite"); - Script script = new StartScript(); - - sprite.addScript(script); - - broadcastMessageBrick = new BroadcastWaitBrick(defaultMessage); - script.addBrick(broadcastMessageBrick); - - project.getDefaultScene().addSprite(sprite); - - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/messagecontainer/BroadcastReceiveBrickMessageContainerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/messagecontainer/BroadcastReceiveBrickMessageContainerTest.java index c2d8bbc41f9..6ef075c6cf8 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/messagecontainer/BroadcastReceiveBrickMessageContainerTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/messagecontainer/BroadcastReceiveBrickMessageContainerTest.java @@ -29,7 +29,6 @@ import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.BroadcastMessageBrick; import org.catrobat.catroid.content.bricks.BroadcastReceiverBrick; import org.catrobat.catroid.rules.FlakyTestRule; @@ -38,6 +37,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; import org.junit.Before; @@ -78,7 +78,12 @@ public class BroadcastReceiveBrickMessageContainerTest { @Before public void setUp() throws Exception { - createProject(this.getClass().getSimpleName()); + project = UiTestUtils.createDefaultTestProject(this.getClass().getSimpleName()); + sprite = UiTestUtils.getDefaultTestSprite(project); + Script script = UiTestUtils.getDefaultTestScript(project); + + broadcastMessageBrick = new BroadcastReceiverBrick(new BroadcastScript(defaultMessage)); + script.addBrick(broadcastMessageBrick); baseActivityTestRule.launchActivity(); } @@ -130,20 +135,4 @@ public void testBroadcastReceiveBrickOmitSaveUnusedMessages() { onView(withText(uselessMessage)) .check(doesNotExist()); } - - private void createProject(String projectName) { - project = new Project(ApplicationProvider.getApplicationContext(), projectName); - sprite = new Sprite("testSprite"); - Script script = new StartScript(); - - sprite.addScript(script); - - broadcastMessageBrick = new BroadcastReceiverBrick(new BroadcastScript(defaultMessage)); - script.addBrick(broadcastMessageBrick); - - project.getDefaultScene().addSprite(sprite); - - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/messagecontainer/BroadcastSendBrickMessageContainerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/messagecontainer/BroadcastSendBrickMessageContainerTest.java index 2405e07f0bb..b7cb2a40f07 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/messagecontainer/BroadcastSendBrickMessageContainerTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/messagecontainer/BroadcastSendBrickMessageContainerTest.java @@ -28,7 +28,6 @@ import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.BroadcastBrick; import org.catrobat.catroid.content.bricks.BroadcastMessageBrick; import org.catrobat.catroid.rules.FlakyTestRule; @@ -37,6 +36,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; import org.junit.Before; @@ -63,7 +63,7 @@ @RunWith(AndroidJUnit4.class) public class BroadcastSendBrickMessageContainerTest { - private String defaultMessage = "defaultMessage"; + private final String defaultMessage = "defaultMessage"; private Project project; private Sprite sprite; private BroadcastMessageBrick broadcastMessageBrick; @@ -131,18 +131,11 @@ public void testBroadcastSendBrickOmitSaveUnusedMessages() { } private void createProject(String projectName) { - project = new Project(ApplicationProvider.getApplicationContext(), projectName); - sprite = new Sprite("testSprite"); - Script script = new StartScript(); - - sprite.addScript(script); + project = UiTestUtils.createDefaultTestProject(projectName); + sprite = UiTestUtils.getDefaultTestSprite(project); + Script script = UiTestUtils.getDefaultTestScript(project); broadcastMessageBrick = new BroadcastBrick(defaultMessage); script.addBrick(broadcastMessageBrick); - - project.getDefaultScene().addSprite(sprite); - - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorAddVariableTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorAddVariableTest.java index 89aa4bcb559..0c83ffae29e 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorAddVariableTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorAddVariableTest.java @@ -28,8 +28,8 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -56,7 +56,7 @@ public class FormulaEditorAddVariableTest { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript("FormulaEditorAddVariableTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("FormulaEditorAddVariableTest"); script.addBrick(new ChangeSizeByNBrick(0)); baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorBrickViewOnClickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorBrickViewOnClickTest.java index 3a8cc7f3624..5e5c22319c8 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorBrickViewOnClickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorBrickViewOnClickTest.java @@ -28,8 +28,9 @@ import org.catrobat.catroid.content.bricks.Brick; import org.catrobat.catroid.content.bricks.ShowTextBrick; import org.catrobat.catroid.formulaeditor.Formula; +import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -65,7 +66,10 @@ public class FormulaEditorBrickViewOnClickTest { @Before public void setUp() throws Exception { - createProject(); + Script script = + UiTestUtils.createProjectAndGetStartScript(TestUtils.DEFAULT_TEST_PROJECT_NAME); + showTextBrick = new ShowTextBrick(new Formula(100), new Formula(200)); + script.addBrick(showTextBrick); baseActivityTestRule.launchActivity(); } @@ -103,12 +107,6 @@ public void checkSwitchBetweenBrickFields() { .getTrimmedFormulaString(ApplicationProvider.getApplicationContext())); } - private void createProject() { - Script script = BrickTestUtils.createProjectAndGetStartScript(getClass().getSimpleName()); - showTextBrick = new ShowTextBrick(new Formula(100), new Formula(200)); - script.addBrick(showTextBrick); - } - private void chooseEditFormulaDialogOption() { onView(withText(R.string.brick_context_dialog_formula_edit_brick)) .perform(click()); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorDeleteVariableTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorDeleteVariableTest.java index 47edf351cdf..f852e53a9aa 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorDeleteVariableTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorDeleteVariableTest.java @@ -29,6 +29,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -36,7 +37,6 @@ import org.junit.experimental.categories.Category; import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; -import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript; import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper.onDataList; import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor; import static org.catrobat.catroid.uiespresso.ui.actionbar.utils.ActionModeWrapper.onActionMode; @@ -58,7 +58,8 @@ public class FormulaEditorDeleteVariableTest { @Before public void setUp() throws Exception { - Script script = createProjectAndGetStartScript("FormulaEditorDeleteVariableTest"); + Script script = UiTestUtils.createProjectAndGetStartScript( + "FormulaEditorDeleteVariableTest"); script.addBrick(new ChangeSizeByNBrick(0)); baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorEditTextTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorEditTextTest.java index 6efd615f1a2..425c96ee048 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorEditTextTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorEditTextTest.java @@ -30,7 +30,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.actions.CustomActions; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; @@ -71,7 +71,7 @@ public class FormulaEditorEditTextTest { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript("FormulaEditorEditTextTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("FormulaEditorEditTextTest"); script.addBrick(new ChangeSizeByNBrick(new Formula(10))); baseActivityTestRule.launchActivity(); onBrickAtPosition(1) diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorEditVariableTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorEditVariableTest.java index dac50c54ff1..cd51e1591e7 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorEditVariableTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorEditVariableTest.java @@ -29,7 +29,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -54,7 +54,7 @@ public class FormulaEditorEditVariableTest { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript("FormulaEditorEditVariableTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("FormulaEditorEditVariableTest"); script.addBrick(new ChangeSizeByNBrick(0)); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorFragmentHelpUrlTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorFragmentHelpUrlTest.java index 781345fb3a1..77f24559de5 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorFragmentHelpUrlTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorFragmentHelpUrlTest.java @@ -26,20 +26,20 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.SetVariableBrick; import org.catrobat.catroid.formulaeditor.Formula; import org.catrobat.catroid.formulaeditor.UserVariable; +import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; import org.catrobat.catroid.ui.recyclerview.fragment.CategoryListFragment; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -84,7 +84,19 @@ public class FormulaEditorFragmentHelpUrlTest { @Before public void setUp() throws Exception { - createProject("FormulaEditorFragmentHelpUrlTest"); + Project project = UiTestUtils.createDefaultTestProject("FormulaEditorFragmentHelpUrlTest"); + Sprite sprite = project.getDefaultScene().getSprite(TestUtils.DEFAULT_TEST_SPRITE_NAME); + Script script = sprite.getScript(TestUtils.DEFAULT_TEST_SCRIPT_INDEX); + + SetVariableBrick setVariableBrick = new SetVariableBrick(new Formula(1), new UserVariable("var")); + UserVariable userVariable = new UserVariable("Global1"); + project.addUserVariable(userVariable); + setVariableBrick.setUserVariable(userVariable); + + script.addBrick(setVariableBrick); + sprite.addScript(script); + project.getDefaultScene().addSprite(sprite); + baseActivityTestRule.launchActivity(); } @@ -128,26 +140,6 @@ public void testObjectHelpUrl() { assertEquals(objectHelpUrl, helpUrl); } - public Project createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("testSprite"); - Script script = new StartScript(); - - SetVariableBrick setVariableBrick = new SetVariableBrick(new Formula(1), new UserVariable("var")); - UserVariable userVariable = new UserVariable("Global1"); - project.addUserVariable(userVariable); - setVariableBrick.setUserVariable(userVariable); - - script.addBrick(setVariableBrick); - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - - return project; - } - public static String getLanguage() { String language = "?language="; SharedPreferences sharedPreferences = PreferenceManager diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorFragmentTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorFragmentTest.java index 75f0e813c2e..4c82a9a7847 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorFragmentTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorFragmentTest.java @@ -22,17 +22,16 @@ */ package org.catrobat.catroid.uiespresso.formulaeditor; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.SetVariableBrick; import org.catrobat.catroid.formulaeditor.Formula; import org.catrobat.catroid.formulaeditor.UserVariable; import org.catrobat.catroid.rules.FlakyTestRule; import org.catrobat.catroid.runner.Flaky; +import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; @@ -45,7 +44,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; @@ -71,7 +69,19 @@ public class FormulaEditorFragmentTest { @Before public void setUp() throws Exception { - createProject("formulaEditorFragmentTest"); + Project project = UiTestUtils.createDefaultTestProject("formulaEditorFragmentTest"); + Sprite sprite = project.getDefaultScene().getSprite(TestUtils.DEFAULT_TEST_SPRITE_NAME); + Script script = sprite.getScript(TestUtils.DEFAULT_TEST_SCRIPT_INDEX); + + SetVariableBrick setVariableBrick = new SetVariableBrick(new Formula(1), new UserVariable("var")); + UserVariable userVariable = new UserVariable("Global1"); + project.addUserVariable(userVariable); + setVariableBrick.setUserVariable(userVariable); + + script.addBrick(setVariableBrick); + sprite.addScript(script); + project.getDefaultScene().addSprite(sprite); + baseActivityTestRule.launchActivity(); } @@ -158,24 +168,4 @@ public void testRedo() { @After public void tearDown() throws Exception { } - - public Project createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("testSprite"); - Script script = new StartScript(); - - SetVariableBrick setVariableBrick = new SetVariableBrick(new Formula(1), new UserVariable("var")); - UserVariable userVariable = new UserVariable("Global1"); - project.addUserVariable(userVariable); - setVariableBrick.setUserVariable(userVariable); - - script.addBrick(setVariableBrick); - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - - return project; - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorFunctionListTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorFunctionListTest.java index ae824a20e1e..8bbb2d814ff 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorFunctionListTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorFunctionListTest.java @@ -29,7 +29,6 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper; import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; @@ -109,7 +108,7 @@ public static Iterable data() { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript("FormulaEditorFunctionListTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("FormulaEditorFunctionListTest"); script.addBrick(new ChangeSizeByNBrick(0)); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorKeyboardTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorKeyboardTest.java index ea16fafa624..add8b9bfdb9 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorKeyboardTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorKeyboardTest.java @@ -24,12 +24,10 @@ import android.app.Activity; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.SetVariableBrick; import org.catrobat.catroid.formulaeditor.UserVariable; import org.catrobat.catroid.test.utils.TestUtils; @@ -48,7 +46,6 @@ import java.io.IOException; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.matcher.ViewMatchers; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -75,7 +72,19 @@ public class FormulaEditorKeyboardTest { @Before public void setUp() throws Exception { - createProject(); + Project project = UiTestUtils.createDefaultTestProject(PROJECT_NAME); + Sprite sprite = project.getDefaultScene().getSprite(TestUtils.DEFAULT_TEST_SPRITE_NAME); + Script script = sprite.getScript(TestUtils.DEFAULT_TEST_SCRIPT_INDEX); + + SetVariableBrick setVariableBrick = new SetVariableBrick(); + UserVariable userVariable = new UserVariable("Global1"); + project.addUserVariable(userVariable); + setVariableBrick.setUserVariable(userVariable); + + script.addBrick(setVariableBrick); + sprite.addScript(script); + project.getDefaultScene().addSprite(sprite); + baseActivityTestRule.launchActivity(); } @@ -183,24 +192,4 @@ public void tearDown() throws IOException { baseActivityTestRule.finishActivity(); TestUtils.deleteProjects(PROJECT_NAME); } - - public Project createProject() { - Project project = new Project(ApplicationProvider.getApplicationContext(), PROJECT_NAME); - Sprite sprite = new Sprite("testSprite"); - Script script = new StartScript(); - - SetVariableBrick setVariableBrick = new SetVariableBrick(); - UserVariable userVariable = new UserVariable("Global1"); - project.addUserVariable(userVariable); - setVariableBrick.setUserVariable(userVariable); - - script.addBrick(setVariableBrick); - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - - return project; - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorMovementPropertiesTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorMovementPropertiesTest.java index 0b687c4a55a..002fa71ecfb 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorMovementPropertiesTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorMovementPropertiesTest.java @@ -28,8 +28,8 @@ import org.catrobat.catroid.content.bricks.ChangeSizeByNBrick; import org.catrobat.catroid.formulaeditor.Formula; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -56,7 +56,7 @@ public class FormulaEditorMovementPropertiesTest { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript(this.getClass().getName()); + Script script = UiTestUtils.createProjectAndGetStartScript(this.getClass().getName()); script.addBrick(new ChangeSizeByNBrick(new Formula(10))); baseActivityTestRule.launchActivity(); onBrickAtPosition(1) diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorMultiplayerVariablesTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorMultiplayerVariablesTest.java index 69a731ba18d..958769e7b19 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorMultiplayerVariablesTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorMultiplayerVariablesTest.java @@ -34,6 +34,7 @@ import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; import org.catrobat.catroid.ui.settingsfragments.SettingsFragment; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.hamcrest.Matcher; import org.junit.Before; @@ -43,7 +44,6 @@ import static org.catrobat.catroid.ui.SpriteActivity.EXTRA_FRAGMENT_POSITION; import static org.catrobat.catroid.ui.SpriteActivity.FRAGMENT_SCRIPTS; -import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript; import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor; import static org.hamcrest.CoreMatchers.not; @@ -63,7 +63,8 @@ public class FormulaEditorMultiplayerVariablesTest { @Before public void setUp() throws Exception { - Script script = createProjectAndGetStartScript(FormulaEditorMultiplayerVariablesTest.class.getSimpleName()); + Script script = + UiTestUtils.createProjectAndGetStartScript(FormulaEditorMultiplayerVariablesTest.class.getSimpleName()); script.addBrick(new ChangeSizeByNBrick(0)); baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorRegexAssistantTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorRegexAssistantTest.java index 30fc5d4eecd..40a8c29c2d1 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorRegexAssistantTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorRegexAssistantTest.java @@ -27,7 +27,6 @@ import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.bricks.SetVariableBrick; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper; import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; @@ -55,7 +54,7 @@ public class FormulaEditorRegexAssistantTest { @Before public void setUp() { - Script script = BrickTestUtils.createProjectAndGetStartScript( + Script script = UiTestUtils.createProjectAndGetStartScript( "FormulaEditorRegExDetectionTest"); script.addBrick(new SetVariableBrick(0)); //standard value of editor field is 123 baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorRegexDetectionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorRegexDetectionTest.java index ed9beab4ac2..9c7a98b773d 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorRegexDetectionTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorRegexDetectionTest.java @@ -27,7 +27,6 @@ import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.bricks.SetVariableBrick; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper; import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; @@ -58,7 +57,7 @@ public class FormulaEditorRegexDetectionTest { @Before public void setUp() { - Script script = BrickTestUtils.createProjectAndGetStartScript( + Script script = UiTestUtils.createProjectAndGetStartScript( "FormulaEditorRegExDetectionTest"); script.addBrick(new SetVariableBrick(0)); baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorRenameVariableTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorRenameVariableTest.java index a8ec3eb8aa1..a7da21b40f0 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorRenameVariableTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorRenameVariableTest.java @@ -29,8 +29,8 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -55,7 +55,7 @@ public class FormulaEditorRenameVariableTest { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript("FormulaEditorRenameVariableTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("FormulaEditorRenameVariableTest"); script.addBrick(new ChangeSizeByNBrick(0)); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorSortDataListTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorSortDataListTest.kt index e8f613792d8..1e7f2cbbe41 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorSortDataListTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorSortDataListTest.kt @@ -44,11 +44,11 @@ import org.catrobat.catroid.testsuites.annotations.Level.Smoke import org.catrobat.catroid.ui.SpriteActivity import org.catrobat.catroid.ui.recyclerview.adapter.DataListAdapter import org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper.onDataList import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor import org.catrobat.catroid.uiespresso.ui.fragment.rvutils.RecyclerViewInteractionWrapper.onRecyclerView +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.hamcrest.Description import org.hamcrest.Matcher @@ -86,7 +86,7 @@ class FormulaEditorSortDataListTest { .putBoolean(SORT_VARIABLE_PREFERENCE_KEY, false) .apply() - val script = createProjectAndGetStartScript("FormulaEditorEditVariableTest") + val script = UiTestUtils.createProjectAndGetStartScript("FormulaEditorEditVariableTest") script.addBrick(ChangeSizeByNBrick(0.0)) baseActivityTestRule.launchActivity() diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorTest.java index 13f99864a22..46f29bc1ea6 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorTest.java @@ -22,17 +22,17 @@ */ package org.catrobat.catroid.uiespresso.formulaeditor; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.SetVariableBrick; import org.catrobat.catroid.formulaeditor.UserVariable; +import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; import org.junit.Before; @@ -41,7 +41,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor; @@ -60,7 +59,19 @@ public class FormulaEditorTest { @Before public void setUp() throws Exception { - createProject("formulaEditorInputTest"); + Project project = UiTestUtils.createDefaultTestProject("formulaEditorInputTest"); + Sprite sprite = UiTestUtils.getDefaultTestSprite(project); + Script script = sprite.getScript(TestUtils.DEFAULT_TEST_SCRIPT_INDEX); + + SetVariableBrick setVariableBrick = new SetVariableBrick(); + UserVariable userVariable = new UserVariable("Global1"); + project.addUserVariable(userVariable); + setVariableBrick.setUserVariable(userVariable); + + script.addBrick(setVariableBrick); + sprite.addScript(script); + project.getDefaultScene().addSprite(sprite); + baseActivityTestRule.launchActivity(); } @@ -79,24 +90,4 @@ public void numericValuesTest() { @After public void tearDown() throws Exception { } - - public static Project createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("testSprite"); - Script script = new StartScript(); - - SetVariableBrick setVariableBrick = new SetVariableBrick(); - UserVariable userVariable = new UserVariable("Global1"); - project.addUserVariable(userVariable); - setVariableBrick.setUserVariable(userVariable); - - script.addBrick(setVariableBrick); - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - - return project; - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorTouchesActorOrObjectTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorTouchesActorOrObjectTest.kt index 898e074afba..0220920aef0 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorTouchesActorOrObjectTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorTouchesActorOrObjectTest.kt @@ -44,10 +44,10 @@ import org.catrobat.catroid.ui.MainMenuActivity import org.catrobat.catroid.ui.settingsfragments.SettingsFragment import org.catrobat.catroid.ui.settingsfragments.SettingsFragment.setLanguageSharedPreference import org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorCategoryListWrapper.onCategoryList import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule import org.hamcrest.Matchers import org.junit.After @@ -88,7 +88,7 @@ class FormulaEditorTouchesActorOrObjectTest { setLanguageSharedPreference(applicationContext, "en") - val script = createProjectAndGetStartScript(projectName) + val script = UiTestUtils.createProjectAndGetStartScript(projectName) script.addBrick(ChangeSizeByNBrick(0.0)) baseActivityTestRule.launchActivity(null) diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorUndoTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorUndoTest.java index 8eddcc00ac9..6882a8c87c6 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorUndoTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorUndoTest.java @@ -34,7 +34,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; import org.junit.Before; @@ -86,7 +86,7 @@ public void tearDown() throws Exception { @Before public void setUp() throws Exception { brickPosition = 1; - Script script = BrickTestUtils.createProjectAndGetStartScript(FormulaEditorUndoTest.class.getName()); + Script script = UiTestUtils.createProjectAndGetStartScript(FormulaEditorUndoTest.class.getName()); script.addBrick(new PlaceAtBrick()); userVariable = new UserVariable(VARIABLE_NAME, VARIABLE_VALUE); ProjectManager.getInstance().getCurrentProject().addUserVariable(userVariable); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorUserDefinedBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorUserDefinedBrickTest.java index 2808689b122..77ceda2a8e8 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorUserDefinedBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorUserDefinedBrickTest.java @@ -29,7 +29,7 @@ import org.catrobat.catroid.formulaeditor.Formula; import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.catrobat.catroid.userbrick.UserDefinedBrickInput; import org.catrobat.catroid.userbrick.UserDefinedBrickLabel; @@ -70,7 +70,12 @@ public void tearDown() throws Exception { @Before public void setUp() throws Exception { - createProject(); + Script script = UiTestUtils.createProjectAndGetStartScript(FormulaEditorUserDefinedBrickTest.class.getSimpleName()); + userDefinedBrick = new UserDefinedBrick(asList(input, label, secondInput)); + userDefinedBrick.setCallingBrick(true); + userDefinedBrick.getFormulaMap().putIfAbsent(input.getInputFormulaField(), new Formula(100)); + userDefinedBrick.getFormulaMap().putIfAbsent(secondInput.getInputFormulaField(), new Formula(200)); + script.addBrick(userDefinedBrick); baseActivityTestRule.launchActivity(); } @@ -95,15 +100,6 @@ public void testSwitchBetweenFormulaFields() throws Throwable { .getTrimmedFormulaString(ApplicationProvider.getApplicationContext())); } - private void createProject() { - Script script = BrickTestUtils.createProjectAndGetStartScript(FormulaEditorUserDefinedBrickTest.class.getSimpleName()); - userDefinedBrick = new UserDefinedBrick(asList(input, label, secondInput)); - userDefinedBrick.setCallingBrick(true); - userDefinedBrick.getFormulaMap().putIfAbsent(input.getInputFormulaField(), new Formula(100)); - userDefinedBrick.getFormulaMap().putIfAbsent(secondInput.getInputFormulaField(), new Formula(200)); - script.addBrick(userDefinedBrick); - } - private void clickOnFormulaField(Brick.FormulaField formulaField) throws Throwable { baseActivityTestRule.runOnUiThread(() -> userDefinedBrick.getTextView(formulaField).callOnClick()); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorVariableScopeTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorVariableScopeTest.java index 10ba13a697b..cf128833836 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorVariableScopeTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorVariableScopeTest.java @@ -23,7 +23,6 @@ package org.catrobat.catroid.uiespresso.formulaeditor; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; @@ -88,7 +87,17 @@ public void setUp() throws Exception { SettingsFragment.setMultiplayerVariablesPreferenceEnabled( ApplicationProvider.getApplicationContext(), true); - createProject(FormulaEditorVariableScopeTest.class.getSimpleName()); + Project project = UiTestUtils.createDefaultTestProject("FormulaEditorVariableScopeTest"); + Sprite sprite = UiTestUtils.getDefaultTestSprite(project); + + UserDefinedBrick userDefinedBrick = new UserDefinedBrick(asList(input, label, secondInput)); + Script userDefinedScript = new UserDefinedScript(); + userDefinedScript.setScriptBrick(new UserDefinedReceiverBrick(userDefinedBrick)); + userDefinedScript.addBrick(new ChangeSizeByNBrick(0)); + Script startScript = new StartScript(); + startScript.addBrick(new SetXBrick(0)); + sprite.addScript(userDefinedScript); + sprite.addScript(startScript); baseActivityTestRule.launchActivity(); } @@ -159,26 +168,4 @@ private void openFormulaEditorOnBrickField(int brickFieldId) { onFormulaEditor() .performOpenDataFragment(); } - - private void createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - ProjectManager projectManager = ProjectManager.getInstance(); - - Sprite sprite = new Sprite("Sprite1"); - UserDefinedBrick userDefinedBrick = new UserDefinedBrick(asList(input, label, secondInput)); - - Script userDefinedScript = new UserDefinedScript(); - userDefinedScript.setScriptBrick(new UserDefinedReceiverBrick(userDefinedBrick)); - userDefinedScript.addBrick(new ChangeSizeByNBrick(0)); - - Script startScript = new StartScript(); - startScript.addBrick(new SetXBrick(0)); - - sprite.addScript(userDefinedScript); - sprite.addScript(startScript); - - project.getDefaultScene().addSprite(sprite); - projectManager.setCurrentProject(project); - projectManager.setCurrentSprite(sprite); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/gallery/LookFromGalleryIntentDismissTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/gallery/LookFromGalleryIntentDismissTest.java index a32366c974c..c5d08a2c5bc 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/gallery/LookFromGalleryIntentDismissTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/gallery/LookFromGalleryIntentDismissTest.java @@ -28,11 +28,7 @@ import android.app.Instrumentation; import android.content.Intent; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; -import org.catrobat.catroid.content.Project; -import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.io.XstreamSerializer; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; @@ -46,7 +42,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.intent.Intents; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.rule.GrantPermissionRule; @@ -81,7 +76,7 @@ public class LookFromGalleryIntentDismissTest { @Before public void setUp() throws Exception { - createProject(projectName); + UiTestUtils.createDefaultTestProject(projectName); baseActivityTestRule.launchActivity(); Intents.init(); @@ -121,15 +116,4 @@ public void testLookFromGalleryIntentDismissTest() { onRecyclerView().checkHasNumberOfItems(0); } - - private void createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("testSprite"); - - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); - XstreamSerializer.getInstance().saveProject(project); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/gallery/LookFromGalleryIntentTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/gallery/LookFromGalleryIntentTest.java index 6f8e35d02fc..0ec506bdb5f 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/gallery/LookFromGalleryIntentTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/gallery/LookFromGalleryIntentTest.java @@ -30,11 +30,9 @@ import android.net.Uri; import android.util.Log; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.common.Constants; import org.catrobat.catroid.content.Project; -import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.io.ResourceImporter; import org.catrobat.catroid.io.StorageOperations; import org.catrobat.catroid.io.XstreamSerializer; @@ -54,7 +52,6 @@ import java.io.File; import java.io.IOException; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.intent.Intents; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; @@ -96,7 +93,8 @@ public class LookFromGalleryIntentTest { @Before public void setUp() throws Exception { - createProject(projectName); + Project project = UiTestUtils.createDefaultTestProject(projectName); + XstreamSerializer.getInstance().saveProject(project); baseActivityTestRule.launchActivity(); Intents.init(); @@ -157,15 +155,4 @@ public void testLookFromGalleryIntentTest() { onRecyclerView().atPosition(0).onChildView(R.id.title_view) .check(matches(withText(lookFileName.replace(".png", "")))); } - - private void createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("testSprite"); - - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); - XstreamSerializer.getInstance().saveProject(project); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintEditLookIntentTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintEditLookIntentTest.java index cb5d78741c5..bbc5fa7f10c 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintEditLookIntentTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintEditLookIntentTest.java @@ -33,13 +33,13 @@ import org.catrobat.catroid.common.Constants; import org.catrobat.catroid.common.LookData; import org.catrobat.catroid.content.Project; -import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.io.ResourceImporter; import org.catrobat.catroid.io.StorageOperations; import org.catrobat.catroid.io.XstreamSerializer; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.hamcrest.Matcher; import org.junit.After; @@ -53,7 +53,6 @@ import java.io.IOException; import java.util.List; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.intent.Intents; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; @@ -134,13 +133,7 @@ public void testOpenPaintroid() { } private Project createProject(String projectName) throws IOException { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - - Sprite sprite = new Sprite("testSprite"); - project.getDefaultScene().addSprite(sprite); - - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); + Project project = UiTestUtils.createDefaultTestProject(projectName); XstreamSerializer.getInstance().saveProject(project); File imageFile = ResourceImporter.createImageFileFromResourcesInDirectory( diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintNewLookDiscardIntentTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintNewLookDiscardIntentTest.java index fc3f9bfcb3c..346e7302b82 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintNewLookDiscardIntentTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintNewLookDiscardIntentTest.java @@ -27,14 +27,12 @@ import android.app.Instrumentation; import android.content.Intent; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.common.Constants; -import org.catrobat.catroid.content.Project; -import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.hamcrest.Matcher; import org.junit.After; @@ -44,7 +42,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.intent.Intents; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -74,7 +71,7 @@ public class PocketPaintNewLookDiscardIntentTest { @Before public void setUp() throws Exception { - createProject(projectName); + UiTestUtils.createDefaultTestProject(projectName); baseActivityTestRule.launchActivity(); Intents.init(); @@ -110,13 +107,4 @@ public void testCancelImport() { onRecyclerView().checkHasNumberOfItems(0); } - - private void createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite testSprite = new Sprite(); - project.getDefaultScene().addSprite(testSprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(testSprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintNewLookIntentTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintNewLookIntentTest.java index ecfd10011f2..6d26d7b0f58 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintNewLookIntentTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintNewLookIntentTest.java @@ -27,16 +27,15 @@ import android.app.Instrumentation; import android.util.Log; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.common.Constants; import org.catrobat.catroid.content.Project; -import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.io.StorageOperations; import org.catrobat.catroid.io.XstreamSerializer; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.hamcrest.Matcher; import org.junit.After; @@ -49,7 +48,6 @@ import java.io.File; import java.io.IOException; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.intent.Intents; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -83,7 +81,8 @@ public class PocketPaintNewLookIntentTest { @Before public void setUp() throws Exception { - createProject(projectName); + Project project = UiTestUtils.createDefaultTestProject(projectName); + XstreamSerializer.getInstance().saveProject(project); baseActivityTestRule.launchActivity(); Intents.init(); @@ -124,15 +123,4 @@ public void testAddNewLook() { onRecyclerView().atPosition(0).onChildView(R.id.title_view) .check(matches(withText(spriteName))); } - - private void createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite(spriteName); - - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); - XstreamSerializer.getInstance().saveProject(project); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/sounds/gallery/SoundFromGalleryIntentDismissTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/sounds/gallery/SoundFromGalleryIntentDismissTest.java index cc191fe2dbe..8d43272f8d6 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/sounds/gallery/SoundFromGalleryIntentDismissTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/sounds/gallery/SoundFromGalleryIntentDismissTest.java @@ -28,11 +28,7 @@ import android.app.Instrumentation; import android.content.Intent; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; -import org.catrobat.catroid.content.Project; -import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.io.XstreamSerializer; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; @@ -48,7 +44,6 @@ import java.io.IOException; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.intent.Intents; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.rule.GrantPermissionRule; @@ -83,7 +78,7 @@ public class SoundFromGalleryIntentDismissTest { @Before public void setUp() throws Exception { - createProject(projectName); + UiTestUtils.createDefaultTestProject(projectName); baseActivityTestRule.launchActivity(); Intents.init(); @@ -123,15 +118,4 @@ public void testSoundFromGalleryIntentDismissTest() { onRecyclerView().checkHasNumberOfItems(0); } - - private void createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("testSprite"); - - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); - XstreamSerializer.getInstance().saveProject(project); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/sounds/gallery/SoundFromGalleryIntentTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/sounds/gallery/SoundFromGalleryIntentTest.java index a36c4a4f10d..d3ce8ed560a 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/sounds/gallery/SoundFromGalleryIntentTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/sounds/gallery/SoundFromGalleryIntentTest.java @@ -30,11 +30,9 @@ import android.net.Uri; import android.util.Log; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.common.Constants; import org.catrobat.catroid.content.Project; -import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.io.ResourceImporter; import org.catrobat.catroid.io.StorageOperations; import org.catrobat.catroid.io.XstreamSerializer; @@ -54,7 +52,6 @@ import java.io.File; import java.io.IOException; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.intent.Intents; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; @@ -96,7 +93,8 @@ public class SoundFromGalleryIntentTest { @Before public void setUp() throws Exception { - createProject(projectName); + Project project = UiTestUtils.createDefaultTestProject(projectName); + XstreamSerializer.getInstance().saveProject(project); baseActivityTestRule.launchActivity(); Intents.init(); @@ -156,15 +154,4 @@ public void testSoundFromGalleryIntentTest() { onRecyclerView().atPosition(0).onChildView(R.id.title_view) .check(matches(withText(soundFileName.replace(".mp3", "")))); } - - private void createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("testSprite"); - - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); - XstreamSerializer.getInstance().saveProject(project); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/visualplacement/SpriteActivityVisualPlacementTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/visualplacement/SpriteActivityVisualPlacementTest.java index d91e5f66bd6..2d51e29fa4c 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/visualplacement/SpriteActivityVisualPlacementTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/visualplacement/SpriteActivityVisualPlacementTest.java @@ -32,6 +32,7 @@ import org.catrobat.catroid.formulaeditor.Formula; import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.catrobat.catroid.visualplacement.VisualPlacementActivity; import org.junit.After; @@ -46,7 +47,6 @@ import static org.catrobat.catroid.ui.SpriteActivity.EXTRA_BRICK_HASH; import static org.catrobat.catroid.ui.SpriteActivity.EXTRA_X_TRANSFORM; import static org.catrobat.catroid.ui.SpriteActivity.EXTRA_Y_TRANSFORM; -import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript; import static org.catrobat.catroid.visualplacement.VisualPlacementActivity.CHANGED_COORDINATES; import static org.catrobat.catroid.visualplacement.VisualPlacementActivity.X_COORDINATE_BUNDLE_ARGUMENT; import static org.catrobat.catroid.visualplacement.VisualPlacementActivity.Y_COORDINATE_BUNDLE_ARGUMENT; @@ -80,7 +80,7 @@ public class SpriteActivityVisualPlacementTest { @Before public void setUp() throws Exception { bricktoAdd = new PlaceAtBrick(); - createProjectAndGetStartScript(SpriteActivityVisualPlacementTest.class.getSimpleName()) + UiTestUtils.createProjectAndGetStartScript(SpriteActivityVisualPlacementTest.class.getSimpleName()) .addBrick(bricktoAdd); Intents.init(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/visualplacement/VisualPlacementActivityTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/visualplacement/VisualPlacementActivityTest.java index ae3feed1263..827625ee2ce 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/visualplacement/VisualPlacementActivityTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/visualplacement/VisualPlacementActivityTest.java @@ -27,6 +27,7 @@ import org.catrobat.catroid.R; import org.catrobat.catroid.test.utils.TestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.visualplacement.VisualPlacementActivity; import org.junit.After; import org.junit.Before; @@ -44,7 +45,6 @@ import static org.catrobat.catroid.ui.SpriteActivity.EXTRA_X_TRANSFORM; import static org.catrobat.catroid.ui.SpriteActivity.EXTRA_Y_TRANSFORM; -import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript; import static org.catrobat.catroid.visualplacement.VisualPlacementActivity.X_COORDINATE_BUNDLE_ARGUMENT; import static org.catrobat.catroid.visualplacement.VisualPlacementActivity.Y_COORDINATE_BUNDLE_ARGUMENT; @@ -66,7 +66,7 @@ public class VisualPlacementActivityTest { @Before public void setUp() { - createProjectAndGetStartScript(VisualPlacementActivity.class.getSimpleName()); + UiTestUtils.createProjectAndGetStartScript(VisualPlacementActivity.class.getSimpleName()); Intent intent = new Intent(); intent.putExtra(EXTRA_X_TRANSFORM, XPOS); intent.putExtra(EXTRA_Y_TRANSFORM, YPOS); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/permissions/CameraPermissionSpriteActivityTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/permissions/CameraPermissionSpriteActivityTest.java index 5824a6cb720..705831ee1eb 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/permissions/CameraPermissionSpriteActivityTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/permissions/CameraPermissionSpriteActivityTest.java @@ -27,13 +27,11 @@ import android.app.Instrumentation; import android.content.Intent; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; -import org.catrobat.catroid.content.Project; -import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.hamcrest.Description; import org.hamcrest.Matcher; @@ -48,7 +46,6 @@ import java.util.Arrays; import java.util.List; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.intent.Intents; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; @@ -87,7 +84,7 @@ public class CameraPermissionSpriteActivityTest { @Before public void setUp() throws Exception { - createProject("CameraPermissionSpriteActivityTest"); + UiTestUtils.createDefaultTestProject("CameraPermissionSpriteActivityTest"); device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()); baseActivityTestRule.launchActivity(); @@ -148,15 +145,6 @@ public void testSpriteFromCameraPermission() throws UiObjectNotFoundException { onRecyclerView().checkHasNumberOfItems(0); } - private void createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite testSprite = new Sprite(); - project.getDefaultScene().addSprite(testSprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(testSprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); - } - public static Matcher containsPermissionRequest(final List expectedPermissions) { return new TypeSafeMatcher() { @Override diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/pocketmusic/PocketMusicActivityTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/pocketmusic/PocketMusicActivityTest.java index 4c53d00baa2..aeef4bcda31 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/pocketmusic/PocketMusicActivityTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/pocketmusic/PocketMusicActivityTest.java @@ -137,7 +137,7 @@ public void perform(UiController uiController, View view) { @Before public void startPocketMusicActivityWithEmptyProject() { - UiTestUtils.createEmptyProject("pocketMusicInputTest"); + UiTestUtils.createDefaultTestProject("pocketMusicInputTest"); pocketMusicActivityRule.launchActivity(null); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastAndWaitForDeletedClonesRegressionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastAndWaitForDeletedClonesRegressionTest.java index 70fce837fd2..ce03c2c4a39 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastAndWaitForDeletedClonesRegressionTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastAndWaitForDeletedClonesRegressionTest.java @@ -23,12 +23,10 @@ package org.catrobat.catroid.uiespresso.stage; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.content.BroadcastScript; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.WhenClonedScript; import org.catrobat.catroid.content.bricks.BroadcastWaitBrick; import org.catrobat.catroid.content.bricks.CloneBrick; @@ -37,6 +35,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -44,7 +43,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; @RunWith(AndroidJUnit4.class) @@ -70,15 +68,12 @@ public void testBroadcastsAndWaitToDeletedClones() { } private void createProject() { - Project project = new Project(ApplicationProvider.getApplicationContext(), "BroadcastForDeletedClonesRegressionTest"); - ProjectManager.getInstance().setCurrentProject(project); + Project project = UiTestUtils.createDefaultTestProject("BroadcastForDeletedClonesRegressionTest"); + Script startScript = UiTestUtils.getDefaultTestScript(project); + Sprite sprite = UiTestUtils.getDefaultTestSprite(project); - Sprite sprite = new Sprite("testSprite"); - - Script startScript = new StartScript(); startScript.addBrick(new CloneBrick()); startScript.addBrick(new BroadcastWaitBrick(BROADCAST_MESSAGE_1)); - sprite.addScript(startScript); Script whenStartAsCloneScript = new WhenClonedScript(); whenStartAsCloneScript.addBrick(new DeleteThisCloneBrick()); @@ -87,8 +82,5 @@ private void createProject() { Script broadcastReceiveScript = new BroadcastScript(BROADCAST_MESSAGE_1); sprite.addScript(broadcastReceiveScript); broadCastReceived = ScriptEvaluationGateBrick.appendToScript(broadcastReceiveScript); - - ProjectManager.getInstance().getCurrentlyEditedScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentSprite(sprite); } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastForClonesRegressionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastForClonesRegressionTest.java index f8ae0e2a07a..612aa8e63fd 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastForClonesRegressionTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastForClonesRegressionTest.java @@ -23,13 +23,11 @@ package org.catrobat.catroid.uiespresso.stage; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.content.BroadcastScript; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.BroadcastBrick; import org.catrobat.catroid.content.bricks.ChangeVariableBrick; import org.catrobat.catroid.content.bricks.CloneBrick; @@ -38,6 +36,7 @@ import org.catrobat.catroid.stage.StageActivity; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -45,7 +44,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.IdlingRegistry; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -96,23 +94,17 @@ public void testIfClonesBroadcastReceiversAreRemovedOnRestart() { } private void createProject() { - Project project = new Project(ApplicationProvider.getApplicationContext(), "BroadcastForClonesRegressionTest"); - ProjectManager.getInstance().setCurrentProject(project); + Project project = UiTestUtils.createDefaultTestProject("BroadcastForClonesRegressionTest"); userVariable = new UserVariable(VARIABLE_NAME); project.addUserVariable(userVariable); - Sprite sprite = new Sprite("testSprite"); - - Script startScript = new StartScript(); + Sprite sprite = UiTestUtils.getDefaultTestSprite(project); + Script startScript = UiTestUtils.getDefaultTestScript(project); startScript.addBrick(new CloneBrick()); startScript.addBrick(new BroadcastBrick(BROADCAST_MESSAGE_1)); - sprite.addScript(startScript); Script broadcastReceiveScript = new BroadcastScript(BROADCAST_MESSAGE_1); broadcastReceiveScript.addBrick(new ChangeVariableBrick(new Formula(1), userVariable)); sprite.addScript(broadcastReceiveScript); - - ProjectManager.getInstance().getCurrentlyEditedScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentSprite(sprite); } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastForDeletedClonesRegressionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastForDeletedClonesRegressionTest.java index 8dc04302860..8bfde638b1e 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastForDeletedClonesRegressionTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastForDeletedClonesRegressionTest.java @@ -23,12 +23,10 @@ package org.catrobat.catroid.uiespresso.stage; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.content.BroadcastScript; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.WhenClonedScript; import org.catrobat.catroid.content.bricks.BroadcastBrick; import org.catrobat.catroid.content.bricks.CloneBrick; @@ -37,6 +35,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -44,7 +43,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; @RunWith(AndroidJUnit4.class) @@ -70,15 +68,12 @@ public void testBroadcastsToDeletedClones() { } private void createProject() { - Project project = new Project(ApplicationProvider.getApplicationContext(), "BroadcastForDeletedClonesRegressionTest"); - ProjectManager.getInstance().setCurrentProject(project); + Project project = UiTestUtils.createDefaultTestProject("BroadcastForDeletedClonesRegressionTest"); + Sprite sprite = UiTestUtils.getDefaultTestSprite(project); + Script startScript = UiTestUtils.getDefaultTestScript(project); - Sprite sprite = new Sprite("testSprite"); - - Script startScript = new StartScript(); startScript.addBrick(new CloneBrick()); startScript.addBrick(new BroadcastBrick(BROADCAST_MESSAGE_1)); - sprite.addScript(startScript); Script whenStartAsCloneScript = new WhenClonedScript(); whenStartAsCloneScript.addBrick(new DeleteThisCloneBrick()); @@ -87,8 +82,5 @@ private void createProject() { Script broadcastReceiveScript = new BroadcastScript(BROADCAST_MESSAGE_1); sprite.addScript(broadcastReceiveScript); broadCastReceived = ScriptEvaluationGateBrick.appendToScript(broadcastReceiveScript); - - ProjectManager.getInstance().getCurrentlyEditedScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentSprite(sprite); } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastReceiverRegressionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastReceiverRegressionTest.java index cb0d5a6bcc3..2efefdab721 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastReceiverRegressionTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/BroadcastReceiverRegressionTest.java @@ -89,7 +89,7 @@ public void tearDown() { } private void createProject() { - project = UiTestUtils.createEmptyProject("test"); + project = UiTestUtils.createDefaultTestProject("test"); userVariable = new UserVariable(VARIABLE_NAME); project.addUserVariable(userVariable); sprite1 = project.getDefaultScene().getBackgroundSprite(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/DeleteSpriteCloneTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/DeleteSpriteCloneTest.kt index 92f8ba2c8e9..608545064fe 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/DeleteSpriteCloneTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/DeleteSpriteCloneTest.kt @@ -23,17 +23,14 @@ package org.catrobat.catroid.uiespresso.stage import androidx.test.InstrumentationRegistry -import androidx.test.core.app.ApplicationProvider import androidx.test.espresso.Espresso import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText -import org.catrobat.catroid.ProjectManager import org.catrobat.catroid.R import org.catrobat.catroid.content.Project import org.catrobat.catroid.content.Script import org.catrobat.catroid.content.Sprite -import org.catrobat.catroid.content.StartScript import org.catrobat.catroid.content.bricks.CloneBrick import org.catrobat.catroid.test.utils.TestUtils import org.catrobat.catroid.testsuites.annotations.Cat.AppUi @@ -41,6 +38,7 @@ import org.catrobat.catroid.testsuites.annotations.Level.Smoke import org.catrobat.catroid.ui.ProjectActivity import org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper import org.catrobat.catroid.uiespresso.ui.fragment.rvutils.RecyclerViewInteractionWrapper +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule import org.hamcrest.Matchers.allOf import org.junit.After @@ -98,17 +96,14 @@ class DeleteSpriteCloneTest { } private fun createProject() { - val projectName = javaClass.simpleName - project = Project(ApplicationProvider.getApplicationContext(), projectName) - sprite1 = Sprite("Sprite (1)") - val startScirpt: Script = StartScript() - startScirpt.addBrick(CloneBrick()) - sprite1!!.addScript(startScirpt) + project = UiTestUtils.createDefaultTestProject(javaClass.simpleName) + sprite1 = UiTestUtils.getDefaultTestSprite(project!!) + val startScript: Script = UiTestUtils.getDefaultTestScript(project!!) + + startScript.addBrick(CloneBrick()) sprite2 = Sprite("Sprite (2)") val scene1 = project!!.defaultScene scene1.addSprite(sprite1) scene1.addSprite(sprite2) - ProjectManager.getInstance().currentProject = project - ProjectManager.getInstance().startScene = scene1 } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/DisabledBrickInClonesRegressionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/DisabledBrickInClonesRegressionTest.java index a72767562f2..cdfb2920f03 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/DisabledBrickInClonesRegressionTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/DisabledBrickInClonesRegressionTest.java @@ -23,11 +23,9 @@ package org.catrobat.catroid.uiespresso.stage; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.WhenClonedScript; import org.catrobat.catroid.content.bricks.Brick; import org.catrobat.catroid.content.bricks.CloneBrick; @@ -38,6 +36,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -45,7 +44,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static org.catrobat.catroid.uiespresso.util.UserVariableAssertions.assertUserVariableEqualsWithTimeout; @@ -68,20 +66,13 @@ public void setUp() throws Exception { } private void createProject() { - Project project = new Project(ApplicationProvider.getApplicationContext(), - "DisabledBrickInClonesRegressionTest"); - Sprite sprite = new Sprite("someSprite"); - - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); + Project project = UiTestUtils.createDefaultTestProject("DisabledBrickInClonesRegressionTest"); + Sprite sprite = UiTestUtils.getDefaultTestSprite(project); userVariable = new UserVariable(VARIABLE_NAME); project.addUserVariable(userVariable); - Script startScript = new StartScript(); - sprite.addScript(startScript); + Script startScript = UiTestUtils.getDefaultTestScript(project); Brick setVariableInitial = new SetVariableBrick(new Formula(1D), userVariable); startScript.addBrick(setVariableInitial); startScript.addBrick(new CloneBrick()); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/LookUndoTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/LookUndoTest.java index b891772377d..3445ca54d97 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/LookUndoTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/LookUndoTest.java @@ -30,11 +30,9 @@ import android.net.Uri; import android.os.Environment; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.common.Constants; import org.catrobat.catroid.content.Project; -import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.io.ResourceImporter; import org.catrobat.catroid.io.XstreamSerializer; import org.catrobat.catroid.test.utils.TestUtils; @@ -53,7 +51,6 @@ import java.io.File; import java.io.IOException; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.intent.Intents; import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.rule.GrantPermissionRule; @@ -99,7 +96,8 @@ public class LookUndoTest { @Before public void setUp() throws Exception { - createProject(projectName); + Project project = UiTestUtils.createDefaultTestProject(projectName); + XstreamSerializer.getInstance().saveProject(project); baseActivityTestRule.launchActivity(); Intents.init(); @@ -190,17 +188,6 @@ public void testUndoLookFromGalleryIntentTest() { onView(withId(R.id.menu_undo)).check(doesNotExist()); // undo shouldn't be visible } - private void createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite(spriteName); - - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); - XstreamSerializer.getInstance().saveProject(project); - } - @After public void tearDown() throws IOException { Intents.release(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/MultipleBroadcastsTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/MultipleBroadcastsTest.java index 4cdf4816efa..fdba35725dd 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/MultipleBroadcastsTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/MultipleBroadcastsTest.java @@ -61,7 +61,7 @@ public class MultipleBroadcastsTest { @Before public void setUp() throws Exception { - project = UiTestUtils.createEmptyProject("test"); + project = UiTestUtils.createDefaultTestProject("test"); userVariables = new ArrayList<>(); for (int i = 0; i < VALUES.length; i++) { Sprite sprite = new Sprite("sprite" + i); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StagePausedTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StagePausedTest.java index 062e3b60256..8236daa7309 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StagePausedTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StagePausedTest.java @@ -25,16 +25,13 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputListener; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; -import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; -import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.stage.StageActivity; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.uiespresso.stage.utils.ScriptEvaluationGateBrick; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -42,7 +39,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static junit.framework.Assert.assertFalse; @@ -65,7 +61,8 @@ public class StagePausedTest { @Before public void setUp() throws Exception { - createProject(); + Script startScript = UiTestUtils.createProjectAndGetStartScript("StagePausedTest"); + evaluationGateBrick = ScriptEvaluationGateBrick.appendToScript(startScript); baseActivityTestRule.launchActivity(null); evaluationGateBrick.waitUntilEvaluated(1000); } @@ -114,17 +111,4 @@ public boolean touchDown(InputEvent event, float x, float y, int pointer, int bu return super.touchDown(event, x, y, pointer, button); } } - - private void createProject() { - Project project = new Project(ApplicationProvider.getApplicationContext(), "StagePausedTest"); - Sprite sprite = new Sprite("testSprite"); - Script startScript = new StartScript(); - sprite.addScript(startScript); - - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - - evaluationGateBrick = ScriptEvaluationGateBrick.appendToScript(startScript); - } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StageResourceFailedTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StageResourceFailedTest.java index 9f583e91c90..ea564bc9e82 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StageResourceFailedTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StageResourceFailedTest.java @@ -22,12 +22,8 @@ */ package org.catrobat.catroid.uiespresso.stage; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; -import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; -import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.SetXBrick; import org.catrobat.catroid.formulaeditor.Formula; import org.catrobat.catroid.formulaeditor.FormulaElement; @@ -87,18 +83,12 @@ public void testResourceFailedDialog() { } public void createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("testSprite"); - Script script = new StartScript(); + Script script = UiTestUtils.createProjectAndGetStartScript(projectName); Formula accelerationFormula = new Formula( new FormulaElement(FormulaElement.ElementType.SENSOR, Sensors.X_ACCELERATION.name(), null)); SetXBrick setXBrick = new SetXBrick(accelerationFormula); script.addBrick(setXBrick); - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StageScreenshotTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StageScreenshotTest.java index 164bdb83499..d14106b36d4 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StageScreenshotTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StageScreenshotTest.java @@ -26,12 +26,11 @@ import android.graphics.BitmapFactory; import android.graphics.Color; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.common.LookData; import org.catrobat.catroid.common.ScreenValues; import org.catrobat.catroid.content.Project; +import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.PlaceAtBrick; import org.catrobat.catroid.content.bricks.SetSizeToBrick; import org.catrobat.catroid.io.ResourceImporter; @@ -39,6 +38,7 @@ import org.catrobat.catroid.io.XstreamSerializer; import org.catrobat.catroid.stage.StageActivity; import org.catrobat.catroid.testsuites.annotations.Cat; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.matchers.StageMatchers; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.catrobat.catroid.utils.ScreenValueHandler; @@ -117,11 +117,10 @@ private void createProjectWithBlueSprite(String projectName) throws IOException ScreenValues.SCREEN_HEIGHT = PROJECT_HEIGHT; ScreenValues.SCREEN_WIDTH = PROJECT_WIDTH; - Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName); + Project project = UiTestUtils.createDefaultTestProject(projectName); - // blue Sprite - Sprite blueSprite = new Sprite("blueSprite"); - StartScript blueStartScript = new StartScript(); + Sprite blueSprite = UiTestUtils.getDefaultTestSprite(project); + Script blueStartScript = UiTestUtils.getDefaultTestScript(project); LookData blueLookData = new LookData(); String blueImageName = "blue_image.bmp"; @@ -131,9 +130,6 @@ private void createProjectWithBlueSprite(String projectName) throws IOException blueStartScript.addBrick(new PlaceAtBrick(0, 0)); blueStartScript.addBrick(new SetSizeToBrick(5000)); - blueSprite.addScript(blueStartScript); - - project.getDefaultScene().addSprite(blueSprite); XstreamSerializer.getInstance().saveProject(project); @@ -147,8 +143,6 @@ private void createProjectWithBlueSprite(String projectName) throws IOException blueLookData.setFile(blueImageFile); XstreamSerializer.getInstance().saveProject(project); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(blueSprite); ScreenValueHandler.updateScreenWidthAndHeight(InstrumentationRegistry.getContext()); } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StageSimpleTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StageSimpleTest.java index 36a0b583dde..01a53016d48 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StageSimpleTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StageSimpleTest.java @@ -22,18 +22,18 @@ */ package org.catrobat.catroid.uiespresso.stage; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.common.LookData; import org.catrobat.catroid.common.ScreenValues; import org.catrobat.catroid.content.Project; +import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.PlaceAtBrick; import org.catrobat.catroid.content.bricks.SetSizeToBrick; import org.catrobat.catroid.io.ResourceImporter; import org.catrobat.catroid.io.XstreamSerializer; import org.catrobat.catroid.stage.StageActivity; import org.catrobat.catroid.testsuites.annotations.Cat; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.matchers.StageMatchers; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.catrobat.catroid.utils.ScreenValueHandler; @@ -46,7 +46,6 @@ import java.io.File; import java.io.IOException; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; @@ -87,11 +86,10 @@ public Project createProjectWithBlueSprite(String projectName) throws IOExceptio ScreenValues.SCREEN_HEIGHT = PROJECT_HEIGHT; ScreenValues.SCREEN_WIDTH = PROJECT_WIDTH; - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); + Project project = UiTestUtils.createDefaultTestProject(projectName); - // blue Sprite - Sprite blueSprite = new Sprite("blueSprite"); - StartScript blueStartScript = new StartScript(); + Sprite blueSprite = UiTestUtils.getDefaultTestSprite(project); + Script blueStartScript = UiTestUtils.getDefaultTestScript(project); LookData blueLookData = new LookData(); String blueImageName = "blue_image.bmp"; @@ -101,9 +99,6 @@ public Project createProjectWithBlueSprite(String projectName) throws IOExceptio blueStartScript.addBrick(new PlaceAtBrick(0, 0)); blueStartScript.addBrick(new SetSizeToBrick(5000)); - blueSprite.addScript(blueStartScript); - - project.getDefaultScene().addSprite(blueSprite); XstreamSerializer.getInstance().saveProject(project); @@ -117,8 +112,6 @@ public Project createProjectWithBlueSprite(String projectName) throws IOExceptio blueLookData.setFile(blueImageFile); XstreamSerializer.getInstance().saveProject(project); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(blueSprite); ScreenValueHandler.updateScreenWidthAndHeight(InstrumentationRegistry.getInstrumentation().getContext()); return project; diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StartStageTouchTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StartStageTouchTest.java index b8e8a1978b3..ba5ae9aaf5b 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StartStageTouchTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/stage/StartStageTouchTest.java @@ -25,7 +25,6 @@ import com.badlogic.gdx.scenes.scene2d.actions.SequenceAction; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Scene; import org.catrobat.catroid.content.Scope; @@ -47,6 +46,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.uiespresso.stage.utils.StageTestTouchUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.actions.CustomActions; import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; @@ -57,8 +57,6 @@ import java.util.LinkedList; import java.util.List; -import androidx.test.core.app.ApplicationProvider; - import static org.catrobat.catroid.uiespresso.util.UserVariableAssertions.assertUserVariableEqualsWithTimeout; import static androidx.test.espresso.Espresso.onView; @@ -90,26 +88,21 @@ public void switchStageTouchTest() { } private void createProject() { - String projectName = getClass().getSimpleName(); - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); + Project project = UiTestUtils.createDefaultTestProject(getClass().getSimpleName()); + Sprite sprite = UiTestUtils.getDefaultTestSprite(project); + Script background1StartScript = UiTestUtils.getDefaultTestScript(project); String scene2Name = "Scene2"; Scene scene2 = new Scene(scene2Name, project); + scene2.addSprite(sprite); screenIsTouchedUserVariable = new UserVariable("ScreenTouched"); project.addUserVariable(screenIsTouchedUserVariable); - Sprite sprite = new Sprite("Background"); Scope scope = new Scope(project, sprite, new SequenceAction()); - Script background1StartScript = new StartScript(); background1StartScript.addBrick(new WaitUntilBrick(createFormulaWithSensor(Sensors.FINGER_TOUCHED, scope))); - background1StartScript.addBrick(new SceneStartBrick("Scene2")); - Scene scene1 = project.getDefaultScene(); - scene1.getBackgroundSprite().addScript(background1StartScript); - - scene2.addSprite(sprite); Script background2StartScript = new StartScript(); ForeverBrick foreverBrick = new ForeverBrick(); @@ -119,10 +112,6 @@ private void createProject() { background2StartScript.addBrick(foreverBrick); scene2.getBackgroundSprite().addScript(background2StartScript); - project.addScene(scene2); - - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setStartScene(scene1); } private Formula createFormulaWithSensor(Sensors sensor, Scope scope) { diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarFormulaEditorTitleTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarFormulaEditorTitleTest.java index 12abffef67f..cc017e3226c 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarFormulaEditorTitleTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarFormulaEditorTitleTest.java @@ -29,8 +29,8 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -56,7 +56,7 @@ public class ActionBarFormulaEditorTitleTest { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript("ActionBarFormulaEditorTitleTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("ActionBarFormulaEditorTitleTest"); script.addBrick(new ChangeSizeByNBrick(0)); baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarScriptTitleAfterExitingFormulaEditorOneSceneProjectTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarScriptTitleAfterExitingFormulaEditorOneSceneProjectTest.java index f9030d5f5d8..7e3748b5d21 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarScriptTitleAfterExitingFormulaEditorOneSceneProjectTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarScriptTitleAfterExitingFormulaEditorOneSceneProjectTest.java @@ -30,7 +30,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -56,7 +56,7 @@ public class ActionBarScriptTitleAfterExitingFormulaEditorOneSceneProjectTest { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript("ActionBarScriptTitleAfterExitingFormulaEditorOneSceneProjectTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("ActionBarScriptTitleAfterExitingFormulaEditorOneSceneProjectTest"); script.addBrick(new ChangeSizeByNBrick(0)); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarScriptTitleAfterExitingFormulaEditorTwoScenesProjectTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarScriptTitleAfterExitingFormulaEditorTwoScenesProjectTest.java index 599c3573a55..0e83e235896 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarScriptTitleAfterExitingFormulaEditorTwoScenesProjectTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarScriptTitleAfterExitingFormulaEditorTwoScenesProjectTest.java @@ -28,17 +28,15 @@ import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Scene; import org.catrobat.catroid.content.Script; -import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.ChangeSizeByNBrick; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.espresso.Espresso; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -62,22 +60,15 @@ public void setUp() throws Exception { } private void createTwoScenesProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); + Project project = UiTestUtils.createDefaultTestProject(projectName); Scene sceneOne = new Scene("testScene1", project); Scene sceneTwo = new Scene("testScene2", project); project.addScene(sceneOne); project.addScene(sceneTwo); - Sprite sprite = new Sprite("testSprite"); - Script script = new StartScript(); + Script script = UiTestUtils.getDefaultTestScript(project); script.addBrick(new ChangeSizeByNBrick(0)); - - sprite.addScript(script); - project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); } @Test diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarUndoSpinnerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarUndoSpinnerTest.java index 669b2587a04..5e8172a71f1 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarUndoSpinnerTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionBarUndoSpinnerTest.java @@ -41,8 +41,8 @@ import org.catrobat.catroid.nfc.NfcHandler; import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.content.brick.utils.UiNFCTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; import org.junit.Before; @@ -150,7 +150,7 @@ public void testUndoSpinnerNotVisibleAfterNewOptionSelected() { } private void createProject() { - Script script = BrickTestUtils.createProjectAndGetStartScript(ActionBarUndoSpinnerTest.class.getSimpleName()); + Script script = UiTestUtils.createProjectAndGetStartScript(ActionBarUndoSpinnerTest.class.getSimpleName()); Project currentProject = ProjectManager.getInstance().getCurrentProject(); Sprite currentSprite = ProjectManager.getInstance().getCurrentSprite(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionModeDataFragmentTitleTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionModeDataFragmentTitleTest.java index 73c0b884190..9e14972728c 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionModeDataFragmentTitleTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionModeDataFragmentTitleTest.java @@ -33,7 +33,6 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; @@ -87,7 +86,7 @@ public void actionModeDataFragmentTitleTest() { } private void createProject() { - Script script = BrickTestUtils.createProjectAndGetStartScript("ActionModeDataFragmentTitleTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("ActionModeDataFragmentTitleTest"); script.addBrick(new ChangeSizeByNBrick(0)); Project currentProject = ProjectManager.getInstance().getCurrentProject(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionModeMergeTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionModeMergeTest.java index 6f1607b28c7..6a51ba023d9 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionModeMergeTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/actionbar/ActionModeMergeTest.java @@ -27,8 +27,6 @@ import org.catrobat.catroid.common.BrickValues; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; -import org.catrobat.catroid.content.Sprite; -import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.SetXBrick; import org.catrobat.catroid.formulaeditor.Formula; import org.catrobat.catroid.io.XstreamSerializer; @@ -43,7 +41,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static org.catrobat.catroid.uiespresso.ui.actionbar.utils.ActionModeWrapper.onActionMode; @@ -133,16 +130,10 @@ public void actionModeMergeTitleTest() { } private void createProject(String projectName) { - Project project = new Project(ApplicationProvider.getApplicationContext(), projectName); - Sprite sprite = new Sprite("firstSprite"); - - Script script = new StartScript(); + Project project = UiTestUtils.createDefaultTestProject(projectName); + Script script = UiTestUtils.getDefaultTestScript(project); script.addBrick(new SetXBrick(new Formula(BrickValues.X_POSITION))); script.addBrick(new SetXBrick(new Formula(BrickValues.X_POSITION))); - sprite.addScript(script); - - project.getDefaultScene().addSprite(sprite); - XstreamSerializer.getInstance().saveProject(project); } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectActivityNumberOfBricksRegressionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectActivityNumberOfBricksRegressionTest.java index 77d21ecaa18..40bd01be624 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectActivityNumberOfBricksRegressionTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectActivityNumberOfBricksRegressionTest.java @@ -23,7 +23,6 @@ package org.catrobat.catroid.uiespresso.ui.activity; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.common.BrickValues; import org.catrobat.catroid.common.LookData; @@ -47,7 +46,6 @@ import java.util.Locale; -import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import static org.catrobat.catroid.uiespresso.ui.fragment.rvutils.RecyclerViewInteractionWrapper.onRecyclerView; @@ -92,11 +90,10 @@ public void numberOfBricksDetailsRegressionTest() throws Exception { } private void createProject() { - Project project = new Project(ApplicationProvider.getApplicationContext(), "ProjectActivityNumberOfBricksRegressionTest"); + Project project = UiTestUtils.createDefaultTestProject("ProjectActivityNumberOfBricksRegressionTest"); + Sprite firstSprite = UiTestUtils.getDefaultTestSprite(project); - Sprite firstSprite = new Sprite("firstSprite"); - - Script firstScript = new StartScript(); + Script firstScript = UiTestUtils.getDefaultTestScript(project); firstScript.addBrick(new SetXBrick(new Formula(BrickValues.X_POSITION))); firstScript.addBrick(new SetXBrick(new Formula(BrickValues.X_POSITION))); firstSprite.addScript(firstScript); @@ -114,10 +111,5 @@ private void createProject() { LookData anotherLookData = new LookData(); anotherLookData.setName("blue"); firstSprite.getLookList().add(anotherLookData); - - project.getDefaultScene().addSprite(firstSprite); - - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(firstSprite); } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectActivityTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectActivityTest.java index 31d6f7bbc06..e5c748bccd4 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectActivityTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectActivityTest.java @@ -32,12 +32,11 @@ import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.common.Constants; -import org.catrobat.catroid.content.Project; -import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.ProjectActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; import org.junit.Before; @@ -75,11 +74,7 @@ public class ProjectActivityTest { @Before public void setUp() { - Project project = new Project(ApplicationProvider.getApplicationContext(), PROJECT_NAME); - Sprite firstSprite = new Sprite("firstSprite"); - project.getDefaultScene().addSprite(firstSprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(firstSprite); + UiTestUtils.createDefaultTestProject(PROJECT_NAME); Intents.init(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.kt index 4864eb1e616..3c15c44b696 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.kt @@ -41,19 +41,16 @@ import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import androidx.test.uiautomator.UiDevice -import org.catrobat.catroid.ProjectManager import org.catrobat.catroid.R import org.catrobat.catroid.common.Constants.UPLOAD_RESULT_RECEIVER_RESULT_CODE import org.catrobat.catroid.content.Project import org.catrobat.catroid.content.Scene -import org.catrobat.catroid.content.Script -import org.catrobat.catroid.content.Sprite -import org.catrobat.catroid.content.StartScript import org.catrobat.catroid.io.asynctask.saveProjectSerial import org.catrobat.catroid.ui.NUMBER_OF_UPLOADED_PROJECTS import org.catrobat.catroid.ui.PROJECT_DIR import org.catrobat.catroid.ui.ProjectUploadActivity import org.catrobat.catroid.ui.controller.ProjectUploadController +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule import org.junit.Assert.assertFalse import org.junit.Before @@ -80,13 +77,8 @@ class ProjectUploadDialogTest { sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()) bundle = Bundle() - project = Project(getApplicationContext(), projectName, false) + project = UiTestUtils.createDefaultTestProject(projectName) val firstScene = Scene("scene", project) - ProjectManager.getInstance().currentProject = project - val firstSprite = Sprite("firstSprite") - val firstScript: Script = StartScript() - firstSprite.addScript(firstScript) - firstScene.addSprite(firstSprite) project.addScene(firstScene) saveProjectSerial(project, getApplicationContext()) val intent = Intent() diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/AddNewActorOrLookDialogTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/AddNewActorOrLookDialogTest.kt index 7d133b50a29..35ca469019c 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/AddNewActorOrLookDialogTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/AddNewActorOrLookDialogTest.kt @@ -33,7 +33,7 @@ import org.catrobat.catroid.content.Sprite import org.catrobat.catroid.test.utils.TestUtils import org.catrobat.catroid.ui.ProjectActivity import org.catrobat.catroid.ui.SpriteActivity -import org.catrobat.catroid.uiespresso.formulaeditor.FormulaEditorTest +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.actions.selectTabAtPosition import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.junit.After @@ -54,7 +54,7 @@ class AddNewActorOrLookDialogTest { @Throws(Exception::class) fun setUp() { val projectName = "newProject" - currentProject = FormulaEditorTest.createProject(projectName) + currentProject = UiTestUtils.createDefaultTestProject(projectName) currentProject!!.defaultScene.addSprite(Sprite("Sprite1")) baseActivityTestRule.launchActivity() } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/AddSpriteFromBackpackTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/AddSpriteFromBackpackTest.kt index fb4e81dddd3..102f0c50dc3 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/AddSpriteFromBackpackTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/AddSpriteFromBackpackTest.kt @@ -36,7 +36,7 @@ import org.catrobat.catroid.test.utils.TestUtils import org.catrobat.catroid.ui.ProjectActivity import org.catrobat.catroid.ui.controller.BackpackListManager import org.catrobat.catroid.ui.recyclerview.controller.SpriteController -import org.catrobat.catroid.uiespresso.formulaeditor.FormulaEditorTest +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.junit.After import org.junit.Assert @@ -59,7 +59,7 @@ class AddSpriteFromBackpackTest { @Throws(Exception::class) fun setUp() { val projectName = "newProject" - currentProject = FormulaEditorTest.createProject(projectName) + currentProject = UiTestUtils.createDefaultTestProject(projectName) currentProject!!.defaultScene.addSprite(Sprite("Sprite1")) baseActivityTestRule.launchActivity() } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/DisableHintDialogTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/DisableHintDialogTest.java index 995680fd574..a0834f01c48 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/DisableHintDialogTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/DisableHintDialogTest.java @@ -158,7 +158,7 @@ public void enableHintDialogTest() { } private void createProject(String projectName) { - Project project = UiTestUtils.createEmptyProject(projectName); + Project project = UiTestUtils.createDefaultTestProject(projectName); saveProjectSerial(project, ApplicationProvider.getApplicationContext()); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/FormulaEditorComputeDialogUserDefinedBrickInputTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/FormulaEditorComputeDialogUserDefinedBrickInputTest.kt index 53632ac607f..c17141e2021 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/FormulaEditorComputeDialogUserDefinedBrickInputTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/FormulaEditorComputeDialogUserDefinedBrickInputTest.kt @@ -43,8 +43,8 @@ import org.catrobat.catroid.formulaeditor.FormulaElement.ElementType.USER_DEFINE import org.catrobat.catroid.formulaeditor.Functions import org.catrobat.catroid.test.utils.TestUtils import org.catrobat.catroid.ui.SpriteActivity -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.catrobat.catroid.userbrick.UserDefinedBrickData import org.catrobat.catroid.userbrick.UserDefinedBrickInput @@ -58,7 +58,6 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) class FormulaEditorComputeDialogUserDefinedBrickInputTest( - private val name: String, private val formula: Formula, private val expectedString: String ) { @@ -76,7 +75,7 @@ class FormulaEditorComputeDialogUserDefinedBrickInputTest( @Before @kotlin.jvm.Throws(Exception::class) fun setUp() { - BrickTestUtils.createProjectAndGetStartScript(projectName) + UiTestUtils.createProjectAndGetStartScript(projectName) input.value = formula val userDefinedScript = UserDefinedScript() diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/HtmlExtractorDialogTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/HtmlExtractorDialogTest.java index b89af830ae9..3ea187c6999 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/HtmlExtractorDialogTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/HtmlExtractorDialogTest.java @@ -27,7 +27,6 @@ import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.bricks.ChangeSizeByNBrick; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper; import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; @@ -60,7 +59,7 @@ public class HtmlExtractorDialogTest { @Before public void setUp() { - Script script = BrickTestUtils.createProjectAndGetStartScript("HtmlExtractorDialogTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("HtmlExtractorDialogTest"); script.addBrick(new ChangeSizeByNBrick(0)); baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/JsonExtractorDialogTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/JsonExtractorDialogTest.java index 67b57cd2388..f7d708a7726 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/JsonExtractorDialogTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/JsonExtractorDialogTest.java @@ -27,7 +27,6 @@ import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.bricks.ChangeSizeByNBrick; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper; import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; @@ -56,7 +55,7 @@ public class JsonExtractorDialogTest { FragmentActivityTestRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS); @Before public void setUp() { - Script script = BrickTestUtils.createProjectAndGetStartScript("HtmlExtractorDialogTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("HtmlExtractorDialogTest"); script.addBrick(new ChangeSizeByNBrick(0)); baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/LegoSensorPortConfigDialogTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/LegoSensorPortConfigDialogTest.java index cb0a13b1ab0..409992289d5 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/LegoSensorPortConfigDialogTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/LegoSensorPortConfigDialogTest.java @@ -35,7 +35,6 @@ import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; import org.catrobat.catroid.ui.settingsfragments.SettingsFragment; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper; import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; @@ -76,7 +75,7 @@ public class LegoSensorPortConfigDialogTest { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript(getClass().getSimpleName()); + Script script = UiTestUtils.createProjectAndGetStartScript(getClass().getSimpleName()); script.addBrick(new ChangeSizeByNBrick(0)); SharedPreferences sharedPreferences = PreferenceManager diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/RegularExpressionAssistantDialogTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/RegularExpressionAssistantDialogTest.java index 2f6c53faffb..6f7096b1b9c 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/RegularExpressionAssistantDialogTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/RegularExpressionAssistantDialogTest.java @@ -32,7 +32,6 @@ import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.bricks.ChangeSizeByNBrick; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper; import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; @@ -70,7 +69,7 @@ public class RegularExpressionAssistantDialogTest { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript("FormulaEditorFunctionListTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("FormulaEditorFunctionListTest"); script.addBrick(new ChangeSizeByNBrick(0)); baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentExplanationTextTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentExplanationTextTest.kt index 45e08f3a7c3..a654988949b 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentExplanationTextTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentExplanationTextTest.kt @@ -37,12 +37,12 @@ import org.catrobat.catroid.content.bricks.ChangeSizeByNBrick import org.catrobat.catroid.testsuites.annotations.Cat.AppUi import org.catrobat.catroid.testsuites.annotations.Level.Smoke import org.catrobat.catroid.ui.SpriteActivity -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper.onDataList import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor import org.catrobat.catroid.uiespresso.ui.actionbar.utils.ActionModeWrapper.onActionMode import org.catrobat.catroid.uiespresso.ui.fragment.rvutils.RecyclerViewInteractionWrapper.onRecyclerView +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.hamcrest.core.IsNot.not import org.junit.Before @@ -63,7 +63,7 @@ class DataListFragmentExplanationTextTest { @Before @Throws(Exception::class) fun setUp() { - val script = createProjectAndGetStartScript("DataListFragmentExplanationTextNoObjectTest") + val script = UiTestUtils.createProjectAndGetStartScript("DataListFragmentExplanationTextNoObjectTest") script.addBrick(ChangeSizeByNBrick(0.0)) baseActivityTestRule.launchActivity() onView(withId(R.id.brick_change_size_by_edit_text)) diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUserDefinedBrickInputTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUserDefinedBrickInputTest.kt index 93ec0e504b2..97819855c88 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUserDefinedBrickInputTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUserDefinedBrickInputTest.kt @@ -42,9 +42,9 @@ import org.catrobat.catroid.formulaeditor.FormulaElement import org.catrobat.catroid.formulaeditor.Functions import org.catrobat.catroid.test.utils.TestUtils import org.catrobat.catroid.ui.SpriteActivity -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper.onDataList import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.catrobat.catroid.userbrick.UserDefinedBrickData import org.catrobat.catroid.userbrick.UserDefinedBrickInput @@ -77,7 +77,7 @@ class DataListFragmentUserDefinedBrickInputTest( @Before @kotlin.jvm.Throws(Exception::class) fun setUp() { - BrickTestUtils.createProjectAndGetStartScript(projectName) + UiTestUtils.createProjectAndGetStartScript(projectName) input.value = formula val userDefinedScript = UserDefinedScript() diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUserListsTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUserListsTest.kt index 340b82163c2..e0b8238f80d 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUserListsTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUserListsTest.kt @@ -38,9 +38,9 @@ import org.catrobat.catroid.content.bricks.ChangeSizeByNBrick import org.catrobat.catroid.formulaeditor.UserList import org.catrobat.catroid.test.utils.TestUtils import org.catrobat.catroid.ui.SpriteActivity -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper.onDataList import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.hamcrest.core.IsNot.not import org.junit.After @@ -68,7 +68,7 @@ class DataListFragmentUserListsTest( @Before @Throws(Exception::class) fun setUp() { - val script = BrickTestUtils.createProjectAndGetStartScript(projectName) + val script = UiTestUtils.createProjectAndGetStartScript(projectName) script.addBrick(ChangeSizeByNBrick(0.0)) project = ProjectManager.getInstance().currentProject baseActivityTestRule.launchActivity() diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUserVariablesTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUserVariablesTest.kt index 8507fb5330f..6ea59594e5f 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUserVariablesTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUserVariablesTest.kt @@ -37,9 +37,9 @@ import org.catrobat.catroid.content.bricks.ChangeSizeByNBrick import org.catrobat.catroid.formulaeditor.UserVariable import org.catrobat.catroid.test.utils.TestUtils import org.catrobat.catroid.ui.SpriteActivity -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper.onDataList import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.hamcrest.core.IsNot.not import org.junit.After @@ -65,7 +65,7 @@ class DataListFragmentUserVariablesTest( @Before @Throws(Exception::class) fun setUp() { - val script = BrickTestUtils.createProjectAndGetStartScript(projectName) + val script = UiTestUtils.createProjectAndGetStartScript(projectName) script.addBrick(ChangeSizeByNBrick(0.0)) project = ProjectManager.getInstance().currentProject baseActivityTestRule.launchActivity() diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/ProjectOptionsTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/ProjectOptionsTest.java index 49a022cb25f..33492c5b9b6 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/ProjectOptionsTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/ProjectOptionsTest.java @@ -123,9 +123,9 @@ public class ProjectOptionsTest { @Before public void setUp() throws Exception { context = ApplicationProvider.getApplicationContext(); - project = UiTestUtils.createEmptyProject(EXISTING_PROJECT_NAME); + project = UiTestUtils.createDefaultTestProject(EXISTING_PROJECT_NAME); new ProjectSaver(project, context).saveProjectAsync(); - project = UiTestUtils.createEmptyProject(PROJECT_NAME); + project = UiTestUtils.createDefaultTestProject(PROJECT_NAME); new ProjectSaver(project, context).saveProjectAsync(); baseActivityTestRule.launchActivity(null); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/RemoveTabsTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/RemoveTabsTest.java index 307053383e8..64d38740281 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/RemoveTabsTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/RemoveTabsTest.java @@ -29,6 +29,7 @@ import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.bricks.SetVariableBrick; import org.catrobat.catroid.ui.SpriteActivity; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Test; @@ -40,7 +41,6 @@ import static org.catrobat.catroid.R.id.tab_layout; import static org.catrobat.catroid.ui.SpriteActivity.EXTRA_FRAGMENT_POSITION; import static org.catrobat.catroid.ui.SpriteActivity.FRAGMENT_SCRIPTS; -import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -57,7 +57,8 @@ public class RemoveTabsTest { @Before public void setUp() { - Script script = createProjectAndGetStartScript("RemoveTabsFromSpriteActivityTest"); + Script script = UiTestUtils.createProjectAndGetStartScript( + "RemoveTabsFromSpriteActivityTest"); script.addBrick(new SetVariableBrick()); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/SortProjectsTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/SortProjectsTest.java index 560da63509b..0cdd7d574bf 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/SortProjectsTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/SortProjectsTest.java @@ -123,7 +123,7 @@ public void projectsListIsSortedTest() { } private void createProject(String projectName) { - Project project = UiTestUtils.createEmptyProject(projectName); + Project project = UiTestUtils.createDefaultTestProject(projectName); XstreamSerializer.getInstance().saveProject(project); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/SpriteListFragmentWithObjectTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/SpriteListFragmentWithObjectTest.kt index 50f8107a739..dfa4858c01a 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/SpriteListFragmentWithObjectTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/SpriteListFragmentWithObjectTest.kt @@ -34,8 +34,8 @@ import org.catrobat.catroid.R import org.catrobat.catroid.ui.ProjectActivity import org.catrobat.catroid.ui.ProjectActivity.Companion.EXTRA_FRAGMENT_POSITION import org.catrobat.catroid.ui.ProjectActivity.Companion.FRAGMENT_SPRITES -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript import org.catrobat.catroid.uiespresso.ui.fragment.rvutils.RecyclerViewInteractionWrapper.onRecyclerView +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule import org.hamcrest.Matchers.allOf import org.hamcrest.Matchers.not @@ -56,7 +56,7 @@ class SpriteListFragmentWithObjectTest { @Before @Throws(Exception::class) fun setUp() { - createProjectAndGetStartScript(SpriteListFragmentWithObjectTest::class.java.simpleName) + UiTestUtils.createProjectAndGetStartScript(SpriteListFragmentWithObjectTest::class.java.simpleName) baseActivityTestRule.launchActivity() } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/UndoTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/UndoTest.java index c73e0ede876..6cd8cff9bd0 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/UndoTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/UndoTest.java @@ -31,7 +31,7 @@ import org.catrobat.catroid.io.XstreamSerializer; import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.ui.ProjectActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; import org.junit.Before; @@ -141,7 +141,7 @@ public String getProjectAsXmlString() { } private void createProject() { - Script script = BrickTestUtils.createProjectAndGetStartScript(UndoTest.class.getSimpleName()); + Script script = UiTestUtils.createProjectAndGetStartScript(UndoTest.class.getSimpleName()); IfLogicBeginBrick compositeBrick = new IfLogicBeginBrick(); compositeBrick.addBrickToIfBranch(new SetXBrick()); compositeBrick.addBrickToElseBranch(new SetXBrick()); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/UserDefinedBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/UserDefinedBrickTest.java index cee73bc1300..b736e75a5f9 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/UserDefinedBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/UserDefinedBrickTest.java @@ -27,7 +27,6 @@ import org.catrobat.catroid.test.utils.TestUtils; import org.catrobat.catroid.ui.SpriteActivity; import org.catrobat.catroid.ui.recyclerview.fragment.ScriptFragment; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.matchers.BrickCategoryListMatchers; import org.catrobat.catroid.uiespresso.util.matchers.BrickPrototypeListMatchers; @@ -79,7 +78,7 @@ public void tearDown() throws IOException { @Before public void setUp() throws IOException { - BrickTestUtils.createProjectAndGetStartScript(UserDefinedBrickTest.class.getSimpleName()); + UiTestUtils.createProjectAndGetStartScript(UserDefinedBrickTest.class.getSimpleName()); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/hints/HintsShownInCorrectActivityTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/hints/HintsShownInCorrectActivityTest.kt index 5f28d1db8d8..356218aa509 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/hints/HintsShownInCorrectActivityTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/hints/HintsShownInCorrectActivityTest.kt @@ -40,7 +40,7 @@ import org.catrobat.catroid.content.Script import org.catrobat.catroid.content.bricks.SetXBrick import org.catrobat.catroid.ui.SpriteActivity import org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_SHOW_HINTS -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript +import org.catrobat.catroid.uiespresso.util.UiTestUtils import org.catrobat.catroid.uiespresso.util.actions.selectTabAtPosition import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule import org.catrobat.catroid.utils.SnackbarUtil @@ -77,7 +77,7 @@ class HintsShownInCorrectActivityTest { .putBoolean(SETTINGS_SHOW_HINTS, true) .apply() - script = createProjectAndGetStartScript(projectName) + script = UiTestUtils.createProjectAndGetStartScript(projectName) script.addBrick(SetXBrick()) baseActivityTestRule.launchActivity(null) diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/regression/activitydestroy/FormulaEditorFragmentActivityRecreateRegressionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/regression/activitydestroy/FormulaEditorFragmentActivityRecreateRegressionTest.java index cf5540d5e36..af907442018 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/regression/activitydestroy/FormulaEditorFragmentActivityRecreateRegressionTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/regression/activitydestroy/FormulaEditorFragmentActivityRecreateRegressionTest.java @@ -31,8 +31,8 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -67,7 +67,7 @@ public class FormulaEditorFragmentActivityRecreateRegressionTest { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript("FormulaEditorEditTextTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("FormulaEditorEditTextTest"); script.addBrick(new ChangeSizeByNBrick()); baseActivityTestRule.launchActivity(); onBrickAtPosition(1) diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/regression/activitydestroy/LegoConfigDialogActivityRecreationRegressionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/regression/activitydestroy/LegoConfigDialogActivityRecreationRegressionTest.java index 511796db18c..40e8e10c803 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/regression/activitydestroy/LegoConfigDialogActivityRecreationRegressionTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/regression/activitydestroy/LegoConfigDialogActivityRecreationRegressionTest.java @@ -36,8 +36,8 @@ import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; import org.catrobat.catroid.ui.settingsfragments.SettingsFragment; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; import org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.After; import org.junit.Before; @@ -71,7 +71,7 @@ public class LegoConfigDialogActivityRecreationRegressionTest { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript(getClass().getSimpleName()); + Script script = UiTestUtils.createProjectAndGetStartScript(getClass().getSimpleName()); script.addBrick(new ChangeSizeByNBrick(0)); nxtSettingBuffer = PreferenceManager.getDefaultSharedPreferences(ApplicationProvider.getApplicationContext()) diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/regression/activitydestroy/NewMessageDialogActivityRecreateRegressionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/regression/activitydestroy/NewMessageDialogActivityRecreateRegressionTest.java index d6009c9f85d..9173b4e1fa0 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/regression/activitydestroy/NewMessageDialogActivityRecreateRegressionTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/regression/activitydestroy/NewMessageDialogActivityRecreateRegressionTest.java @@ -31,7 +31,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Rule; @@ -64,7 +64,7 @@ public class NewMessageDialogActivityRecreateRegressionTest { @Before public void setUp() throws Exception { - Script script = BrickTestUtils.createProjectAndGetStartScript("FormulaEditorEditTextTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("FormulaEditorEditTextTest"); script.addBrick(new BroadcastBrick("TestMessage")); baseActivityTestRule.launchActivity(); } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/tabs/SpriteActivityTabsTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/tabs/SpriteActivityTabsTest.java index ea5512dc92e..57b5184c603 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/tabs/SpriteActivityTabsTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/tabs/SpriteActivityTabsTest.java @@ -32,7 +32,7 @@ import org.catrobat.catroid.ui.recyclerview.fragment.LookListFragment; import org.catrobat.catroid.ui.recyclerview.fragment.ScriptFragment; import org.catrobat.catroid.ui.recyclerview.fragment.SoundListFragment; -import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; import org.junit.Before; import org.junit.Test; @@ -67,7 +67,7 @@ public class SpriteActivityTabsTest { @Before public void setUp() { - Script script = BrickTestUtils.createProjectAndGetStartScript("SpriteActivityTabsTest"); + Script script = UiTestUtils.createProjectAndGetStartScript("SpriteActivityTabsTest"); ProjectManager.getInstance().getCurrentProject().addUserVariable(new UserVariable("X")); script.addBrick(new SetVariableBrick()); baseActivityTestRule.launchActivity(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/util/UiTestUtils.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/util/UiTestUtils.kt index 58145287185..ef6be7ebdaa 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/util/UiTestUtils.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/util/UiTestUtils.kt @@ -22,7 +22,6 @@ */ package org.catrobat.catroid.uiespresso.util -import androidx.test.core.app.ApplicationProvider import android.app.Activity import android.content.Context import android.content.res.Resources @@ -30,12 +29,10 @@ import android.util.Log import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.SwitchCompat -import org.hamcrest.CoreMatchers -import org.catrobat.catroid.content.StartScript -import org.catrobat.catroid.ProjectManager -import androidx.test.espresso.ViewInteraction +import androidx.test.core.app.ApplicationProvider import androidx.test.espresso.Espresso.onView import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu +import androidx.test.espresso.ViewInteraction import androidx.test.espresso.action.ViewActions import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.matcher.ViewMatchers @@ -48,11 +45,16 @@ import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry import androidx.test.runner.lifecycle.Stage +import org.catrobat.catroid.ProjectManager import org.catrobat.catroid.R +import org.catrobat.catroid.UiTestCatroidApplication import org.catrobat.catroid.content.Project import org.catrobat.catroid.content.Script import org.catrobat.catroid.content.Sprite +import org.catrobat.catroid.content.StartScript +import org.catrobat.catroid.test.utils.TestUtils import org.catrobat.catroid.uiespresso.util.matchers.SuperToastMatchers +import org.hamcrest.CoreMatchers import org.hamcrest.Description import org.hamcrest.Matcher import org.hamcrest.Matchers @@ -80,6 +82,14 @@ class UiTestUtils private constructor() { ) } + @JvmStatic + fun getDefaultTestSprite(project: Project): Sprite = + project.defaultScene.getSprite(TestUtils.DEFAULT_TEST_SPRITE_NAME) + + @JvmStatic + fun getDefaultTestScript(project: Project): Script = + project.defaultScene.getSprite(TestUtils.DEFAULT_TEST_SPRITE_NAME).getScript(TestUtils.DEFAULT_TEST_SCRIPT_INDEX) + @JvmStatic fun assertCurrentActivityIsInstanceOf(activityClass: Class<*>?) { val currentActivity = arrayOf(null) @@ -96,14 +106,49 @@ class UiTestUtils private constructor() { } @JvmStatic - fun createEmptyProject(projectName: String?): Project { + fun createDefaultTestProject(projectName: String?): Project { + val project = Project(ApplicationProvider.getApplicationContext(), projectName) + val sprite = Sprite(TestUtils.DEFAULT_TEST_SPRITE_NAME) + val script: Script = StartScript() + sprite.addScript(script) + project.defaultScene.addSprite(sprite) + projectManager.currentProject = project + projectManager.currentSprite = sprite + return project + } + + @JvmStatic + fun createProjectAndGetStartScript(projectName: String?): Script { val project = Project(ApplicationProvider.getApplicationContext(), projectName) - val sprite = Sprite("testSprite") + val sprite = Sprite(TestUtils.DEFAULT_TEST_SPRITE_NAME) val script: Script = StartScript() sprite.addScript(script) project.defaultScene.addSprite(sprite) projectManager.currentProject = project projectManager.currentSprite = sprite + projectManager.currentlyEditedScene = project.defaultScene + return script + } + + @JvmStatic + fun createProjectWithCustomScript(projectName: String?, script: Script): Project { + val project = Project(ApplicationProvider.getApplicationContext(), projectName) + val sprite = Sprite(TestUtils.DEFAULT_TEST_SPRITE_NAME) + sprite.addScript(script) + project.defaultScene.addSprite(sprite) + projectManager.currentProject = project + projectManager.currentSprite = sprite + projectManager.currentlyEditedScene = project.defaultScene + return project + } + + @JvmStatic + fun createProjectWithOutDefaultScript(projectName: String?): Project { + val project = Project(ApplicationProvider.getApplicationContext(), projectName) + val sprite = Sprite(TestUtils.DEFAULT_TEST_SPRITE_NAME) + project.defaultScene.addSprite(sprite) + UiTestCatroidApplication.projectManager.currentProject = project + UiTestCatroidApplication.projectManager.currentSprite = sprite return project }