-
Notifications
You must be signed in to change notification settings - Fork 687
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4021 from Walcho1125/CATROID-509
CATROID-509 Upload of someone else´s project without any changes is n…
- Loading branch information
Showing
14 changed files
with
356 additions
and
6 deletions.
There are no files selected for viewing
132 changes: 132 additions & 0 deletions
132
...c/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/ReuploadProjectDialogTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| /* | ||
| * Catroid: An on-device visual programming system for Android devices | ||
| * Copyright (C) 2010-2021 The Catrobat Team | ||
| * (<http://developer.catrobat.org/credits>) | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * An additional term exception under section 7 of the GNU Affero | ||
| * General Public License, version 3, is available at | ||
| * http://developer.catrobat.org/license_additional_term | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.catrobat.catroid.uiespresso.ui.dialog | ||
|
|
||
| import android.content.Intent | ||
| import androidx.test.core.app.ApplicationProvider | ||
| import androidx.test.espresso.Espresso | ||
| import androidx.test.espresso.action.ViewActions | ||
| import androidx.test.espresso.assertion.ViewAssertions | ||
| import androidx.test.espresso.matcher.ViewMatchers | ||
| 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 | ||
| import org.catrobat.catroid.content.StartScript | ||
| import org.catrobat.catroid.formulaeditor.UserVariable | ||
| import org.catrobat.catroid.io.XstreamSerializer | ||
| import org.catrobat.catroid.io.asynctask.ProjectSaveTask | ||
| import org.catrobat.catroid.ui.ProjectUploadActivity | ||
| import org.catrobat.catroid.uiespresso.ui.activity.ProjectUploadRatingDialogTest.ProjectUploadTestActivity | ||
| import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule | ||
| import org.junit.After | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
|
|
||
| class ReuploadProjectDialogTest { | ||
| @get:Rule | ||
| var activityTestRule = BaseActivityTestRule( | ||
| ProjectUploadTestActivity::class.java, false, false | ||
| ) | ||
|
|
||
| var dummyProject: Project? = null | ||
| var projectName = "reuploadedProject" | ||
|
|
||
| fun createDownloadedProject(name: String?) { | ||
| dummyProject = Project( | ||
| ApplicationProvider.getApplicationContext(), | ||
| name | ||
| ) | ||
| val dummyScene = Scene("scene", dummyProject!!) | ||
| ProjectManager.getInstance().currentProject = dummyProject | ||
| val sprite = Sprite("sprite") | ||
| val firstScript: Script = StartScript() | ||
| dummyScene.addSprite(sprite) | ||
| sprite.addScript(firstScript) | ||
| dummyProject!!.addScene(dummyScene) | ||
| ProjectSaveTask.task(dummyProject, ApplicationProvider.getApplicationContext()) | ||
| val intent = Intent() | ||
| intent.putExtra(ProjectUploadActivity.PROJECT_DIR, dummyProject!!.directory) | ||
| activityTestRule.launchActivity(intent) | ||
| } | ||
|
|
||
| @After | ||
| @Throws(Exception::class) | ||
| fun tearDown() { | ||
| ProjectManager.getInstance().deleteDownloadedProjectInformation(projectName) | ||
| } | ||
|
|
||
| @Test | ||
| fun showUploadWarningForUnchangedProjectTest() { | ||
| ProjectManager.getInstance().deleteDownloadedProjectInformation(projectName) | ||
| ProjectManager.getInstance().addNewDownloadedProject(projectName) | ||
| createDownloadedProject(projectName) | ||
| Espresso.onView(ViewMatchers.withText(R.string.warning)) | ||
| .check(ViewAssertions.matches(ViewMatchers.isDisplayed())) | ||
| Espresso.onView(ViewMatchers.withText(R.string.ok)).perform(ViewActions.click()) | ||
| } | ||
|
|
||
| @Test | ||
| fun notShowUploadWarningForChangedProjectTest() { | ||
| ProjectManager.getInstance().loadDownloadedProjects() | ||
| ProjectManager.getInstance().deleteDownloadedProjectInformation(projectName) | ||
| ProjectManager.getInstance().addNewDownloadedProject(projectName) | ||
| createDownloadedProject(projectName) | ||
| Espresso.onView(ViewMatchers.withText(R.string.warning)) | ||
| .check(ViewAssertions.matches(ViewMatchers.isDisplayed())) | ||
| Espresso.onView(ViewMatchers.withText(R.string.ok)).perform(ViewActions.click()) | ||
| val currentProject = ProjectManager.getInstance().currentProject | ||
| val newScene = Scene("scene", currentProject) | ||
| currentProject.addScene(newScene) | ||
| XstreamSerializer.getInstance().saveProject(currentProject) | ||
| ProjectSaveTask.task(currentProject, ApplicationProvider.getApplicationContext()) | ||
| val intent = Intent() | ||
| intent.putExtra(ProjectUploadActivity.PROJECT_DIR, currentProject.directory) | ||
| activityTestRule.launchActivity(intent) | ||
| Espresso.onView(ViewMatchers.withText(R.string.main_menu_upload)) | ||
| .check(ViewAssertions.matches(ViewMatchers.isDisplayed())) | ||
| } | ||
|
|
||
| @Test | ||
| fun notShowUploadWarningForAddedVariableProjectTest() { | ||
| ProjectManager.getInstance().loadDownloadedProjects() | ||
| ProjectManager.getInstance().deleteDownloadedProjectInformation(projectName) | ||
| ProjectManager.getInstance().addNewDownloadedProject(projectName) | ||
| createDownloadedProject(projectName) | ||
| Espresso.onView(ViewMatchers.withText(R.string.warning)) | ||
| .check(ViewAssertions.matches(ViewMatchers.isDisplayed())) | ||
| Espresso.onView(ViewMatchers.withText(R.string.ok)).perform(ViewActions.click()) | ||
| val currentProject = ProjectManager.getInstance().currentProject | ||
| val userVariable = UserVariable("uservariable") | ||
| currentProject.addUserVariable(userVariable) | ||
| XstreamSerializer.getInstance().saveProject(currentProject) | ||
| ProjectSaveTask.task(currentProject, ApplicationProvider.getApplicationContext()) | ||
| val intent = Intent() | ||
| intent.putExtra(ProjectUploadActivity.PROJECT_DIR, currentProject.directory) | ||
| activityTestRule.launchActivity(intent) | ||
| Espresso.onView(ViewMatchers.withText(R.string.main_menu_upload)) | ||
| .check(ViewAssertions.matches(ViewMatchers.isDisplayed())) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.