IDE-150 Refactoring UI Espresso Tests and TestUtils (Catrobat#4748)

reichli · Aug 8, 2023 · 9800b95 · 9800b95
1 parent 9d67f2f
commit 9800b95
Show file tree

Hide file tree

Showing 135 changed files with 486 additions and 1,059 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
@@ -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
@@ -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
@@ -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/...a/org/catrobat/catroid/uiespresso/content/brick/app/AddUserListToActiveFormulaUITest.java b/...a/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<Object[]> 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/...va/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastBrickMessageUpdateTest.java b/...va/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/...ndroidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeVariableTest.java b/...ndroidTest/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/...java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteItemOfUserListBrickTest.java b/...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/...androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DeleteLookBrickTest.kt b/...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/...org/catrobat/catroid/uiespresso/content/brick/app/DeleteUserDefinedReceiverBrickTest.java b/...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/...droidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/EmptyEventBrickTest.java b/...droidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/EmptyEventBrickTest.java
@@ -23,25 +23,23 @@
 
 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;
 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.ProjectListActivity;
+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.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/...Test/java/org/catrobat/catroid/uiespresso/content/brick/app/InsertItemToUserListTest.java b/...Test/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();