diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index c956b5436ca..741cd530d67 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -61,6 +61,14 @@
+
+
+
+
+
+
@@ -273,5 +281,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 94ef9d401ea..1e2ac1dfa8b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -98,20 +98,23 @@ pipeline {
// Build the flavors so that they can be installed next independently of older versions.
sh "./gradlew ${useWebTestParameter()} -Pindependent='#$env.BUILD_NUMBER $env.BRANCH_NAME' assembleCatroidDebug ${allFlavoursParameters()}"
+ renameApks("${env.BRANCH_NAME}-${env.BUILD_NUMBER}")
archiveArtifacts '**/*.apk'
}
}
stage('Static Analysis') {
steps {
- sh './gradlew pmd checkstyle lint'
+ sh './gradlew pmd checkstyle lint detekt'
}
post {
always {
- pmd canComputeNew: false, canRunOnFailed: true, defaultEncoding: '', healthy: '', pattern: "catroid/build/reports/pmd.xml", unHealthy: '', unstableTotalAll: '0'
- checkstyle canComputeNew: false, canRunOnFailed: true, defaultEncoding: '', healthy: '', pattern: "catroid/build/reports/checkstyle.xml", unHealthy: '', unstableTotalAll: '0'
- androidLint canComputeNew: false, canRunOnFailed: true, defaultEncoding: '', healthy: '', pattern: "catroid/build/reports/lint*.xml", unHealthy: '', unstableTotalAll: '0'
+ recordIssues aggregatingResults: true, enabledForFailure: true, qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]],
+ tools: [androidLintParser(pattern: 'catroid/build/reports/lint*.xml'),
+ checkStyle(pattern: 'catroid/build/reports/checkstyle.xml'),
+ pmdParser(pattern: 'catroid/build/reports/pmd.xml'),
+ detekt(pattern: 'catroid/build/reports/detekt/detekt.xml')]
}
}
}
@@ -142,6 +145,36 @@ pipeline {
}
}
+ stage('Legacy Tests') {
+ steps {
+ sh '''./gradlew -PenableCoverage -PlogcatFile=legacy_logcat.txt -Pemulator=android19 \
+ startEmulator createCatroidDebugAndroidTestCoverageReport \
+ -Pandroid.testInstrumentationRunnerArguments.class=org.catrobat.catroid.uiespresso.testsuites.ApiLevel19RegressionTestsSuite'''
+ }
+
+ post {
+ always {
+ postEmulator 'legacy'
+ }
+ }
+ }
+
+ stage('Testrunner Tests') {
+ steps {
+ sh '''./gradlew -PenableCoverage -PlogcatFile=testrunner_logcat.txt -Pemulator=android24 \
+ startEmulator createCatroidDebugAndroidTestCoverageReport \
+ -Pandroid.testInstrumentationRunnerArguments.package=org.catrobat.catroid.catrobattestrunner'''
+
+
+ }
+
+ post {
+ always {
+ postEmulator 'testrunner'
+ }
+ }
+ }
+
stage('Quarantined Tests') {
when {
expression { isJobStartedByTimer() }
diff --git a/Jenkinsfile.buildMetadata b/Jenkinsfile.buildMetadata
index 47d073e64b9..6a102f8b6c4 100644
--- a/Jenkinsfile.buildMetadata
+++ b/Jenkinsfile.buildMetadata
@@ -27,17 +27,26 @@ pipeline {
stage('Prepare build') {
steps {
script {
- currentBuild.displayName = "#${env.BUILD_NUMBER}"
+ currentBuild.displayName = "#${env.BUILD_NUMBER} | ${env.flavor} | ${env.gitBranch}"
}
}
}
stage('Setup Translations') {
steps {
- sh '''
- set +x
- ./gradlew generateCrowdinMetadataCatroid -PcrowdinKey=$crowdinKey
- '''
+ script {
+ if (env.flavor == 'Playground') {
+ sh '''
+ set +x
+ ./gradlew generateCrowdinMetadataCatroid -PcrowdinKey=$crowdinKey
+ '''
+ } else {
+ sh '''
+ set +x
+ ./gradlew generateCrowdinMetadata${flavor} -PcrowdinKey=$crowdinKey
+ '''
+ }
+ }
}
}
@@ -49,7 +58,15 @@ pipeline {
stage('Create Screenshots') {
steps {
- sh "./gradlew generateScreenshotsCatroid"
+ script {
+ if (env.flavor == 'Playground') {
+ sh './gradlew generateScreenshotsCatroid'
+ } else {
+ sh './gradlew generateScreenshots${flavor}'
+ }
+ }
+ zip zipFile: 'metadata.zip', archive: false, dir: 'fastlane/metadata'
+ archiveArtifacts artifacts: 'metadata.zip', fingerprint: true
}
post {
always {
@@ -88,7 +105,7 @@ pipeline {
environment name: 'APPROVE_DEPLOY', value: 'yes'
}
steps {
- sh "fastlane android upload_Metadata_Catroid"
+ sh 'fastlane android upload_Metadata_${flavor}'
}
}
@@ -97,12 +114,24 @@ pipeline {
environment name: 'APPROVE_DEPLOY', value: 'yes'
}
steps {
- sh "fastlane android promote_Catroid"
+ script {
+ if (env.flavor == 'Playground') {
+ echo 'Playground cannot be promoted to production!'
+ } else {
+ // deactivated for testing to not publish by accident
+ //sh 'fastlane android promote_${flavor}'
+ echo 'The promotion of the APK is currently deactivated!'
+ }
+ }
}
}
}
post {
+ always {
+ // clean workspace
+ deleteDir()
+ }
changed {
notifyChat()
}
diff --git a/Jenkinsfile.releaseAPK b/Jenkinsfile.releaseAPK
index ba4eba06d33..8393600d172 100644
--- a/Jenkinsfile.releaseAPK
+++ b/Jenkinsfile.releaseAPK
@@ -27,7 +27,7 @@ pipeline {
stage('Prepare build') {
steps {
script {
- currentBuild.displayName = "#${env.BUILD_NUMBER}"
+ currentBuild.displayName = "#${env.BUILD_NUMBER} | ${env.flavor} | ${env.gitBranch}"
}
}
}
@@ -36,17 +36,46 @@ pipeline {
steps {
// Build, zipalign and sign releasable APK
withCredentials([file(credentialsId: 'a925b6e8-b3c6-407e-8cad-65886e330037', variable: 'SIGNING_KEYSTORE')]) {
- sh '''
- set +x
- ./gradlew assembleCatroidSignedRelease \
- -PsigningKeystore=${SIGNING_KEYSTORE} \
- -PsigningKeystorePassword=$signingKeystorePassword \
- -PsigningKeyAlias=$signingKeyAlias \
- -PsigningKeyPassword=$signingKeyPassword \
- -PfirebaseApiKey=$firebaseApiKey \
- -PfabricApiKey=$fabricApiKey \
- -PfabricApiSecret=$fabricApiSecret
- '''
+ script {
+ if (env.flavor == 'All') {
+ sh '''
+ set +x
+ ./gradlew assembleSignedRelease \
+ -PsigningKeystore=${SIGNING_KEYSTORE} \
+ -PsigningKeystorePassword=$signingKeystorePassword \
+ -PsigningKeyAlias=$signingKeyAlias \
+ -PsigningKeyPassword=$signingKeyPassword \
+ -PfirebaseApiKey=$firebaseApiKey \
+ -PfabricApiKey=$fabricApiKey \
+ -PfabricApiSecret=$fabricApiSecret
+ '''
+ } else if (env.flavor == 'Playground') {
+ sh '''
+ set +x
+ ./gradlew assembleCatroidSignedRelease \
+ -PsigningKeystore=${SIGNING_KEYSTORE} \
+ -PsigningKeystorePassword=$signingKeystorePassword \
+ -PsigningKeyAlias=$signingKeyAlias \
+ -PsigningKeyPassword=$signingKeyPassword \
+ -PfirebaseApiKey=$firebaseApiKey \
+ -PfabricApiKey=$fabricApiKey \
+ -PfabricApiSecret=$fabricApiSecret \
+ -Pplayground=true
+ '''
+ } else {
+ sh '''
+ set +x
+ ./gradlew assemble${flavor}SignedRelease \
+ -PsigningKeystore=${SIGNING_KEYSTORE} \
+ -PsigningKeystorePassword=$signingKeystorePassword \
+ -PsigningKeyAlias=$signingKeyAlias \
+ -PsigningKeyPassword=$signingKeyPassword \
+ -PfirebaseApiKey=$firebaseApiKey \
+ -PfabricApiKey=$fabricApiKey \
+ -PfabricApiSecret=$fabricApiSecret
+ '''
+ }
+ }
}
archiveArtifacts artifacts: 'catroid/build/outputs/apk/**/*signedRelease.apk', fingerprint: true
}
@@ -70,7 +99,18 @@ pipeline {
environment name: 'APPROVE_UPLOAD_APK', value: 'yes'
}
steps {
- sh "fastlane android upload_APK_Catroid"
+ script {
+ if (env.flavor == 'All') {
+ sh '''
+ fastlane android upload_APK_Catroid \
+ fastlane android upload_APK_CreateAtSchool
+ fastlane android upload_APK_LunaAndCat \
+ fastlane android upload_APK_Phiro \
+ '''
+ } else {
+ sh 'fastlane android upload_APK_${flavor}'
+ }
+ }
}
}
}
diff --git a/catroid/build.gradle b/catroid/build.gradle
index d1c3b76adc1..7c16559296b 100644
--- a/catroid/build.gradle
+++ b/catroid/build.gradle
@@ -24,14 +24,19 @@
buildscript {
repositories {
maven { url 'https://maven.fabric.io/public' }
+ google()
jcenter()
}
dependencies {
classpath 'io.fabric.tools:gradle:1.21.5'
- classpath 'com.google.gms:google-services:3.0.0'
+ classpath 'com.google.gms:google-services:4.2.0'
}
}
+plugins {
+ id "io.gitlab.arturbosch.detekt" version "1.0.0-RC14"
+}
+
repositories {
maven { url "https://jitpack.io" }
maven { url 'https://maven.fabric.io/public' }
@@ -92,6 +97,13 @@ apply plugin: 'checkstyle'
apply plugin: 'jacoco-android'
apply plugin: 'pmd'
+detekt {
+ toolVersion = "1.0.0-RC14"
+ config = files("config/detekt.yml")
+ input = files("src")
+ filters = ".*/resources/.*,.*/build/.*"
+}
+
apply from: 'gradle/code_quality_tasks.gradle'
apply from: 'gradle/intellij_config_tasks.gradle'
apply from: 'gradle/standalone_apk_tasks.gradle'
@@ -100,6 +112,7 @@ apply from: 'gradle/release_fastlane_tasks.gradle'
check.dependsOn 'checkstyle'
check.dependsOn 'pmd'
+check.dependsOn 'detekt'
// When -Pindependent was provided on the gradle command the APP name is changed.
// This allows to have multiple Catroid versions installed in parallel for testing purposes.
@@ -111,6 +124,13 @@ if (project.hasProperty('independent')) {
manifestAppName = appName
}
+if (project.hasProperty('playground') && project.getProperties().get('playground') == 'true') {
+ logger.lifecycle('playground true: ' + project.getProperties().get('playground'))
+ appId = 'org.catrobat.catroid.test'
+ appName = 'Catrobat Playground'
+ manifestAppName = appName
+}
+
if (!project.hasProperty("signingKeystore")) {
ext.signingKeystore = "dummyKeystore"
}
@@ -166,9 +186,9 @@ android {
targetSdkVersion 26
applicationId appId
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
- versionCode 59
+ versionCode 60
println "VersionCode is $versionCode"
- versionName "0.9.56"
+ versionName "0.9.58"
println "VersionName is $versionName"
buildConfigField "String", "GIT_COMMIT_INFO", "\"${getGitCommitInfo()}\""
buildConfigField "String", "MAIN_URL_HTTPS", (project.hasProperty('useWebTest') ? '"https://web-test.catrob.at"' : '"https://share.catrob.at"')
@@ -199,6 +219,11 @@ android {
htmlOutput file("build/reports/lint-report.html")
}
+ testOptions {
+ unitTests.returnDefaultValues = true
+ unitTests.includeAndroidResources = true
+ }
+
dexOptions.javaMaxHeapSize "4g"
packagingOptions {
@@ -247,6 +272,7 @@ android {
buildConfigField "boolean", "FEATURE_CLOUD_MESSAGING_ENABLED", "true"
buildConfigField "boolean", "CRASHLYTICS_CRASH_REPORT_ENABLED", "true"
buildConfigField "boolean", "USE_ANDROID_LOCALES_FOR_SCREENSHOTS", useAndroidLocales()
+ buildConfigField "boolean", "FEATURE_MERGE_ENABLED", "true"
resValue "string", "SNACKBAR_HINTS_ENABLED", "false"
ext.enableCrashlytics = false
testCoverageEnabled = project.hasProperty('enableCoverage')
@@ -269,6 +295,7 @@ android {
buildConfigField "boolean", "FEATURE_CLOUD_MESSAGING_ENABLED", "false"
buildConfigField "boolean", "CRASHLYTICS_CRASH_REPORT_ENABLED", "true"
buildConfigField "boolean", "USE_ANDROID_LOCALES_FOR_SCREENSHOTS", "false"
+ buildConfigField "boolean", "FEATURE_MERGE_ENABLED", "false"
resValue "string", "SNACKBAR_HINTS_ENABLED", "true"
}
@@ -279,6 +306,10 @@ android {
}
flavorDimensions "default"
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
productFlavors {
catroid {
@@ -347,7 +378,7 @@ ext {
mockitoVersion = "2.8.47"
espressoVersion = "3.0.1"
supportLibraryVersion = "27.1.0"
- paintroidVersion = "2.3.1"
+ paintroidVersion = "2.3.2"
}
configurations {
@@ -431,6 +462,14 @@ dependencies {
testImplementation 'junit:junit:4.12'
testImplementation "org.mockito:mockito-core:$mockitoVersion"
+ testImplementation 'org.hamcrest:hamcrest-library:1.3'
+
+ testImplementation 'org.powermock:powermock:1.6.6'
+ testImplementation 'org.powermock:powermock-module-junit4:2.0.0'
+ testImplementation 'org.powermock:powermock-api-mockito2:2.0.0'
+
+ testImplementation 'org.robolectric:robolectric:4.2.1'
+ testImplementation "org.robolectric:shadows-multidex:4.2.1"
androidTestImplementation fileTree(include: '*.jar', dir: 'src/androidTest/libs')
androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.2.0'
@@ -447,6 +486,8 @@ dependencies {
pmd 'net.sourceforge.pmd:pmd-java:5.8.1'
checkstyle 'com.puppycrawl.tools:checkstyle:7.6'
+
+ detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.0.0-RC14"
}
static def getGitCommitInfo() {
diff --git a/catroid/config/detekt.yml b/catroid/config/detekt.yml
new file mode 100644
index 00000000000..82c31b657c2
--- /dev/null
+++ b/catroid/config/detekt.yml
@@ -0,0 +1,504 @@
+autoCorrect: true
+
+test-pattern: # Configure exclusions for test sources
+ active: true
+ patterns: # Test file regexes
+ - '.*/test/.*'
+ - '.*/androidTest/.*'
+ - '.*Test.kt'
+ - '.*Spec.kt'
+ - '.*Spek.kt'
+ exclude-rule-sets:
+ - 'comments'
+ exclude-rules:
+ - 'NamingRules'
+ - 'WildcardImport'
+ - 'MagicNumber'
+ - 'MaxLineLength'
+ - 'LateinitUsage'
+ - 'StringLiteralDuplication'
+ - 'SpreadOperator'
+ - 'TooManyFunctions'
+ - 'ForEachOnRange'
+ - 'FunctionMaxLength'
+ - 'TooGenericExceptionCaught'
+ - 'InstanceOfCheckForException'
+
+build:
+ maxIssues: 0
+ weights:
+ # complexity: 2
+ # LongParameterList: 1
+ # style: 1
+ # comments: 1
+
+processors:
+ active: true
+ exclude:
+ # - 'FunctionCountProcessor'
+ # - 'PropertyCountProcessor'
+ # - 'ClassCountProcessor'
+ # - 'PackageCountProcessor'
+ # - 'KtFileCountProcessor'
+
+console-reports:
+ active: true
+ exclude:
+ # - 'ProjectStatisticsReport'
+ # - 'ComplexityReport'
+ # - 'NotificationReport'
+ # - 'FindingsReport'
+ # - 'BuildFailureReport'
+
+complexity:
+ active: true
+ ComplexCondition:
+ active: true
+ threshold: 4
+ ComplexInterface:
+ active: false
+ threshold: 10
+ includeStaticDeclarations: false
+ ComplexMethod:
+ active: true
+ threshold: 10
+ ignoreSingleWhenExpression: true
+ ignoreSimpleWhenEntries: true
+ LabeledExpression:
+ active: false
+ ignoredLabels: ""
+ LargeClass:
+ active: true
+ threshold: 600
+ LongMethod:
+ active: true
+ threshold: 60
+ LongParameterList:
+ active: true
+ threshold: 6
+ ignoreDefaultParameters: false
+ MethodOverloading:
+ active: true
+ threshold: 2
+ NestedBlockDepth:
+ active: true
+ threshold: 4
+ StringLiteralDuplication:
+ active: true
+ threshold: 3
+ ignoreAnnotation: true
+ excludeStringsWithLessThan5Characters: true
+ ignoreStringsRegex: '$^'
+ TooManyFunctions:
+ active: false
+ thresholdInFiles: 11
+ thresholdInClasses: 11
+ thresholdInInterfaces: 11
+ thresholdInObjects: 11
+ thresholdInEnums: 11
+ ignoreDeprecated: false
+ ignorePrivate: false
+ ignoreOverridden: false
+
+empty-blocks:
+ active: true
+ EmptyCatchBlock:
+ active: true
+ allowedExceptionNameRegex: "^expected.*"
+ EmptyClassBlock:
+ active: true
+ EmptyDefaultConstructor:
+ active: true
+ EmptyDoWhileBlock:
+ active: true
+ EmptyElseBlock:
+ active: true
+ EmptyFinallyBlock:
+ active: true
+ EmptyForBlock:
+ active: true
+ EmptyFunctionBlock:
+ active: true
+ ignoreOverriddenFunctions: false
+ EmptyIfBlock:
+ active: true
+ EmptyInitBlock:
+ active: true
+ EmptyKtFile:
+ active: true
+ EmptySecondaryConstructor:
+ active: true
+ EmptyWhenBlock:
+ active: true
+ EmptyWhileBlock:
+ active: true
+
+exceptions:
+ active: true
+ ExceptionRaisedInUnexpectedLocation:
+ active: true
+ methodNames: 'toString,hashCode,equals,finalize'
+ InstanceOfCheckForException:
+ active: true
+ NotImplementedDeclaration:
+ active: true
+ PrintStackTrace:
+ active: true
+ RethrowCaughtException:
+ active: true
+ ReturnFromFinally:
+ active: true
+ SwallowedException:
+ active: true
+ ignoredExceptionTypes: 'InterruptedException,NumberFormatException,ParseException,MalformedURLException'
+ ThrowingExceptionFromFinally:
+ active: true
+ ThrowingExceptionInMain:
+ active: true
+ ThrowingExceptionsWithoutMessageOrCause:
+ active: true
+ exceptions: 'IllegalArgumentException,IllegalStateException,IOException'
+ ThrowingNewInstanceOfSameException:
+ active: true
+ TooGenericExceptionCaught:
+ active: true
+ exceptionNames:
+ - ArrayIndexOutOfBoundsException
+ - Error
+ - Exception
+ - IllegalMonitorStateException
+ - NullPointerException
+ - IndexOutOfBoundsException
+ - RuntimeException
+ - Throwable
+ allowedExceptionNameRegex: "^expected.*"
+ TooGenericExceptionThrown:
+ active: true
+ exceptionNames:
+ - Error
+ - Exception
+ - Throwable
+ - RuntimeException
+
+formatting:
+ active: true
+ android: true
+ autoCorrect: true
+ ChainWrapping:
+ active: true
+ autoCorrect: true
+ CommentSpacing:
+ active: true
+ autoCorrect: true
+ Filename:
+ active: true
+ FinalNewline:
+ active: true
+ autoCorrect: true
+ ImportOrdering:
+ active: false
+ Indentation:
+ active: true
+ autoCorrect: true
+ indentSize: 4
+ continuationIndentSize: 4
+ MaximumLineLength:
+ active: false
+ maxLineLength: 120
+ ModifierOrdering:
+ active: true
+ autoCorrect: true
+ NoBlankLineBeforeRbrace:
+ active: true
+ autoCorrect: true
+ NoConsecutiveBlankLines:
+ active: true
+ autoCorrect: true
+ NoEmptyClassBody:
+ active: true
+ autoCorrect: true
+ NoItParamInMultilineLambda:
+ active: false
+ NoLineBreakAfterElse:
+ active: true
+ autoCorrect: true
+ NoLineBreakBeforeAssignment:
+ active: true
+ autoCorrect: true
+ NoMultipleSpaces:
+ active: true
+ autoCorrect: true
+ NoSemicolons:
+ active: true
+ autoCorrect: true
+ NoTrailingSpaces:
+ active: true
+ autoCorrect: true
+ NoUnitReturn:
+ active: true
+ autoCorrect: true
+ NoUnusedImports:
+ active: true
+ autoCorrect: true
+ NoWildcardImports:
+ active: true
+ autoCorrect: true
+ PackageName:
+ active: true
+ autoCorrect: true
+ ParameterListWrapping:
+ active: true
+ autoCorrect: true
+ indentSize: 4
+ SpacingAroundColon:
+ active: true
+ autoCorrect: true
+ SpacingAroundComma:
+ active: true
+ autoCorrect: true
+ SpacingAroundCurly:
+ active: true
+ autoCorrect: true
+ SpacingAroundKeyword:
+ active: true
+ autoCorrect: true
+ SpacingAroundOperators:
+ active: true
+ autoCorrect: true
+ SpacingAroundParens:
+ active: true
+ autoCorrect: true
+ SpacingAroundRangeOperator:
+ active: true
+ autoCorrect: true
+ StringTemplate:
+ active: true
+ autoCorrect: true
+
+naming:
+ active: true
+ ClassNaming:
+ active: true
+ classPattern: '[A-Z$][a-zA-Z0-9$]*'
+ ConstructorParameterNaming:
+ active: true
+ parameterPattern: '[a-z][A-Za-z0-9]*'
+ privateParameterPattern: '[a-z][A-Za-z0-9]*'
+ excludeClassPattern: '$^'
+ EnumNaming:
+ active: true
+ enumEntryPattern: '^[A-Z][_a-zA-Z0-9]*'
+ ForbiddenClassName:
+ active: false
+ forbiddenName: ''
+ FunctionMaxLength:
+ active: false
+ maximumFunctionNameLength: 30
+ FunctionMinLength:
+ active: false
+ minimumFunctionNameLength: 3
+ FunctionNaming:
+ active: true
+ functionPattern: '^([a-z$][a-zA-Z$0-9]*)|(`.*`)$'
+ excludeClassPattern: '$^'
+ ignoreOverridden: true
+ FunctionParameterNaming:
+ active: true
+ parameterPattern: '[a-z][A-Za-z0-9]*'
+ excludeClassPattern: '$^'
+ ignoreOverriddenFunctions: true
+ MatchingDeclarationName:
+ active: true
+ MemberNameEqualsClassName:
+ active: false
+ ignoreOverriddenFunction: true
+ ObjectPropertyNaming:
+ active: true
+ constantPattern: '[A-Za-z][_A-Za-z0-9]*'
+ propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+ privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
+ PackageNaming:
+ active: true
+ packagePattern: '^[a-z]+(\.[a-z][A-Za-z0-9]*)*$'
+ TopLevelPropertyNaming:
+ active: true
+ constantPattern: '[A-Z][_A-Z0-9]*'
+ propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+ privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
+ VariableMaxLength:
+ active: false
+ maximumVariableNameLength: 64
+ VariableMinLength:
+ active: false
+ minimumVariableNameLength: 1
+ VariableNaming:
+ active: true
+ variablePattern: '[a-z][A-Za-z0-9]*'
+ privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
+ excludeClassPattern: '$^'
+ ignoreOverridden: true
+
+performance:
+ active: true
+ ArrayPrimitive:
+ active: true
+ ForEachOnRange:
+ active: true
+ SpreadOperator:
+ active: true
+ UnnecessaryTemporaryInstantiation:
+ active: true
+
+potential-bugs:
+ active: true
+ DuplicateCaseInWhenExpression:
+ active: true
+ EqualsAlwaysReturnsTrueOrFalse:
+ active: true
+ EqualsWithHashCodeExist:
+ active: true
+ ExplicitGarbageCollectionCall:
+ active: true
+ InvalidRange:
+ active: true
+ IteratorHasNextCallsNextMethod:
+ active: true
+ IteratorNotThrowingNoSuchElementException:
+ active: true
+ LateinitUsage:
+ active: false
+ excludeAnnotatedProperties: ""
+ ignoreOnClassesPattern: ""
+ UnconditionalJumpStatementInLoop:
+ active: true
+ UnreachableCode:
+ active: true
+ UnsafeCallOnNullableType:
+ active: true
+ UnsafeCast:
+ active: true
+ UselessPostfixExpression:
+ active: true
+ WrongEqualsTypeParameter:
+ active: true
+
+style:
+ active: true
+ CollapsibleIfStatements:
+ active: true
+ DataClassContainsFunctions:
+ active: true
+ conversionFunctionPrefix: 'to'
+ EqualsNullCall:
+ active: true
+ EqualsOnSignatureLine:
+ active: true
+ ExplicitItLambdaParameter:
+ active: true
+ ExpressionBodySyntax:
+ active: true
+ includeLineWrapping: false
+ ForbiddenComment:
+ active: true
+ values: 'TODO,FIXME,STOPSHIP'
+ ForbiddenImport:
+ active: false
+ imports: ''
+ ForbiddenVoid:
+ active: true
+ FunctionOnlyReturningConstant:
+ active: true
+ ignoreOverridableFunction: true
+ excludedFunctions: 'describeContents'
+ LoopWithTooManyJumpStatements:
+ active: true
+ maxJumpCount: 1
+ MagicNumber:
+ active: true
+ ignoreNumbers: '-1,0,1,2'
+ ignoreHashCodeFunction: true
+ ignorePropertyDeclaration: false
+ ignoreConstantDeclaration: true
+ ignoreCompanionObjectPropertyDeclaration: true
+ ignoreAnnotation: false
+ ignoreNamedArgument: true
+ ignoreEnums: false
+ MandatoryBracesIfStatements:
+ active: true
+ MaxLineLength:
+ active: false
+ maxLineLength: 120
+ excludePackageStatements: true
+ excludeImportStatements: true
+ excludeCommentStatements: false
+ MayBeConst:
+ active: false
+ ModifierOrder:
+ active: true
+ NestedClassesVisibility:
+ active: true
+ NewLineAtEndOfFile:
+ active: true
+ NoTabs:
+ active: true
+ OptionalAbstractKeyword:
+ active: true
+ OptionalUnit:
+ active: true
+ OptionalWhenBraces:
+ active: true
+ PreferToOverPairSyntax:
+ active: true
+ ProtectedMemberInFinalClass:
+ active: true
+ RedundantVisibilityModifierRule:
+ active: true
+ ReturnCount:
+ active: false
+ max: 2
+ excludedFunctions: "equals"
+ excludeLabeled: false
+ excludeReturnFromLambda: true
+ SafeCast:
+ active: true
+ SerialVersionUIDInSerializableClass:
+ active: true
+ SpacingBetweenPackageAndImports:
+ active: true
+ ThrowsCount:
+ active: true
+ max: 2
+ TrailingWhitespace:
+ active: true
+ UnderscoresInNumericLiterals:
+ active: true
+ acceptableDecimalLength: 5
+ UnnecessaryAbstractClass:
+ active: true
+ excludeAnnotatedClasses: "dagger.Module"
+ UnnecessaryApply:
+ active: true
+ UnnecessaryInheritance:
+ active: true
+ UnnecessaryLet:
+ active: true
+ UnnecessaryParentheses:
+ active: true
+ UntilInsteadOfRangeTo:
+ active: true
+ UnusedImports:
+ active: true
+ UnusedPrivateClass:
+ active: true
+ UnusedPrivateMember:
+ active: true
+ allowedNames: "(_|ignored|expected|serialVersionUID)"
+ UseDataClass:
+ active: true
+ excludeAnnotatedClasses: ""
+ UtilityClassWithPublicConstructor:
+ active: true
+ VarCouldBeVal:
+ active: true
+ WildcardImport:
+ active: true
diff --git a/catroid/gradle/release_fastlane_tasks.gradle b/catroid/gradle/release_fastlane_tasks.gradle
index e80fc889199..c38c9f9ab6e 100644
--- a/catroid/gradle/release_fastlane_tasks.gradle
+++ b/catroid/gradle/release_fastlane_tasks.gradle
@@ -65,7 +65,7 @@ android.productFlavors.all { flavor ->
String fastlaneCommand = "fastlane screengrab" +
" --app_package_name 'org.catrobat.catroid'" +
- " --use_tests_in_packages 'org.catrobat.catroid.screenshots.${flavor.name}'" +
+ " --use_tests_in_packages 'org.catrobat.catroid.screenshots.${flavor.name.toLowerCase()}'" +
" --app_apk_path './catroid/build/outputs/apk/${flavor.name}/debug/catroid-${flavor.name}-debug.apk'" +
" --tests_apk_path './catroid/build/outputs/apk/androidTest/${flavor.name}/debug/catroid-${flavor.name}-debug-androidTest.apk'" +
" --test_instrumentation_runner 'android.support.test.runner.AndroidJUnitRunner'" +
diff --git a/catroid/src/androidTest/assets/TestUserDataConversion0999To09991.catrobat b/catroid/src/androidTest/assets/TestUserDataConversion0999To09991.catrobat
new file mode 100644
index 00000000000..19b6cc7fbe0
Binary files /dev/null and b/catroid/src/androidTest/assets/TestUserDataConversion0999To09991.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailDoubleNotEqual.catrobat b/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailDoubleNotEqual.catrobat
new file mode 100644
index 00000000000..ba9d2f2a130
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailDoubleNotEqual.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailMismatchingTypes.catrobat b/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailMismatchingTypes.catrobat
new file mode 100644
index 00000000000..0cd56782cc7
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailMismatchingTypes.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailMissingTestVariables.catrobat b/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailMissingTestVariables.catrobat
new file mode 100644
index 00000000000..43a9c6022d4
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailMissingTestVariables.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailStringNotEqual.catrobat b/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailStringNotEqual.catrobat
new file mode 100644
index 00000000000..30c58f2d0d9
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailStringNotEqual.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailTimeout.catrobat b/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailTimeout.catrobat
new file mode 100644
index 00000000000..bf9758376c6
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTestRunnerTests/fail/testFailTimeout.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTestRunnerTests/success/testSuccessDoubleEqual.catrobat b/catroid/src/androidTest/assets/catrobatTestRunnerTests/success/testSuccessDoubleEqual.catrobat
new file mode 100644
index 00000000000..80b0a75d6f3
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTestRunnerTests/success/testSuccessDoubleEqual.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTestRunnerTests/success/testSuccessStringEqual.catrobat b/catroid/src/androidTest/assets/catrobatTestRunnerTests/success/testSuccessStringEqual.catrobat
new file mode 100644
index 00000000000..755ee682cca
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTestRunnerTests/success/testSuccessStringEqual.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/broadcast/testMultipleBroadcastReceivers.catrobat b/catroid/src/androidTest/assets/catrobatTests/broadcast/testMultipleBroadcastReceivers.catrobat
new file mode 100644
index 00000000000..b5291d07ea9
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/broadcast/testMultipleBroadcastReceivers.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testBrickInWhenStartAsCloneCommentedOutRegression.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testBrickInWhenStartAsCloneCommentedOutRegression.catrobat
new file mode 100644
index 00000000000..fd1c428d5ef
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testBrickInWhenStartAsCloneCommentedOutRegression.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testCloneBroadcastListenerOtherSprite.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testCloneBroadcastListenerOtherSprite.catrobat
new file mode 100644
index 00000000000..462907442e0
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testCloneBroadcastListenerOtherSprite.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testCloneBroadcastListenerSameSprite.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testCloneBroadcastListenerSameSprite.catrobat
new file mode 100644
index 00000000000..edb501dbc9b
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testCloneBroadcastListenerSameSprite.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testClonesNotRemovedOnContinueScene.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testClonesNotRemovedOnContinueScene.catrobat
new file mode 100644
index 00000000000..0c962950211
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testClonesNotRemovedOnContinueScene.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testClonesRemovedOnReStartScene.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testClonesRemovedOnReStartScene.catrobat
new file mode 100644
index 00000000000..e152fdd38c6
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testClonesRemovedOnReStartScene.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testDeleteCloneBroadcastListenerOtherSpriteRemoved.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testDeleteCloneBroadcastListenerOtherSpriteRemoved.catrobat
new file mode 100644
index 00000000000..ecd6267330c
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testDeleteCloneBroadcastListenerOtherSpriteRemoved.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testDeleteCloneBroadcastListenerRemoved.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testDeleteCloneBroadcastListenerRemoved.catrobat
new file mode 100644
index 00000000000..f5791bc723b
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testDeleteCloneBroadcastListenerRemoved.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testDeleteCloneInParentSpriteDoesNothing.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testDeleteCloneInParentSpriteDoesNothing.catrobat
new file mode 100644
index 00000000000..fa535bb6bef
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testDeleteCloneInParentSpriteDoesNothing.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testDeleteCloneScriptStopped.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testDeleteCloneScriptStopped.catrobat
new file mode 100644
index 00000000000..958a578b1d7
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testDeleteCloneScriptStopped.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneMultiple.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneMultiple.catrobat
new file mode 100644
index 00000000000..0fdd3662f09
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneMultiple.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneOnlyCalledByClone.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneOnlyCalledByClone.catrobat
new file mode 100644
index 00000000000..fd7157dcd0e
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneOnlyCalledByClone.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneOtherSpriteMultiple.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneOtherSpriteMultiple.catrobat
new file mode 100644
index 00000000000..cd5b9860bcc
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneOtherSpriteMultiple.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneOtherSpriteSingle.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneOtherSpriteSingle.catrobat
new file mode 100644
index 00000000000..fd12b8d03af
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneOtherSpriteSingle.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneSingle.catrobat b/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneSingle.catrobat
new file mode 100644
index 00000000000..e0641d63b1b
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/clone/testWhenStartAsCloneSingle.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/formula/testSinusFunction.catrobat b/catroid/src/androidTest/assets/catrobatTests/formula/testSinusFunction.catrobat
new file mode 100644
index 00000000000..03253c4b980
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/formula/testSinusFunction.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/sceneTransition/continueSuspendedThreadsOnContinueScene.catrobat b/catroid/src/androidTest/assets/catrobatTests/sceneTransition/continueSuspendedThreadsOnContinueScene.catrobat
new file mode 100644
index 00000000000..9b89c36200f
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/sceneTransition/continueSuspendedThreadsOnContinueScene.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/sceneTransition/discardSuspendedThreadsOnStartScene.catrobat b/catroid/src/androidTest/assets/catrobatTests/sceneTransition/discardSuspendedThreadsOnStartScene.catrobat
new file mode 100644
index 00000000000..f1c8a589a54
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/sceneTransition/discardSuspendedThreadsOnStartScene.catrobat differ
diff --git a/catroid/src/androidTest/assets/catrobatTests/sceneTransition/suspendAllThreadsOnSceneTransition.catrobat b/catroid/src/androidTest/assets/catrobatTests/sceneTransition/suspendAllThreadsOnSceneTransition.catrobat
new file mode 100644
index 00000000000..04bdf6db7cf
Binary files /dev/null and b/catroid/src/androidTest/assets/catrobatTests/sceneTransition/suspendAllThreadsOnSceneTransition.catrobat differ
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/catrobattestrunner/CatrobatTestRunner.java b/catroid/src/androidTest/java/org/catrobat/catroid/catrobattestrunner/CatrobatTestRunner.java
new file mode 100644
index 00000000000..6b747080913
--- /dev/null
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/catrobattestrunner/CatrobatTestRunner.java
@@ -0,0 +1,210 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2018 The Catrobat Team
+ * ()
+ *
+ * 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 .
+ */
+package org.catrobat.catroid.catrobattestrunner;
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.espresso.UiController;
+import android.support.test.espresso.ViewAction;
+import android.support.test.rule.ActivityTestRule;
+import android.view.View;
+
+import com.google.common.math.DoubleMath;
+
+import org.catrobat.catroid.ProjectManager;
+import org.catrobat.catroid.common.Constants;
+import org.catrobat.catroid.content.Project;
+import org.catrobat.catroid.content.bricks.AssertEqualsBrick;
+import org.catrobat.catroid.formulaeditor.UserVariable;
+import org.catrobat.catroid.io.StorageOperations;
+import org.catrobat.catroid.io.asynctask.ProjectLoadTask;
+import org.catrobat.catroid.io.asynctask.ProjectUnzipAndImportTask;
+import org.catrobat.catroid.stage.StageActivity;
+import org.catrobat.catroid.test.utils.TestUtils;
+import org.hamcrest.Matcher;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.isRoot;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static junit.framework.TestCase.assertTrue;
+
+import static org.catrobat.catroid.common.Constants.CACHE_DIR;
+import static org.catrobat.catroid.common.FlavoredConstants.DEFAULT_ROOT_DIRECTORY;
+
+@RunWith(Parameterized.class)
+public class CatrobatTestRunner {
+
+ @Rule
+ public ActivityTestRule baseActivityTestRule = new
+ ActivityTestRule<>(StageActivity.class, true, false);
+
+ private static final String TEST_ASSETS_ROOT = "catrobatTests";
+
+ private static final int TIMEOUT = 10000;
+
+ private static final double EPSILON = 0.000000000001;
+
+ private UserVariable actualVariable;
+ private UserVariable expectedVariable;
+ private UserVariable readyVariable;
+
+ @Parameterized.Parameters(name = "{0} - {1}")
+ public static Iterable data() throws IOException {
+ return getCatrobatAssetsFromPath(TEST_ASSETS_ROOT);
+ }
+
+ @Parameterized.Parameter
+ public String assetPath;
+
+ @Parameterized.Parameter(1)
+ public String assetName;
+
+ private static List getCatrobatAssetsFromPath(String path) throws IOException {
+ List parameters = new ArrayList<>();
+
+ for (String asset : InstrumentationRegistry.getContext().getAssets().list(path)) {
+ if (asset.endsWith(Constants.CATROBAT_EXTENSION)) {
+ parameters.add(new Object[] {path, asset});
+ } else {
+ parameters.addAll(getCatrobatAssetsFromPath(path + "/" + asset));
+ }
+ }
+ return parameters;
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ String projectName = assetName.replace(Constants.CATROBAT_EXTENSION, "");
+
+ TestUtils.deleteProjects(projectName);
+ DEFAULT_ROOT_DIRECTORY.mkdir();
+ CACHE_DIR.mkdir();
+
+ InputStream inputStream = InstrumentationRegistry.getContext().getAssets()
+ .open(assetPath + "/" + assetName);
+
+ File projectArchive = StorageOperations
+ .copyStreamToDir(inputStream, CACHE_DIR, assetName);
+
+ assertTrue(ProjectUnzipAndImportTask
+ .task(projectArchive));
+
+ File projectDir = new File(DEFAULT_ROOT_DIRECTORY, projectName);
+
+ assertTrue(ProjectLoadTask
+ .task(projectDir, InstrumentationRegistry.getTargetContext()));
+
+ Project project = ProjectManager.getInstance().getCurrentProject();
+
+ actualVariable = project.getUserVariable(AssertEqualsBrick.ACTUAL_VARIABLE_NAME);
+ expectedVariable = project.getUserVariable(AssertEqualsBrick.EXPECTED_VARIABLE_NAME);
+ readyVariable = project.getUserVariable(AssertEqualsBrick.READY_VARIABLE_NAME);
+ }
+
+ @After
+ public void tearDown() throws IOException {
+ StorageOperations.deleteDir(CACHE_DIR);
+ TestUtils.deleteProjects(assetName.replace(Constants.CATROBAT_EXTENSION, ""));
+ }
+
+ @Test
+ public void run() {
+ baseActivityTestRule.launchActivity(null);
+
+ if (actualVariable == null) {
+ fail("no variable with name " + AssertEqualsBrick.ACTUAL_VARIABLE_NAME + " in this project!\n"
+ + "please add an AssertEqualsBrick\n");
+ }
+
+ if (expectedVariable == null) {
+ fail("no variable with name " + AssertEqualsBrick.EXPECTED_VARIABLE_NAME + " in this project!\n"
+ + "please add an AssertEqualsBrick\n");
+ }
+
+ if (readyVariable == null) {
+ fail("no variable with name " + AssertEqualsBrick.READY_VARIABLE_NAME + " in this project!\n"
+ + "please add an AssertEqualsBrick\n");
+ }
+
+ waitForReady();
+
+ if (expectedVariable.getValue() instanceof Double
+ && actualVariable.getValue() instanceof Double) {
+ assertEquals((Double) expectedVariable.getValue(), (Double) actualVariable.getValue(), EPSILON);
+ } else if (expectedVariable.getValue() instanceof String
+ && actualVariable.getValue() instanceof String) {
+ assertEquals((String) expectedVariable.getValue(), (String) actualVariable.getValue());
+ } else {
+ fail("Type error - expected and actual are mismatching types\n"
+ + "Got:"
+ + "\nactual = " + actualVariable.getValue().toString()
+ + "\nexpected = " + expectedVariable.getValue().toString() + "\n");
+ }
+ }
+
+ private void waitForReady() {
+ int intervalMillis = 10;
+ for (int waitedFor = 0; waitedFor < TIMEOUT; waitedFor += intervalMillis) {
+ if (DoubleMath.fuzzyEquals(AssertEqualsBrick.READY_VALUE, (Double) readyVariable.getValue(), EPSILON)) {
+ return;
+ }
+ espressoWait(intervalMillis);
+ }
+ fail("Timeout after " + TIMEOUT + "ms\n"
+ + "Test never got into ready state - is the AssertEqualsBrick reached?\n");
+ }
+
+ private void espressoWait(final int milliSeconds) {
+ onView(isRoot()).perform(new ViewAction() {
+ @Override
+ public String getDescription() {
+ return "Wait for X milliseconds";
+ }
+
+ @Override
+ public Matcher getConstraints() {
+ return isDisplayed();
+ }
+
+ @Override
+ public void perform(UiController uiController, View view) {
+ uiController.loopMainThreadUntilIdle();
+ uiController.loopMainThreadForAtLeast(milliSeconds);
+ }
+ });
+ }
+}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/catrobattestrunner/CatrobatTestRunnerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/catrobattestrunner/CatrobatTestRunnerTest.java
new file mode 100644
index 00000000000..3f3dec4df06
--- /dev/null
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/catrobattestrunner/CatrobatTestRunnerTest.java
@@ -0,0 +1,93 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2018 The Catrobat Team
+ * ()
+ *
+ * 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 .
+ */
+
+package org.catrobat.catroid.catrobattestrunner;
+
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class CatrobatTestRunnerTest {
+
+ CatrobatTestRunner catrobatTestRunner = new CatrobatTestRunner();
+
+ @Rule
+ public final ExpectedException exception = ExpectedException.none();
+
+ @Test
+ public void testDoubleEqual() throws Exception {
+ testAsset("testSuccessDoubleEqual.catrobat", "catrobatTestRunnerTests/success");
+ }
+
+ @Test
+ public void testStringEqual() throws Exception {
+ testAsset("testSuccessStringEqual.catrobat", "catrobatTestRunnerTests/success");
+ }
+
+ @Test
+ public void testFailMismatchingTypes() throws Exception {
+ exception.expectMessage("Type error - expected and actual are mismatching types\n"
+ + "Got:\n"
+ + "actual = some text\n"
+ + "expected = 5.0");
+ testAsset("testFailMismatchingTypes.catrobat", "catrobatTestRunnerTests/fail");
+ }
+
+ @Test
+ public void testFailMissingTestVariables() throws Exception {
+ exception.expectMessage("no variable with name _EXPECTED in this project!\n"
+ + "please add an AssertEqualsBrick");
+ testAsset("testFailMissingTestVariables.catrobat", "catrobatTestRunnerTests/fail");
+ }
+
+ @Test
+ public void testFailStringNotEqual() throws Exception {
+ exception.expectMessage("expected:<[diff]> but was:<[text]>");
+ testAsset("testFailStringNotEqual.catrobat", "catrobatTestRunnerTests/fail");
+ }
+
+ @Test
+ public void testFailDoubleNotEqual() throws Exception {
+ exception.expectMessage("expected:<1.0> but was:<1.1>");
+ testAsset("testFailDoubleNotEqual.catrobat", "catrobatTestRunnerTests/fail");
+ }
+
+ @Test
+ public void testFailTimeout() throws Exception {
+ exception.expectMessage("Timeout after 10000ms\n"
+ + "Test never got into ready state - is the AssertEqualsBrick reached?");
+ testAsset("testFailTimeout.catrobat", "catrobatTestRunnerTests/fail");
+ }
+
+ private void testAsset(String assetName, String assetPath) throws Exception {
+ catrobatTestRunner.assetName = assetName;
+ catrobatTestRunner.assetPath = assetPath;
+ catrobatTestRunner.setUp();
+ catrobatTestRunner.run();
+ catrobatTestRunner.tearDown();
+ }
+}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/common/bluetooth/ConnectionDataLogger.java b/catroid/src/androidTest/java/org/catrobat/catroid/common/bluetooth/ConnectionDataLogger.java
index 9844f5b2ed2..6cd77358129 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/common/bluetooth/ConnectionDataLogger.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/common/bluetooth/ConnectionDataLogger.java
@@ -22,6 +22,8 @@
*/
package org.catrobat.catroid.common.bluetooth;
+import android.support.annotation.VisibleForTesting;
+
import com.google.common.base.Stopwatch;
import org.catrobat.catroid.bluetooth.base.BluetoothConnection;
@@ -38,7 +40,12 @@ public final class ConnectionDataLogger {
private BlockingQueue sentMessages = new LinkedBlockingQueue();
private BlockingQueue receivedMessages = new LinkedBlockingQueue();
- private static final int TIMEOUT_SECONDS = 15;
+ private int timeoutMilliSeconds = 15000;
+
+ @VisibleForTesting
+ public void setTimeoutMilliSeconds(int timeoutMilliSeconds) {
+ this.timeoutMilliSeconds = timeoutMilliSeconds;
+ }
public byte[] getNextSentMessage() {
return getNextSentMessage(0, 0);
@@ -80,18 +87,18 @@ public ArrayList getReceivedMessages(int messageByteOffset, int messageC
return getMessages(receivedMessages, messageByteOffset, messageCountToWaitFor);
}
- private static byte[] getNextMessage(BlockingQueue messages, int messageOffset, int messageByteOffset) {
+ private byte[] getNextMessage(BlockingQueue messages, int messageOffset, int messageByteOffset) {
Stopwatch stopWatch = Stopwatch.createStarted();
for (int i = 0; i < messageOffset; i++) {
- byte[] message = pollMessage(messages, TIMEOUT_SECONDS - (int) stopWatch.elapsed(TimeUnit.SECONDS));
+ byte[] message = pollMessage(messages, timeoutMilliSeconds - (int) stopWatch.elapsed(TimeUnit.MILLISECONDS));
if (message == null) {
return null;
}
}
- byte[] message = pollMessage(messages, TIMEOUT_SECONDS - (int) stopWatch.elapsed(TimeUnit.SECONDS));
+ byte[] message = pollMessage(messages, timeoutMilliSeconds - (int) stopWatch.elapsed(TimeUnit.MILLISECONDS));
if (message == null) {
return null;
}
@@ -99,7 +106,7 @@ private static byte[] getNextMessage(BlockingQueue messages, int message
return BluetoothTestUtils.getSubArray(message, messageByteOffset);
}
- private static ArrayList getMessages(BlockingQueue messages, int messageByteOffset, int messageCountToWaitFor) {
+ private ArrayList getMessages(BlockingQueue messages, int messageByteOffset, int messageCountToWaitFor) {
if (messageCountToWaitFor == 0) {
return getMessages(messages, messageByteOffset);
@@ -108,18 +115,18 @@ private static ArrayList getMessages(BlockingQueue messages, int
return waitForMessages(messages, messageByteOffset, messageCountToWaitFor);
}
- private static ArrayList waitForMessages(BlockingQueue messages, int messageByteOffset, int messageCountToWaitFor) {
+ private ArrayList waitForMessages(BlockingQueue messages, int messageByteOffset, int messageCountToWaitFor) {
ArrayList m = new ArrayList();
Stopwatch stopWatch = Stopwatch.createStarted();
do {
- byte[] message = pollMessage(messages, TIMEOUT_SECONDS - (int) stopWatch.elapsed(TimeUnit.SECONDS));
+ byte[] message = pollMessage(messages, timeoutMilliSeconds - (int) stopWatch.elapsed(TimeUnit.MILLISECONDS));
if (message == null) {
return m;
}
m.add(BluetoothTestUtils.getSubArray(message, messageByteOffset));
- } while (m.size() < messageCountToWaitFor && stopWatch.elapsed(TimeUnit.SECONDS) < TIMEOUT_SECONDS);
+ } while (m.size() < messageCountToWaitFor && stopWatch.elapsed(TimeUnit.MILLISECONDS) < timeoutMilliSeconds);
return m;
}
@@ -136,10 +143,10 @@ private static ArrayList getMessages(BlockingQueue messages, int
return m;
}
- private static byte[] pollMessage(BlockingQueue messages, int timeoutSeconds) {
+ private static byte[] pollMessage(BlockingQueue messages, int timeoutMilliSeconds) {
try {
- return messages.poll(timeoutSeconds, TimeUnit.SECONDS);
+ return messages.poll(timeoutMilliSeconds, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
return null;
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/ProjectManagerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/ProjectManagerTest.java
index 4d1f333b64b..55467c2d308 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/ProjectManagerTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/ProjectManagerTest.java
@@ -34,8 +34,6 @@
import org.catrobat.catroid.content.bricks.Brick;
import org.catrobat.catroid.content.bricks.ControlStructureBrick;
import org.catrobat.catroid.exceptions.CompatibilityProjectException;
-import org.catrobat.catroid.exceptions.LoadingProjectException;
-import org.catrobat.catroid.exceptions.OutdatedVersionProjectException;
import org.catrobat.catroid.exceptions.ProjectException;
import org.catrobat.catroid.io.StorageOperations;
import org.catrobat.catroid.io.ZipArchiver;
@@ -69,9 +67,9 @@ public class ProjectManagerTest {
@Rule
public final ExpectedException exception = ExpectedException.none();
+ private static final String PROJECT_NAME = "testProject";
private static final String OLD_PROJECT = "OLD_PROJECT";
private static final String NEW_PROJECT = "NEW_PROJECT";
- private static final String DOES_NOT_EXIST = "DOES_NOT_EXIST";
private static final float CATROBAT_LANGUAGE_VERSION_NOT_SUPPORTED = 0.0f;
private static final String ZIP_FILENAME_WRONG_NESTING_BRICKS = "CoinCatcher2.catrobat";
@@ -94,37 +92,28 @@ public void tearDown() throws Exception {
@Test
public void testShouldReturnFalseIfCatrobatLanguageVersionNotSupported() throws IOException, ProjectException {
- TestUtils.createProjectWithLanguageVersion(CATROBAT_LANGUAGE_VERSION_NOT_SUPPORTED,
- "testProject");
+ Project project = TestUtils
+ .createProjectWithLanguageVersion(CATROBAT_LANGUAGE_VERSION_NOT_SUPPORTED, PROJECT_NAME);
try {
- projectManager.loadProject(TestUtils.DEFAULT_TEST_PROJECT_NAME, InstrumentationRegistry.getTargetContext());
+ projectManager.loadProject(project.getDirectory(), InstrumentationRegistry.getTargetContext());
fail("Project shouldn't be compatible");
} catch (CompatibilityProjectException expected) {
}
TestUtils.deleteProjects();
-
- TestUtils.createProjectWithLanguageVersion(CURRENT_CATROBAT_LANGUAGE_VERSION,
- "testProject");
-
- projectManager.loadProject(TestUtils.DEFAULT_TEST_PROJECT_NAME, InstrumentationRegistry.getTargetContext());
}
@Test
- public void testShouldKeepExistingProjectIfCannotLoadNewProject() throws IOException,
- CompatibilityProjectException, OutdatedVersionProjectException, LoadingProjectException {
-
- TestUtils.createProjectWithLanguageVersion(CURRENT_CATROBAT_LANGUAGE_VERSION,
- OLD_PROJECT);
+ public void testShouldKeepExistingProjectIfCannotLoadNewProject() throws IOException, ProjectException {
+ Project project = TestUtils.createProjectWithLanguageVersion(CURRENT_CATROBAT_LANGUAGE_VERSION, OLD_PROJECT);
- projectManager.loadProject(OLD_PROJECT, InstrumentationRegistry.getTargetContext());
+ projectManager.loadProject(project.getDirectory(), InstrumentationRegistry.getTargetContext());
- TestUtils.createProjectWithLanguageVersion(CATROBAT_LANGUAGE_VERSION_NOT_SUPPORTED,
- "testProject");
+ TestUtils.createProjectWithLanguageVersion(CATROBAT_LANGUAGE_VERSION_NOT_SUPPORTED, PROJECT_NAME);
try {
- projectManager.loadProject(NEW_PROJECT, InstrumentationRegistry.getTargetContext());
+ projectManager.loadProject(new File(NEW_PROJECT), InstrumentationRegistry.getTargetContext());
fail("Expected ProjectException while loading project " + NEW_PROJECT);
} catch (ProjectException expected) {
}
@@ -142,21 +131,19 @@ public void testLoadProjectException() throws Exception {
assertNull(projectManager.getCurrentProject());
exception.expect(ProjectException.class);
- projectManager.loadProject(DOES_NOT_EXIST, InstrumentationRegistry.getTargetContext());
+ projectManager.loadProject(new File(NEW_PROJECT), InstrumentationRegistry.getTargetContext());
}
@Test
- public void testSavingAProjectDuringDelete() throws IOException, CompatibilityProjectException,
- OutdatedVersionProjectException, LoadingProjectException {
- TestUtils.createProjectWithLanguageVersion(
- CURRENT_CATROBAT_LANGUAGE_VERSION, TestUtils.DEFAULT_TEST_PROJECT_NAME);
+ public void testSavingAProjectDuringDelete() throws IOException, ProjectException {
+ Project project = TestUtils.createProjectWithLanguageVersion(CURRENT_CATROBAT_LANGUAGE_VERSION, PROJECT_NAME);
- projectManager.loadProject(TestUtils.DEFAULT_TEST_PROJECT_NAME, InstrumentationRegistry.getTargetContext());
+ projectManager.loadProject(project.getDirectory(), InstrumentationRegistry.getTargetContext());
Project currentProject = projectManager.getCurrentProject();
- assertNotNull(String.format("Could not load %s project.", TestUtils.DEFAULT_TEST_PROJECT_NAME), currentProject);
+ assertNotNull(String.format("Could not load %s project.", PROJECT_NAME), currentProject);
- File directory = new File(DEFAULT_ROOT_DIRECTORY, TestUtils.DEFAULT_TEST_PROJECT_NAME);
+ File directory = new File(DEFAULT_ROOT_DIRECTORY, PROJECT_NAME);
assertTrue(String.format("Directory %s does not exist", directory.getPath()), directory.exists());
// simulate multiple saving trigger asynchronous (occurs in black box testing)
@@ -174,18 +161,14 @@ public void testSavingAProjectDuringDelete() throws IOException, CompatibilityPr
}
@Test
- public void testLoadProjectWithInvalidNestingBrickReferences() throws CompatibilityProjectException,
- IOException,
- OutdatedVersionProjectException,
- LoadingProjectException {
-
+ public void testLoadProjectWithInvalidNestingBrickReferences() throws IOException, ProjectException {
DEFAULT_ROOT_DIRECTORY.mkdir();
InputStream inputStream = InstrumentationRegistry.getContext().getAssets().open(ZIP_FILENAME_WRONG_NESTING_BRICKS);
+ File projectDir = new File(DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_NESTING_BRICKS);
+ new ZipArchiver().unzip(inputStream, projectDir);
- new ZipArchiver().unzip(inputStream, new File(DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_NESTING_BRICKS));
-
- projectManager.loadProject(PROJECT_NAME_NESTING_BRICKS, InstrumentationRegistry.getTargetContext());
+ projectManager.loadProject(projectDir, InstrumentationRegistry.getTargetContext());
Project project = projectManager.getCurrentProject();
assertNotNull(project);
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/PlaySoundActionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/PlaySoundActionTest.java
index aeb168f91de..541dc75accb 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/PlaySoundActionTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/PlaySoundActionTest.java
@@ -52,7 +52,6 @@
import static junit.framework.Assert.assertTrue;
import static org.catrobat.catroid.common.Constants.SOUND_DIRECTORY_NAME;
-import static org.catrobat.catroid.utils.PathBuilder.buildScenePath;
@RunWith(AndroidJUnit4.class)
public class PlaySoundActionTest {
@@ -116,7 +115,7 @@ private void createTestProject() throws IOException {
soundFile = ResourceImporter.createSoundFileFromResourcesInDirectory(
InstrumentationRegistry.getContext().getResources(),
soundFileId,
- new File(buildScenePath(projectName, project.getDefaultScene().getName()), SOUND_DIRECTORY_NAME),
+ new File(project.getDefaultScene().getDirectory(), SOUND_DIRECTORY_NAME),
"soundTest.mp3");
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StitchActionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StitchActionTest.java
index 61ead1b1ba2..eec7d8ed41c 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StitchActionTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StitchActionTest.java
@@ -33,6 +33,7 @@
import org.catrobat.catroid.embroidery.EmbroideryList;
import org.catrobat.catroid.stage.StageActivity;
import org.catrobat.catroid.stage.StageListener;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -67,6 +68,11 @@ public void setUp() throws Exception {
StageActivity.stageListener.embroideryList = Mockito.mock(EmbroideryList.class);
}
+ @After
+ public void tearDown() {
+ StageActivity.stageListener = null;
+ }
+
@Test
public void testAddSingleStitchPoint() {
final int expectedInvocations = 1;
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StopAllSoundsActionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StopAllSoundsActionTest.java
index a603f3de31a..5faab123b4e 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StopAllSoundsActionTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StopAllSoundsActionTest.java
@@ -53,7 +53,6 @@
import static junit.framework.Assert.assertTrue;
import static org.catrobat.catroid.common.Constants.SOUND_DIRECTORY_NAME;
-import static org.catrobat.catroid.utils.PathBuilder.buildScenePath;
@RunWith(AndroidJUnit4.class)
public class StopAllSoundsActionTest {
@@ -131,7 +130,7 @@ private void createTestProject() throws IOException {
soundFile = ResourceImporter.createSoundFileFromResourcesInDirectory(
InstrumentationRegistry.getContext().getResources(),
soundFileId,
- new File(buildScenePath(projectName, project.getDefaultScene().getName()), SOUND_DIRECTORY_NAME),
+ new File(project.getDefaultScene().getDirectory(), SOUND_DIRECTORY_NAME),
"soundTest.mp3");
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/backwardcompatibility/XstreamParserTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/backwardcompatibility/XstreamParserTest.java
new file mode 100644
index 00000000000..4ba3108ce1b
--- /dev/null
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/backwardcompatibility/XstreamParserTest.java
@@ -0,0 +1,175 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2018 The Catrobat Team
+ * ()
+ *
+ * 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 .
+ */
+
+package org.catrobat.catroid.test.content.backwardcompatibility;
+
+import android.support.test.InstrumentationRegistry;
+
+import org.catrobat.catroid.R;
+import org.catrobat.catroid.content.Project;
+import org.catrobat.catroid.content.Scene;
+import org.catrobat.catroid.exceptions.LoadingProjectException;
+import org.catrobat.catroid.formulaeditor.UserDataWrapper;
+import org.catrobat.catroid.io.StorageOperations;
+import org.catrobat.catroid.io.XstreamSerializer;
+import org.catrobat.catroid.io.ZipArchiver;
+import org.junit.After;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+
+import static org.catrobat.catroid.common.FlavoredConstants.DEFAULT_ROOT_DIRECTORY;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
+public class XstreamParserTest {
+
+ private File projectDir;
+
+ @After
+ public void tearDown() throws IOException {
+ if (projectDir != null && projectDir.isDirectory()) {
+ StorageOperations.deleteDir(projectDir);
+ }
+ }
+
+ private void copyProjectFromAssets(String assetName, String projectName) throws IOException {
+ InputStream inputStream = InstrumentationRegistry.getContext().getAssets().open(assetName);
+ new ZipArchiver().unzip(inputStream, new File(DEFAULT_ROOT_DIRECTORY, projectName));
+ }
+
+ private void testLoadProjectWithoutScenes(String projectName, String assetName) throws IOException, LoadingProjectException {
+ copyProjectFromAssets(assetName, projectName);
+ projectDir = new File(DEFAULT_ROOT_DIRECTORY, projectName);
+
+ Project project = XstreamSerializer.getInstance()
+ .loadProject(projectDir, InstrumentationRegistry.getTargetContext());
+
+ assertNotNull(project);
+
+ assertEquals(projectName, project.getName());
+
+ assertEquals(1, project.getSceneList().size());
+
+ assertEquals(InstrumentationRegistry.getTargetContext().getString(R.string.default_scene_name, 1),
+ project.getSceneList().get(0).getName());
+ }
+
+ @Test
+ public void testLoadProjectWithLanguageVersion08() throws IOException, LoadingProjectException {
+ String projectName = "Falling balls";
+ String assetName = "Falling_balls.catrobat";
+
+ testLoadProjectWithoutScenes(projectName, assetName);
+ }
+
+ @Test
+ public void testLoadProjectLanguageVersion091() throws IOException, LoadingProjectException {
+ String projectName = "Air fight 0.5";
+ String assetName = "Air_fight_0.5.catrobat";
+
+ testLoadProjectWithoutScenes(projectName, assetName);
+ }
+
+ @Test
+ public void testLoadProjectLanguageVersion092() throws IOException, LoadingProjectException {
+ String projectName = "NoteAndSpeakBrick";
+ String assetName = "Note_And_Speak_Brick.catrobat";
+
+ testLoadProjectWithoutScenes(projectName, assetName);
+ }
+
+ @Test
+ public void testLoadProjectLanguageVersion095() throws IOException, LoadingProjectException {
+ String projectName = "GhostEffectBricks";
+ String assetName = "Ghost_Effect_Bricks.catrobat";
+
+ testLoadProjectWithoutScenes(projectName, assetName);
+ }
+
+ @Test
+ public void testLoadProjectLanguageVersion0999() throws IOException, LoadingProjectException {
+ String projectName = "TestUserDataConversion0999To09991";
+ String assetName = "TestUserDataConversion0999To09991.catrobat";
+
+ copyProjectFromAssets(assetName, projectName);
+ projectDir = new File(DEFAULT_ROOT_DIRECTORY, projectName);
+
+ Project project = XstreamSerializer.getInstance()
+ .loadProject(projectDir, InstrumentationRegistry.getTargetContext());
+
+ assertNotNull(project);
+
+ assertEquals(projectName, project.getName());
+
+ assertEquals(2, project.getSceneList().size());
+
+ Scene scene1 = project.getSceneList().get(0);
+ Scene scene2 = project.getSceneList().get(1);
+
+ assertEquals(InstrumentationRegistry.getTargetContext().getString(R.string.default_scene_name, 1),
+ scene1.getName());
+
+ assertEquals(InstrumentationRegistry.getTargetContext().getString(R.string.default_scene_name, 2),
+ scene2.getName());
+
+ assertNotNull(UserDataWrapper.getUserVariable("localVar",
+ scene1.getSprite("SpriteWithLocalVarAndList"), project));
+
+ assertNotNull(UserDataWrapper.getUserList("localList",
+ scene1.getSprite("SpriteWithLocalVarAndList"), project));
+
+ assertNull(UserDataWrapper.getUserVariable("localVar",
+ scene1.getSprite("SpriteWithGlobalVarAndList"), project));
+
+ assertNull(UserDataWrapper.getUserList("localList",
+ scene1.getSprite("SpriteWithGlobalVarAndList"), project));
+
+ assertNotNull(UserDataWrapper.getUserVariable("globalVar",
+ scene2.getSprite("SpriteWithLocalVarAndList"), project));
+
+ assertNotNull(UserDataWrapper.getUserList("globalList",
+ scene2.getSprite("SpriteWithLocalVarAndList"), project));
+
+ assertNull(UserDataWrapper.getUserVariable("localVar",
+ scene2.getSprite("SpriteWithGlobalVarAndList"), project));
+
+ assertNull(UserDataWrapper.getUserList("localList",
+ scene2.getSprite("SpriteWithGlobalVarAndList"), project));
+
+ assertNotSame(UserDataWrapper.getUserVariable("localVar",
+ scene1.getSprite("SpriteWithLocalVarAndList"), project),
+ UserDataWrapper.getUserVariable("globalList",
+ scene2.getSprite("SpriteWithLocalVarAndList"), project));
+
+ assertNotSame(UserDataWrapper.getUserList("localList",
+ scene1.getSprite("SpriteWithLocalVarAndList"), project),
+ UserDataWrapper.getUserList("globalList",
+ scene2.getSprite("SpriteWithLocalVarAndList"), project));
+ }
+}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickCategoryTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickCategoryTest.java
new file mode 100644
index 00000000000..176d8591e15
--- /dev/null
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickCategoryTest.java
@@ -0,0 +1,405 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2018 The Catrobat Team
+ * ()
+ *
+ * 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 .
+ */
+
+package org.catrobat.catroid.test.content.bricks;
+
+import android.content.Context;
+import android.preference.PreferenceManager;
+import android.support.test.InstrumentationRegistry;
+
+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.AddItemToUserListBrick;
+import org.catrobat.catroid.content.bricks.ArduinoSendDigitalValueBrick;
+import org.catrobat.catroid.content.bricks.ArduinoSendPWMValueBrick;
+import org.catrobat.catroid.content.bricks.AskBrick;
+import org.catrobat.catroid.content.bricks.AskSpeechBrick;
+import org.catrobat.catroid.content.bricks.AssertEqualsBrick;
+import org.catrobat.catroid.content.bricks.Brick;
+import org.catrobat.catroid.content.bricks.BroadcastBrick;
+import org.catrobat.catroid.content.bricks.BroadcastReceiverBrick;
+import org.catrobat.catroid.content.bricks.BroadcastWaitBrick;
+import org.catrobat.catroid.content.bricks.CameraBrick;
+import org.catrobat.catroid.content.bricks.ChangeBrightnessByNBrick;
+import org.catrobat.catroid.content.bricks.ChangeColorByNBrick;
+import org.catrobat.catroid.content.bricks.ChangeSizeByNBrick;
+import org.catrobat.catroid.content.bricks.ChangeTransparencyByNBrick;
+import org.catrobat.catroid.content.bricks.ChangeVariableBrick;
+import org.catrobat.catroid.content.bricks.ChangeVolumeByNBrick;
+import org.catrobat.catroid.content.bricks.ChangeXByNBrick;
+import org.catrobat.catroid.content.bricks.ChangeYByNBrick;
+import org.catrobat.catroid.content.bricks.ChooseCameraBrick;
+import org.catrobat.catroid.content.bricks.ClearBackgroundBrick;
+import org.catrobat.catroid.content.bricks.ClearGraphicEffectBrick;
+import org.catrobat.catroid.content.bricks.CloneBrick;
+import org.catrobat.catroid.content.bricks.ComeToFrontBrick;
+import org.catrobat.catroid.content.bricks.DeleteItemOfUserListBrick;
+import org.catrobat.catroid.content.bricks.DeleteThisCloneBrick;
+import org.catrobat.catroid.content.bricks.DroneEmergencyBrick;
+import org.catrobat.catroid.content.bricks.DroneFlipBrick;
+import org.catrobat.catroid.content.bricks.DroneMoveBackwardBrick;
+import org.catrobat.catroid.content.bricks.DroneMoveDownBrick;
+import org.catrobat.catroid.content.bricks.DroneMoveForwardBrick;
+import org.catrobat.catroid.content.bricks.DroneMoveLeftBrick;
+import org.catrobat.catroid.content.bricks.DroneMoveRightBrick;
+import org.catrobat.catroid.content.bricks.DroneMoveUpBrick;
+import org.catrobat.catroid.content.bricks.DronePlayLedAnimationBrick;
+import org.catrobat.catroid.content.bricks.DroneSwitchCameraBrick;
+import org.catrobat.catroid.content.bricks.DroneTakeOffLandBrick;
+import org.catrobat.catroid.content.bricks.DroneTurnLeftBrick;
+import org.catrobat.catroid.content.bricks.DroneTurnRightBrick;
+import org.catrobat.catroid.content.bricks.FlashBrick;
+import org.catrobat.catroid.content.bricks.ForeverBrick;
+import org.catrobat.catroid.content.bricks.GlideToBrick;
+import org.catrobat.catroid.content.bricks.GoNStepsBackBrick;
+import org.catrobat.catroid.content.bricks.GoToBrick;
+import org.catrobat.catroid.content.bricks.HideBrick;
+import org.catrobat.catroid.content.bricks.HideTextBrick;
+import org.catrobat.catroid.content.bricks.IfLogicBeginBrick;
+import org.catrobat.catroid.content.bricks.IfOnEdgeBounceBrick;
+import org.catrobat.catroid.content.bricks.IfThenLogicBeginBrick;
+import org.catrobat.catroid.content.bricks.InsertItemIntoUserListBrick;
+import org.catrobat.catroid.content.bricks.JumpingSumoAnimationsBrick;
+import org.catrobat.catroid.content.bricks.JumpingSumoJumpHighBrick;
+import org.catrobat.catroid.content.bricks.JumpingSumoJumpLongBrick;
+import org.catrobat.catroid.content.bricks.JumpingSumoMoveBackwardBrick;
+import org.catrobat.catroid.content.bricks.JumpingSumoMoveForwardBrick;
+import org.catrobat.catroid.content.bricks.JumpingSumoNoSoundBrick;
+import org.catrobat.catroid.content.bricks.JumpingSumoRotateLeftBrick;
+import org.catrobat.catroid.content.bricks.JumpingSumoRotateRightBrick;
+import org.catrobat.catroid.content.bricks.JumpingSumoSoundBrick;
+import org.catrobat.catroid.content.bricks.JumpingSumoTakingPictureBrick;
+import org.catrobat.catroid.content.bricks.JumpingSumoTurnBrick;
+import org.catrobat.catroid.content.bricks.LegoEv3MotorMoveBrick;
+import org.catrobat.catroid.content.bricks.LegoEv3MotorStopBrick;
+import org.catrobat.catroid.content.bricks.LegoEv3MotorTurnAngleBrick;
+import org.catrobat.catroid.content.bricks.LegoEv3PlayToneBrick;
+import org.catrobat.catroid.content.bricks.LegoEv3SetLedBrick;
+import org.catrobat.catroid.content.bricks.LegoNxtMotorMoveBrick;
+import org.catrobat.catroid.content.bricks.LegoNxtMotorStopBrick;
+import org.catrobat.catroid.content.bricks.LegoNxtMotorTurnAngleBrick;
+import org.catrobat.catroid.content.bricks.LegoNxtPlayToneBrick;
+import org.catrobat.catroid.content.bricks.MoveNStepsBrick;
+import org.catrobat.catroid.content.bricks.NextLookBrick;
+import org.catrobat.catroid.content.bricks.NoteBrick;
+import org.catrobat.catroid.content.bricks.PenDownBrick;
+import org.catrobat.catroid.content.bricks.PenUpBrick;
+import org.catrobat.catroid.content.bricks.PhiroIfLogicBeginBrick;
+import org.catrobat.catroid.content.bricks.PhiroMotorMoveBackwardBrick;
+import org.catrobat.catroid.content.bricks.PhiroMotorMoveForwardBrick;
+import org.catrobat.catroid.content.bricks.PhiroMotorStopBrick;
+import org.catrobat.catroid.content.bricks.PhiroPlayToneBrick;
+import org.catrobat.catroid.content.bricks.PhiroRGBLightBrick;
+import org.catrobat.catroid.content.bricks.PlaceAtBrick;
+import org.catrobat.catroid.content.bricks.PlaySoundAndWaitBrick;
+import org.catrobat.catroid.content.bricks.PlaySoundBrick;
+import org.catrobat.catroid.content.bricks.PointInDirectionBrick;
+import org.catrobat.catroid.content.bricks.PointToBrick;
+import org.catrobat.catroid.content.bricks.PreviousLookBrick;
+import org.catrobat.catroid.content.bricks.RaspiIfLogicBeginBrick;
+import org.catrobat.catroid.content.bricks.RaspiPwmBrick;
+import org.catrobat.catroid.content.bricks.RaspiSendDigitalValueBrick;
+import org.catrobat.catroid.content.bricks.RepeatBrick;
+import org.catrobat.catroid.content.bricks.RepeatUntilBrick;
+import org.catrobat.catroid.content.bricks.ReplaceItemInUserListBrick;
+import org.catrobat.catroid.content.bricks.SayBubbleBrick;
+import org.catrobat.catroid.content.bricks.SayForBubbleBrick;
+import org.catrobat.catroid.content.bricks.SceneStartBrick;
+import org.catrobat.catroid.content.bricks.SceneTransitionBrick;
+import org.catrobat.catroid.content.bricks.SetBackgroundAndWaitBrick;
+import org.catrobat.catroid.content.bricks.SetBackgroundBrick;
+import org.catrobat.catroid.content.bricks.SetBackgroundByIndexAndWaitBrick;
+import org.catrobat.catroid.content.bricks.SetBackgroundByIndexBrick;
+import org.catrobat.catroid.content.bricks.SetBrightnessBrick;
+import org.catrobat.catroid.content.bricks.SetColorBrick;
+import org.catrobat.catroid.content.bricks.SetLookBrick;
+import org.catrobat.catroid.content.bricks.SetLookByIndexBrick;
+import org.catrobat.catroid.content.bricks.SetPenColorBrick;
+import org.catrobat.catroid.content.bricks.SetPenSizeBrick;
+import org.catrobat.catroid.content.bricks.SetRotationStyleBrick;
+import org.catrobat.catroid.content.bricks.SetSizeToBrick;
+import org.catrobat.catroid.content.bricks.SetTransparencyBrick;
+import org.catrobat.catroid.content.bricks.SetVariableBrick;
+import org.catrobat.catroid.content.bricks.SetVolumeToBrick;
+import org.catrobat.catroid.content.bricks.SetXBrick;
+import org.catrobat.catroid.content.bricks.SetYBrick;
+import org.catrobat.catroid.content.bricks.ShowBrick;
+import org.catrobat.catroid.content.bricks.ShowTextBrick;
+import org.catrobat.catroid.content.bricks.ShowTextColorSizeAlignmentBrick;
+import org.catrobat.catroid.content.bricks.SpeakAndWaitBrick;
+import org.catrobat.catroid.content.bricks.SpeakBrick;
+import org.catrobat.catroid.content.bricks.StampBrick;
+import org.catrobat.catroid.content.bricks.StitchBrick;
+import org.catrobat.catroid.content.bricks.StopAllSoundsBrick;
+import org.catrobat.catroid.content.bricks.StopScriptBrick;
+import org.catrobat.catroid.content.bricks.ThinkBubbleBrick;
+import org.catrobat.catroid.content.bricks.ThinkForBubbleBrick;
+import org.catrobat.catroid.content.bricks.TurnLeftBrick;
+import org.catrobat.catroid.content.bricks.TurnRightBrick;
+import org.catrobat.catroid.content.bricks.VibrationBrick;
+import org.catrobat.catroid.content.bricks.WaitBrick;
+import org.catrobat.catroid.content.bricks.WaitTillIdleBrick;
+import org.catrobat.catroid.content.bricks.WaitUntilBrick;
+import org.catrobat.catroid.content.bricks.WhenBackgroundChangesBrick;
+import org.catrobat.catroid.content.bricks.WhenBrick;
+import org.catrobat.catroid.content.bricks.WhenClonedBrick;
+import org.catrobat.catroid.content.bricks.WhenConditionBrick;
+import org.catrobat.catroid.content.bricks.WhenGamepadButtonBrick;
+import org.catrobat.catroid.content.bricks.WhenRaspiPinChangedBrick;
+import org.catrobat.catroid.content.bricks.WhenStartedBrick;
+import org.catrobat.catroid.content.bricks.WhenTouchDownBrick;
+import org.catrobat.catroid.physics.content.bricks.CollisionReceiverBrick;
+import org.catrobat.catroid.physics.content.bricks.SetBounceBrick;
+import org.catrobat.catroid.physics.content.bricks.SetFrictionBrick;
+import org.catrobat.catroid.physics.content.bricks.SetGravityBrick;
+import org.catrobat.catroid.physics.content.bricks.SetMassBrick;
+import org.catrobat.catroid.physics.content.bricks.SetPhysicsObjectTypeBrick;
+import org.catrobat.catroid.physics.content.bricks.SetVelocityBrick;
+import org.catrobat.catroid.physics.content.bricks.TurnLeftSpeedBrick;
+import org.catrobat.catroid.physics.content.bricks.TurnRightSpeedBrick;
+import org.catrobat.catroid.ui.fragment.CategoryBricksFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import static junit.framework.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public class BrickCategoryTest {
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {"Motion", Arrays.asList(PlaceAtBrick.class,
+ SetXBrick.class,
+ SetYBrick.class,
+ ChangeXByNBrick.class,
+ ChangeYByNBrick.class,
+ GoToBrick.class,
+ IfOnEdgeBounceBrick.class,
+ MoveNStepsBrick.class,
+ TurnLeftBrick.class,
+ TurnRightBrick.class,
+ PointInDirectionBrick.class,
+ PointToBrick.class,
+ SetRotationStyleBrick.class,
+ GlideToBrick.class,
+ GoNStepsBackBrick.class,
+ ComeToFrontBrick.class,
+ VibrationBrick.class,
+ SetPhysicsObjectTypeBrick.class,
+ SetVelocityBrick.class,
+ TurnLeftSpeedBrick.class,
+ TurnRightSpeedBrick.class,
+ SetGravityBrick.class,
+ SetMassBrick.class,
+ SetBounceBrick.class,
+ SetFrictionBrick.class)},
+ {"Embroidery", Arrays.asList(StitchBrick.class)},
+ {"Event", Arrays.asList(WhenStartedBrick.class,
+ WhenBrick.class,
+ WhenTouchDownBrick.class,
+ BroadcastReceiverBrick.class,
+ BroadcastBrick.class,
+ BroadcastWaitBrick.class,
+ WhenConditionBrick.class,
+ CollisionReceiverBrick.class,
+ WhenBackgroundChangesBrick.class,
+ WhenClonedBrick.class)},
+ {"Looks", Arrays.asList(SetLookBrick.class,
+ SetLookByIndexBrick.class,
+ NextLookBrick.class,
+ PreviousLookBrick.class,
+ SetSizeToBrick.class,
+ ChangeSizeByNBrick.class,
+ HideBrick.class,
+ ShowBrick.class,
+ AskBrick.class,
+ SayBubbleBrick.class,
+ SayForBubbleBrick.class,
+ ThinkBubbleBrick.class,
+ ThinkForBubbleBrick.class,
+ ShowTextBrick.class,
+ ShowTextColorSizeAlignmentBrick.class,
+ SetTransparencyBrick.class,
+ ChangeTransparencyByNBrick.class,
+ SetBrightnessBrick.class,
+ ChangeBrightnessByNBrick.class,
+ SetColorBrick.class,
+ ChangeColorByNBrick.class,
+ ClearGraphicEffectBrick.class,
+ WhenBackgroundChangesBrick.class,
+ SetBackgroundBrick.class,
+ SetBackgroundByIndexBrick.class,
+ SetBackgroundAndWaitBrick.class,
+ SetBackgroundByIndexAndWaitBrick.class,
+ CameraBrick.class,
+ ChooseCameraBrick.class,
+ FlashBrick.class)},
+ {"Pen", Arrays.asList(PenDownBrick.class,
+ PenUpBrick.class,
+ SetPenSizeBrick.class,
+ SetPenColorBrick.class,
+ StampBrick.class,
+ ClearBackgroundBrick.class)},
+ {"Sound", Arrays.asList(PlaySoundBrick.class,
+ PlaySoundAndWaitBrick.class,
+ StopAllSoundsBrick.class,
+ SetVolumeToBrick.class,
+ ChangeVolumeByNBrick.class,
+ SpeakBrick.class,
+ SpeakAndWaitBrick.class,
+ AskSpeechBrick.class)},
+ {"Control", Arrays.asList(WaitBrick.class,
+ NoteBrick.class,
+ ForeverBrick.class,
+ IfLogicBeginBrick.class,
+ IfThenLogicBeginBrick.class,
+ WaitUntilBrick.class,
+ RepeatBrick.class,
+ RepeatUntilBrick.class,
+ SceneTransitionBrick.class,
+ SceneStartBrick.class,
+ StopScriptBrick.class,
+ CloneBrick.class,
+ DeleteThisCloneBrick.class,
+ WhenClonedBrick.class)},
+ {"Data", Arrays.asList(SetVariableBrick.class,
+ ChangeVariableBrick.class,
+ ShowTextBrick.class,
+ ShowTextColorSizeAlignmentBrick.class,
+ HideTextBrick.class,
+ AddItemToUserListBrick.class,
+ DeleteItemOfUserListBrick.class,
+ InsertItemIntoUserListBrick.class,
+ ReplaceItemInUserListBrick.class,
+ AskBrick.class,
+ AskSpeechBrick.class)},
+ {"Lego NXT", Arrays.asList(LegoNxtMotorTurnAngleBrick.class,
+ LegoNxtMotorStopBrick.class,
+ LegoNxtMotorMoveBrick.class,
+ LegoNxtPlayToneBrick.class)},
+ {"Lego EV3", Arrays.asList(LegoEv3MotorTurnAngleBrick.class,
+ LegoEv3MotorMoveBrick.class,
+ LegoEv3MotorStopBrick.class,
+ LegoEv3PlayToneBrick.class,
+ LegoEv3SetLedBrick.class)},
+ {"AR.Drone 2.0", Arrays.asList(DroneTakeOffLandBrick.class,
+ DroneEmergencyBrick.class,
+ DroneMoveUpBrick.class,
+ DroneMoveDownBrick.class,
+ DroneMoveLeftBrick.class,
+ DroneMoveRightBrick.class,
+ DroneMoveForwardBrick.class,
+ DroneMoveBackwardBrick.class,
+ DroneTurnLeftBrick.class,
+ DroneTurnRightBrick.class,
+ DroneFlipBrick.class,
+ DronePlayLedAnimationBrick.class,
+ DroneSwitchCameraBrick.class)},
+ {"Jumping Sumo", Arrays.asList(JumpingSumoMoveForwardBrick.class,
+ JumpingSumoMoveBackwardBrick.class,
+ JumpingSumoAnimationsBrick.class,
+ JumpingSumoSoundBrick.class,
+ JumpingSumoNoSoundBrick.class,
+ JumpingSumoJumpLongBrick.class,
+ JumpingSumoJumpHighBrick.class,
+ JumpingSumoRotateLeftBrick.class,
+ JumpingSumoRotateRightBrick.class,
+ JumpingSumoTurnBrick.class,
+ JumpingSumoTakingPictureBrick.class)},
+ {"Phiro", Arrays.asList(PhiroMotorMoveForwardBrick.class,
+ PhiroMotorMoveBackwardBrick.class,
+ PhiroMotorStopBrick.class,
+ PhiroPlayToneBrick.class,
+ PhiroRGBLightBrick.class,
+ PhiroIfLogicBeginBrick.class,
+ SetVariableBrick.class,
+ SetVariableBrick.class,
+ SetVariableBrick.class,
+ SetVariableBrick.class,
+ SetVariableBrick.class,
+ SetVariableBrick.class)},
+ {"Arduino", Arrays.asList(ArduinoSendDigitalValueBrick.class,
+ ArduinoSendPWMValueBrick.class)},
+ {"Chromecast", Arrays.asList(WhenGamepadButtonBrick.class)},
+ {"Raspberry Pi", Arrays.asList(WhenRaspiPinChangedBrick.class,
+ RaspiIfLogicBeginBrick.class,
+ RaspiSendDigitalValueBrick.class,
+ RaspiPwmBrick.class)},
+ {"Testing", Arrays.asList(AssertEqualsBrick.class,
+ WaitTillIdleBrick.class)},
+ });
+ }
+
+ @Parameterized.Parameter
+ public String category;
+
+ @Parameterized.Parameter(1)
+ public List expectedClasses;
+
+ private CategoryBricksFactory categoryBricksFactory;
+ private Sprite sprite;
+
+ @Before
+ public void setUp() throws Exception {
+ PreferenceManager.getDefaultSharedPreferences(InstrumentationRegistry.getTargetContext()).edit().clear().commit();
+
+ createProject(InstrumentationRegistry.getTargetContext());
+
+ categoryBricksFactory = new CategoryBricksFactory();
+ }
+
+ public void createProject(Context context) {
+ Project project = new Project(context, getClass().getSimpleName());
+ sprite = new Sprite("testSprite");
+ Script script = new StartScript();
+ script.addBrick(new SetXBrick());
+ sprite.addScript(script);
+ project.getDefaultScene().addSprite(sprite);
+ ProjectManager.getInstance().setCurrentProject(project);
+ ProjectManager.getInstance().setCurrentSprite(sprite);
+ ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene());
+ }
+
+ @Test
+ public void testBrickCategory() {
+ List categoryBricks = categoryBricksFactory.getBricks(category, sprite, InstrumentationRegistry.getTargetContext());
+
+ List brickClasses = new ArrayList<>();
+ for (Brick brick : categoryBricks) {
+ brickClasses.add(brick.getClass());
+ }
+
+ assertEquals(expectedClasses, brickClasses);
+ }
+}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickFormulaDefaultValueTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickFormulaDefaultValueTest.java
new file mode 100644
index 00000000000..0423519abf3
--- /dev/null
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickFormulaDefaultValueTest.java
@@ -0,0 +1,266 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2018 The Catrobat Team
+ * ()
+ *
+ * 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 .
+ */
+
+package org.catrobat.catroid.test.content.bricks;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+
+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.AddItemToUserListBrick;
+import org.catrobat.catroid.content.bricks.ArduinoSendDigitalValueBrick;
+import org.catrobat.catroid.content.bricks.ArduinoSendPWMValueBrick;
+import org.catrobat.catroid.content.bricks.AskBrick;
+import org.catrobat.catroid.content.bricks.Brick;
+import org.catrobat.catroid.content.bricks.ChangeBrightnessByNBrick;
+import org.catrobat.catroid.content.bricks.ChangeColorByNBrick;
+import org.catrobat.catroid.content.bricks.ChangeSizeByNBrick;
+import org.catrobat.catroid.content.bricks.ChangeTransparencyByNBrick;
+import org.catrobat.catroid.content.bricks.ChangeVariableBrick;
+import org.catrobat.catroid.content.bricks.ChangeXByNBrick;
+import org.catrobat.catroid.content.bricks.ChangeYByNBrick;
+import org.catrobat.catroid.content.bricks.DeleteItemOfUserListBrick;
+import org.catrobat.catroid.content.bricks.DroneMoveBackwardBrick;
+import org.catrobat.catroid.content.bricks.DroneMoveDownBrick;
+import org.catrobat.catroid.content.bricks.DroneMoveForwardBrick;
+import org.catrobat.catroid.content.bricks.DroneMoveLeftBrick;
+import org.catrobat.catroid.content.bricks.DroneMoveRightBrick;
+import org.catrobat.catroid.content.bricks.DroneMoveUpBrick;
+import org.catrobat.catroid.content.bricks.DroneTurnLeftBrick;
+import org.catrobat.catroid.content.bricks.DroneTurnRightBrick;
+import org.catrobat.catroid.content.bricks.FormulaBrick;
+import org.catrobat.catroid.content.bricks.GlideToBrick;
+import org.catrobat.catroid.content.bricks.GoNStepsBackBrick;
+import org.catrobat.catroid.content.bricks.IfLogicBeginBrick;
+import org.catrobat.catroid.content.bricks.IfThenLogicBeginBrick;
+import org.catrobat.catroid.content.bricks.LegoEv3MotorMoveBrick;
+import org.catrobat.catroid.content.bricks.LegoEv3MotorTurnAngleBrick;
+import org.catrobat.catroid.content.bricks.LegoEv3PlayToneBrick;
+import org.catrobat.catroid.content.bricks.LegoNxtMotorMoveBrick;
+import org.catrobat.catroid.content.bricks.LegoNxtMotorTurnAngleBrick;
+import org.catrobat.catroid.content.bricks.LegoNxtPlayToneBrick;
+import org.catrobat.catroid.content.bricks.MoveNStepsBrick;
+import org.catrobat.catroid.content.bricks.NoteBrick;
+import org.catrobat.catroid.content.bricks.PhiroMotorMoveBackwardBrick;
+import org.catrobat.catroid.content.bricks.PhiroMotorMoveForwardBrick;
+import org.catrobat.catroid.content.bricks.PhiroPlayToneBrick;
+import org.catrobat.catroid.content.bricks.PhiroRGBLightBrick;
+import org.catrobat.catroid.content.bricks.PointInDirectionBrick;
+import org.catrobat.catroid.content.bricks.RaspiIfLogicBeginBrick;
+import org.catrobat.catroid.content.bricks.RaspiPwmBrick;
+import org.catrobat.catroid.content.bricks.RaspiSendDigitalValueBrick;
+import org.catrobat.catroid.content.bricks.RepeatBrick;
+import org.catrobat.catroid.content.bricks.RepeatUntilBrick;
+import org.catrobat.catroid.content.bricks.SayBubbleBrick;
+import org.catrobat.catroid.content.bricks.SayForBubbleBrick;
+import org.catrobat.catroid.content.bricks.SetBrightnessBrick;
+import org.catrobat.catroid.content.bricks.SetColorBrick;
+import org.catrobat.catroid.content.bricks.SetSizeToBrick;
+import org.catrobat.catroid.content.bricks.SetTransparencyBrick;
+import org.catrobat.catroid.content.bricks.SetVariableBrick;
+import org.catrobat.catroid.content.bricks.SetXBrick;
+import org.catrobat.catroid.content.bricks.SetYBrick;
+import org.catrobat.catroid.content.bricks.ShowTextBrick;
+import org.catrobat.catroid.content.bricks.ThinkBubbleBrick;
+import org.catrobat.catroid.content.bricks.ThinkForBubbleBrick;
+import org.catrobat.catroid.content.bricks.TurnLeftBrick;
+import org.catrobat.catroid.content.bricks.TurnRightBrick;
+import org.catrobat.catroid.content.bricks.VibrationBrick;
+import org.catrobat.catroid.content.bricks.WaitBrick;
+import org.catrobat.catroid.content.bricks.WaitUntilBrick;
+import org.catrobat.catroid.content.bricks.WhenConditionBrick;
+import org.catrobat.catroid.physics.content.bricks.SetBounceBrick;
+import org.catrobat.catroid.physics.content.bricks.SetFrictionBrick;
+import org.catrobat.catroid.physics.content.bricks.SetGravityBrick;
+import org.catrobat.catroid.physics.content.bricks.SetMassBrick;
+import org.catrobat.catroid.ui.fragment.CategoryBricksFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+
+@RunWith(Parameterized.class)
+public class BrickFormulaDefaultValueTest {
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {"PhiroMotorMoveBackwardBrick - R.id.brick_phiro_motor_backward_action_speed_edit_text", "Phiro", PhiroMotorMoveBackwardBrick.class, R.id.brick_phiro_motor_backward_action_speed_edit_text, "100 "},
+ {"PhiroPlayToneBrick - R.id.brick_phiro_play_tone_duration_edit_text", "Phiro", PhiroPlayToneBrick.class, R.id.brick_phiro_play_tone_duration_edit_text, "1 "},
+ {"PhiroRGBLightBrick - R.id.brick_phiro_rgb_led_action_green_edit_text", "Phiro", PhiroRGBLightBrick.class, R.id.brick_phiro_rgb_led_action_green_edit_text, "255 "},
+ {"PhiroRGBLightBrick - R.id.brick_phiro_rgb_led_action_red_edit_text", "Phiro", PhiroRGBLightBrick.class, R.id.brick_phiro_rgb_led_action_red_edit_text, "0 "},
+ {"PhiroRGBLightBrick - R.id.brick_phiro_rgb_led_action_blue_edit_text", "Phiro", PhiroRGBLightBrick.class, R.id.brick_phiro_rgb_led_action_blue_edit_text, "255 "},
+ {"ArduinoSendDigitalValueBrick - R.id.brick_arduino_set_digital_pin_edit_text", "Arduino", ArduinoSendDigitalValueBrick.class, R.id.brick_arduino_set_digital_pin_edit_text, "13 "},
+ {"ArduinoSendDigitalValueBrick - R.id.brick_arduino_set_digital_value_edit_text", "Arduino", ArduinoSendDigitalValueBrick.class, R.id.brick_arduino_set_digital_value_edit_text, "1 "},
+ {"ArduinoSendPWMValueBrick - R.id.brick_arduino_set_analog_pin_edit_text", "Arduino", ArduinoSendPWMValueBrick.class, R.id.brick_arduino_set_analog_pin_edit_text, "3 "},
+ {"ArduinoSendPWMValueBrick - R.id.brick_arduino_set_analog_value_edit_text", "Arduino", ArduinoSendPWMValueBrick.class, R.id.brick_arduino_set_analog_value_edit_text, "255 "},
+ {"RaspiIfLogicBeginBrick - R.id.brick_if_begin_edit_text", "Raspberry Pi", RaspiIfLogicBeginBrick.class, R.id.brick_if_begin_edit_text, "3 "},
+ {"RaspiSendDigitalValueBrick - R.id.brick_raspi_set_digital_pin_edit_text", "Raspberry Pi", RaspiSendDigitalValueBrick.class, R.id.brick_raspi_set_digital_pin_edit_text, "3 "},
+ {"RaspiSendDigitalValueBrick - R.id.brick_raspi_set_digital_value_edit_text", "Raspberry Pi", RaspiSendDigitalValueBrick.class, R.id.brick_raspi_set_digital_value_edit_text, "1 "},
+ {"RaspiPwmBrick - R.id.brick_raspi_pwm_pin_edit_text", "Raspberry Pi", RaspiPwmBrick.class, R.id.brick_raspi_pwm_pin_edit_text, "3 "},
+ {"RaspiPwmBrick - R.id.brick_raspi_pwm_frequency_edit_text", "Raspberry Pi", RaspiPwmBrick.class, R.id.brick_raspi_pwm_frequency_edit_text, "100 "},
+ {"RaspiPwmBrick - R.id.brick_raspi_pwm_percentage_edit_text", "Raspberry Pi", RaspiPwmBrick.class, R.id.brick_raspi_pwm_percentage_edit_text, "50 "},
+ {"SetXBrick - R.id.brick_set_x_edit_text", "Motion", SetXBrick.class, R.id.brick_set_x_edit_text, "100 "},
+ {"SetYBrick - R.id.brick_set_y_edit_text", "Motion", SetYBrick.class, R.id.brick_set_y_edit_text, "200 "},
+ {"ChangeXByNBrick - R.id.brick_change_x_edit_text", "Motion", ChangeXByNBrick.class, R.id.brick_change_x_edit_text, "10 "},
+ {"ChangeYByNBrick - R.id.brick_change_y_edit_text", "Motion", ChangeYByNBrick.class, R.id.brick_change_y_edit_text, "10 "},
+ {"MoveNStepsBrick - R.id.brick_move_n_steps_edit_text", "Motion", MoveNStepsBrick.class, R.id.brick_move_n_steps_edit_text, "10 "},
+ {"TurnLeftBrick - R.id.brick_turn_left_edit_text", "Motion", TurnLeftBrick.class, R.id.brick_turn_left_edit_text, "15 "},
+ {"TurnRightBrick - R.id.brick_turn_right_edit_text", "Motion", TurnRightBrick.class, R.id.brick_turn_right_edit_text, "15 "},
+ {"PointInDirectionBrick - R.id.brick_point_in_direction_edit_text", "Motion", PointInDirectionBrick.class, R.id.brick_point_in_direction_edit_text, "90 "},
+ {"GlideToBrick - R.id.brick_glide_to_edit_text_x", "Motion", GlideToBrick.class, R.id.brick_glide_to_edit_text_x, "100 "},
+ {"GlideToBrick - R.id.brick_glide_to_edit_text_y", "Motion", GlideToBrick.class, R.id.brick_glide_to_edit_text_y, "200 "},
+ {"GlideToBrick - R.id.brick_glide_to_edit_text_duration", "Motion", GlideToBrick.class, R.id.brick_glide_to_edit_text_duration, "1 "},
+ {"GoNStepsBackBrick - R.id.brick_go_back_edit_text", "Motion", GoNStepsBackBrick.class, R.id.brick_go_back_edit_text, "1 "},
+ {"VibrationBrick - R.id.brick_vibration_edit_text", "Motion", VibrationBrick.class, R.id.brick_vibration_edit_text, "1 "},
+ {"TurnLeftBrick - R.id.brick_turn_left_edit_text", "Motion", TurnLeftBrick.class, R.id.brick_turn_left_edit_text, "15 "},
+ {"TurnRightBrick - R.id.brick_turn_right_edit_text", "Motion", TurnRightBrick.class, R.id.brick_turn_right_edit_text, "15 "},
+ {"SetGravityBrick - R.id.brick_set_gravity_edit_text_x", "Motion", SetGravityBrick.class, R.id.brick_set_gravity_edit_text_x, "0 "},
+ {"SetGravityBrick, R.id.brick_set_gravity_edit_text_y", "Motion", SetGravityBrick.class, R.id.brick_set_gravity_edit_text_y, "- 10 "},
+ {"SetMassBrick - R.id.brick_set_mass_edit_text", "Motion", SetMassBrick.class, R.id.brick_set_mass_edit_text, "1 "},
+ {"SetBounceBrick - R.id.brick_set_bounce_factor_edit_text", "Motion", SetBounceBrick.class, R.id.brick_set_bounce_factor_edit_text, "80 "},
+ {"SetFrictionBrick - R.id.brick_set_friction_edit_text", "Motion", SetFrictionBrick.class, R.id.brick_set_friction_edit_text, "20 "},
+ {"SetSizeToBrick - R.id.brick_set_size_to_edit_text", "Looks", SetSizeToBrick.class, R.id.brick_set_size_to_edit_text, "60 "},
+ {"ChangeSizeByNBrick - R.id.brick_change_size_by_edit_text", "Looks", ChangeSizeByNBrick.class, R.id.brick_change_size_by_edit_text, "10 "},
+ {"AskBrick - R.id.brick_ask_question_edit_text", "Looks", AskBrick.class, R.id.brick_ask_question_edit_text, "'What's your name?' "},
+ {"SayBubbleBrick - R.id.brick_bubble_edit_text", "Looks", SayBubbleBrick.class, R.id.brick_bubble_edit_text, "'Hello!' "},
+ {"SayForBubbleBrick - R.id.brick_for_bubble_edit_text_text", "Looks", SayForBubbleBrick.class, R.id.brick_for_bubble_edit_text_text, "'Hello!' "},
+ {"ThinkBubbleBrick - R.id.brick_bubble_edit_text", "Looks", ThinkBubbleBrick.class, R.id.brick_bubble_edit_text, "'Hello!' "},
+ {"ThinkForBubbleBrick - R.id.brick_for_bubble_edit_text_text", "Looks", ThinkForBubbleBrick.class, R.id.brick_for_bubble_edit_text_text, "'Hello!' "},
+ {"SetTransparencyBrick - R.id.brick_set_transparency_to_edit_text", "Looks", SetTransparencyBrick.class, R.id.brick_set_transparency_to_edit_text, "50 "},
+ {"ChangeTransparencyByNBrick - R.id.brick_change_transparency_edit_text", "Looks", ChangeTransparencyByNBrick.class, R.id.brick_change_transparency_edit_text, "25 "},
+ {"SetBrightnessBrick - R.id.brick_set_brightness_edit_text", "Looks", SetBrightnessBrick.class, R.id.brick_set_brightness_edit_text, "50 "},
+ {"ChangeBrightnessByNBrick - R.id.brick_change_brightness_edit_text", "Looks", ChangeBrightnessByNBrick.class, R.id.brick_change_brightness_edit_text, "25 "},
+ {"SetColorBrick - R.id.brick_set_color_edit_text", "Looks", SetColorBrick.class, R.id.brick_set_color_edit_text, "0 "},
+ {"ChangeColorByNBrick - R.id.brick_change_color_by_edit_text", "Looks", ChangeColorByNBrick.class, R.id.brick_change_color_by_edit_text, "25 "},
+ {"SetVariableBrick - R.id.brick_set_variable_edit_text", "Data", SetVariableBrick.class, R.id.brick_set_variable_edit_text, "1 "},
+ {"ChangeVariableBrick - R.id.brick_change_variable_edit_text", "Data", ChangeVariableBrick.class, R.id.brick_change_variable_edit_text, "1 "},
+ {"ShowTextBrick - R.id.brick_show_variable_edit_text_x", "Data", ShowTextBrick.class, R.id.brick_show_variable_edit_text_x, "100 "},
+ {"ShowTextBrick - R.id.brick_show_variable_edit_text_y", "Data", ShowTextBrick.class, R.id.brick_show_variable_edit_text_y, "200 "},
+ {"AddItemToUserListBrick - R.id.brick_add_item_to_userlist_edit_text", "Data", AddItemToUserListBrick.class, R.id.brick_add_item_to_userlist_edit_text, "1 "},
+ {"DeleteItemOfUserListBrick - R.id.brick_delete_item_of_userlist_edit_text", "Data", DeleteItemOfUserListBrick.class, R.id.brick_delete_item_of_userlist_edit_text, "1 "},
+ {"LegoNxtMotorTurnAngleBrick - R.id.motor_turn_angle_edit_text", "Lego NXT", LegoNxtMotorTurnAngleBrick.class, R.id.motor_turn_angle_edit_text, "180 "},
+ {"LegoNxtMotorMoveBrick - R.id.motor_action_speed_edit_text", "Lego NXT", LegoNxtMotorMoveBrick.class, R.id.motor_action_speed_edit_text, "100 "},
+ {"LegoNxtPlayToneBrick - R.id.nxt_tone_freq_edit_text", "Lego NXT", LegoNxtPlayToneBrick.class, R.id.nxt_tone_freq_edit_text, "2 "},
+ {"LegoNxtPlayToneBrick - R.id.nxt_tone_duration_edit_text", "Lego NXT", LegoNxtPlayToneBrick.class, R.id.nxt_tone_duration_edit_text, "1 "},
+ {"LegoEv3MotorTurnAngleBrick - R.id.ev3_motor_turn_angle_edit_text", "Lego EV3", LegoEv3MotorTurnAngleBrick.class, R.id.ev3_motor_turn_angle_edit_text, "180 "},
+ {"LegoEv3MotorMoveBrick - R.id.ev3_motor_move_speed_edit_text", "Lego EV3", LegoEv3MotorMoveBrick.class, R.id.ev3_motor_move_speed_edit_text, "100 "},
+ {"LegoEv3PlayToneBrick - R.id.brick_ev3_tone_freq_edit_text", "Lego EV3", LegoEv3PlayToneBrick.class, R.id.brick_ev3_tone_freq_edit_text, "2 "},
+ {"LegoEv3PlayToneBrick - R.id.brick_ev3_tone_duration_edit_text", "Lego EV3", LegoEv3PlayToneBrick.class, R.id.brick_ev3_tone_duration_edit_text, "1 "},
+ {"LegoEv3PlayToneBrick - R.id.brick_ev3_tone_volume_edit_text", "Lego EV3", LegoEv3PlayToneBrick.class, R.id.brick_ev3_tone_volume_edit_text, "100 "},
+ {"DroneMoveUpBrick - R.id.brick_drone_move_up_edit_text_second", "AR.Drone 2.0", DroneMoveUpBrick.class, R.id.brick_drone_move_up_edit_text_second, "1 "},
+ {"DroneMoveUpBrick - R.id.brick_drone_move_up_edit_text_power", "AR.Drone 2.0", DroneMoveUpBrick.class, R.id.brick_drone_move_up_edit_text_power, "20 "},
+ {"DroneMoveDownBrick - R.id.brick_drone_move_down_edit_text_second", "AR.Drone 2.0", DroneMoveDownBrick.class, R.id.brick_drone_move_down_edit_text_second, "1 "},
+ {"DroneMoveDownBrick - R.id.brick_drone_move_down_edit_text_power", "AR.Drone 2.0", DroneMoveDownBrick.class, R.id.brick_drone_move_down_edit_text_power, "20 "},
+ {"DroneMoveLeftBrick - R.id.brick_drone_move_left_edit_text_second", "AR.Drone 2.0", DroneMoveLeftBrick.class, R.id.brick_drone_move_left_edit_text_second, "1 "},
+ {"DroneMoveLeftBrick - R.id.brick_drone_move_left_edit_text_power", "AR.Drone 2.0", DroneMoveLeftBrick.class, R.id.brick_drone_move_left_edit_text_power, "20 "},
+ {"DroneMoveRightBrick - R.id.brick_drone_move_right_edit_text_second", "AR.Drone 2.0", DroneMoveRightBrick.class, R.id.brick_drone_move_right_edit_text_second, "1 "},
+ {"DroneMoveRightBrick - R.id.brick_drone_move_right_edit_text_power", "AR.Drone 2.0", DroneMoveRightBrick.class, R.id.brick_drone_move_right_edit_text_power, "20 "},
+ {"DroneMoveForwardBrick - R.id.brick_drone_move_forward_edit_text_second", "AR.Drone 2.0", DroneMoveForwardBrick.class, R.id.brick_drone_move_forward_edit_text_second, "1 "},
+ {"DroneMoveForwardBrick - R.id.brick_drone_move_forward_edit_text_power", "AR.Drone 2.0", DroneMoveForwardBrick.class, R.id.brick_drone_move_forward_edit_text_power, "20 "},
+ {"DroneMoveBackwardBrick - R.id.brick_drone_move_backward_edit_text_second", "AR.Drone 2.0", DroneMoveBackwardBrick.class, R.id.brick_drone_move_backward_edit_text_second, "1 "},
+ {"DroneMoveBackwardBrick - R.id.brick_drone_move_backward_edit_text_power", "AR.Drone 2.0", DroneMoveBackwardBrick.class, R.id.brick_drone_move_backward_edit_text_power, "20 "},
+ {"DroneTurnLeftBrick - R.id.brick_drone_turn_left_edit_text_second", "AR.Drone 2.0", DroneTurnLeftBrick.class, R.id.brick_drone_turn_left_edit_text_second, "1 "},
+ {"DroneTurnLeftBrick - R.id.brick_drone_turn_left_edit_text_power", "AR.Drone 2.0", DroneTurnLeftBrick.class, R.id.brick_drone_turn_left_edit_text_power, "20 "},
+ {"DroneTurnRightBrick - R.id.brick_drone_turn_right_edit_text_second", "AR.Drone 2.0", DroneTurnRightBrick.class, R.id.brick_drone_turn_right_edit_text_second, "1 "},
+ {"DroneTurnRightBrick - R.id.brick_drone_turn_right_edit_text_power", "AR.Drone 2.0", DroneTurnRightBrick.class, R.id.brick_drone_turn_right_edit_text_power, "20 "},
+ {"PhiroMotorMoveForwardBrick - R.id.brick_phiro_motor_forward_action_speed_edit_text", "Phiro", PhiroMotorMoveForwardBrick.class, R.id.brick_phiro_motor_forward_action_speed_edit_text, "100 "},
+ {"WhenConditionBrick - R.id.brick_when_condition_edit_text", "Event", WhenConditionBrick.class, R.id.brick_when_condition_edit_text, "1 < 2 "},
+ {"IfLogicBeginBrick - R.id.brick_if_begin_edit_text", "Control", IfLogicBeginBrick.class, R.id.brick_if_begin_edit_text, "1 < 2 "},
+ {"IfThenLogicBeginBrick - R.id.brick_if_begin_edit_text", "Control", IfThenLogicBeginBrick.class, R.id.brick_if_begin_edit_text, "1 < 2 "},
+ {"IfThenLogicBeginBrick - R.id.brick_if_begin_edit_text", "Control", IfThenLogicBeginBrick.class, R.id.brick_if_begin_edit_text, "1 < 2 "},
+ {"WaitBrick - R.id.brick_wait_edit_text", "Control", WaitBrick.class, R.id.brick_wait_edit_text, "1 "},
+ {"NoteBrick - R.id.brick_wait_edit_text", "Control", NoteBrick.class, R.id.brick_note_edit_text, "'add comment here…' "},
+ {"WaitUntilBrick - R.id.brick_wait_until_edit_text", "Control", WaitUntilBrick.class, R.id.brick_wait_until_edit_text, "1 < 2 "},
+ {"RepeatUntilBrick - R.id.brick_repeat_until_edit_text", "Control", RepeatUntilBrick.class, R.id.brick_repeat_until_edit_text, "1 < 2 "},
+ {"RepeatUntilBrick - R.id.brick_repeat_edit_text", "Control", RepeatBrick.class, R.id.brick_repeat_edit_text, "10 "},
+ });
+ }
+
+ @Parameterized.Parameter
+ public String name;
+
+ @Parameterized.Parameter(1)
+ public String category;
+
+ @Parameterized.Parameter(2)
+ public Class brickClazz;
+
+ @Parameterized.Parameter(3)
+ public int formulaTextFieldId;
+
+ @Parameterized.Parameter(4)
+ public String expected;
+
+ private CategoryBricksFactory categoryBricksFactory;
+ private Sprite sprite;
+
+ @Before
+ public void setUp() throws Exception {
+ createProject(InstrumentationRegistry.getTargetContext());
+
+ categoryBricksFactory = new CategoryBricksFactory();
+ }
+
+ public void createProject(Context context) {
+ Project project = new Project(context, getClass().getSimpleName());
+ sprite = new Sprite("testSprite");
+ Script script = new StartScript();
+ script.addBrick(new SetXBrick());
+ sprite.addScript(script);
+ project.getDefaultScene().addSprite(sprite);
+ ProjectManager.getInstance().setCurrentProject(project);
+ ProjectManager.getInstance().setCurrentSprite(sprite);
+ ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene());
+ }
+
+ @Test
+ public void testBrickCategory() {
+ List categoryBricks = categoryBricksFactory.getBricks(category, sprite, InstrumentationRegistry.getTargetContext());
+
+ Brick brickInAdapter = null;
+ for (Brick brick : categoryBricks) {
+ if (brickClazz.isInstance(brick)) {
+ brickInAdapter = brick;
+ break;
+ }
+ }
+ assertNotNull(brickInAdapter);
+
+ Brick.BrickField brickField = ((FormulaBrick) brickInAdapter).brickFieldToTextViewIdMap.inverse().get(formulaTextFieldId);
+ String actual = ((FormulaBrick) brickInAdapter).getFormulaWithBrickField(brickField).getTrimmedFormulaString(InstrumentationRegistry.getTargetContext());
+ assertEquals(expected, actual);
+ }
+}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/LookControllerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/LookControllerTest.java
index 6476ba73a04..f4f165fc005 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/LookControllerTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/LookControllerTest.java
@@ -52,7 +52,6 @@
import static org.catrobat.catroid.uiespresso.util.FileTestUtils.assertFileDoesNotExistInDirectory;
import static org.catrobat.catroid.uiespresso.util.FileTestUtils.assertFileExists;
import static org.catrobat.catroid.uiespresso.util.FileTestUtils.assertFileExistsInDirectory;
-import static org.catrobat.catroid.utils.PathBuilder.buildProjectPath;
@RunWith(AndroidJUnit4.class)
public class LookControllerTest {
@@ -171,9 +170,8 @@ private void createProject() throws IOException {
}
private void deleteProject() throws IOException {
- File projectDir = new File(buildProjectPath(project.getName()));
- if (projectDir.exists()) {
- StorageOperations.deleteDir(projectDir);
+ if (project.getDirectory().exists()) {
+ StorageOperations.deleteDir(project.getDirectory());
}
}
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SceneControllerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SceneControllerTest.java
index 8961148fe48..4fde7a8ecd5 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SceneControllerTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SceneControllerTest.java
@@ -37,13 +37,11 @@
import org.catrobat.catroid.content.bricks.PlaceAtBrick;
import org.catrobat.catroid.formulaeditor.UserList;
import org.catrobat.catroid.formulaeditor.UserVariable;
-import org.catrobat.catroid.formulaeditor.datacontainer.DataContainer;
import org.catrobat.catroid.io.ResourceImporter;
import org.catrobat.catroid.io.StorageOperations;
import org.catrobat.catroid.io.XstreamSerializer;
import org.catrobat.catroid.ui.controller.BackpackListManager;
import org.catrobat.catroid.ui.recyclerview.controller.SceneController;
-import org.catrobat.catroid.utils.PathBuilder;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -60,8 +58,6 @@
import static org.catrobat.catroid.common.Constants.SOUND_DIRECTORY_NAME;
import static org.catrobat.catroid.uiespresso.util.FileTestUtils.assertFileDoesNotExist;
import static org.catrobat.catroid.uiespresso.util.FileTestUtils.assertFileExists;
-import static org.catrobat.catroid.utils.PathBuilder.buildProjectPath;
-import static org.catrobat.catroid.utils.PathBuilder.buildScenePath;
@RunWith(AndroidJUnit4.class)
public class SceneControllerTest {
@@ -90,10 +86,10 @@ public void testRenameScene() {
controller.rename(scene, newName);
assertEquals(newName, scene.getName());
- assertEquals(new File(PathBuilder.buildScenePath(project.getName(), newName)), scene.getDirectory());
+ assertEquals(new File(project.getDirectory(), newName), scene.getDirectory());
- assertFileDoesNotExist(new File(PathBuilder.buildScenePath(project.getName(), previousName)));
- assertFileExists(new File(PathBuilder.buildScenePath(project.getName(), newName)));
+ assertFileDoesNotExist(new File(project.getDirectory(), previousName));
+ assertFileExists(new File(project.getDirectory(), newName));
}
@Test
@@ -239,12 +235,10 @@ private void createProject() throws IOException {
Sprite sprite = new Sprite("testSprite");
scene.addSprite(sprite);
- DataContainer dataContainer = scene.getDataContainer();
-
String spriteVarName = "spriteVar";
String spriteListName = "spriteList";
- assertTrue(dataContainer.addUserVariable(sprite, new UserVariable(spriteVarName)));
- assertTrue(dataContainer.addUserList(sprite, new UserList(spriteListName)));
+ assertTrue(sprite.addUserVariable(new UserVariable(spriteVarName)));
+ assertTrue(sprite.addUserList(new UserList(spriteListName)));
StartScript script = new StartScript();
PlaceAtBrick placeAtBrick = new PlaceAtBrick(0, 0);
@@ -265,7 +259,7 @@ private void createProject() throws IOException {
File soundFile = ResourceImporter.createSoundFileFromResourcesInDirectory(
InstrumentationRegistry.getContext().getResources(),
org.catrobat.catroid.test.R.raw.longsound,
- new File(buildScenePath(project.getName(), project.getDefaultScene().getName()), SOUND_DIRECTORY_NAME),
+ new File(project.getDefaultScene().getDirectory(), SOUND_DIRECTORY_NAME),
"longsound.mp3");
sprite.getSoundList().add(new SoundInfo("testSound", soundFile));
@@ -274,9 +268,8 @@ private void createProject() throws IOException {
}
private void deleteProject() throws IOException {
- File projectDir = new File(buildProjectPath(project.getName()));
- if (projectDir.exists()) {
- StorageOperations.deleteDir(projectDir);
+ if (project.getDirectory().exists()) {
+ StorageOperations.deleteDir(project.getDirectory());
}
}
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SoundControllerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SoundControllerTest.java
index 560418089ea..50b4a051bcd 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SoundControllerTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SoundControllerTest.java
@@ -52,8 +52,6 @@
import static org.catrobat.catroid.uiespresso.util.FileTestUtils.assertFileDoesNotExistInDirectory;
import static org.catrobat.catroid.uiespresso.util.FileTestUtils.assertFileExists;
import static org.catrobat.catroid.uiespresso.util.FileTestUtils.assertFileExistsInDirectory;
-import static org.catrobat.catroid.utils.PathBuilder.buildProjectPath;
-import static org.catrobat.catroid.utils.PathBuilder.buildScenePath;
@RunWith(AndroidJUnit4.class)
public class SoundControllerTest {
@@ -168,7 +166,7 @@ private void createProject() throws IOException {
File soundFile = ResourceImporter.createSoundFileFromResourcesInDirectory(
InstrumentationRegistry.getContext().getResources(),
org.catrobat.catroid.test.R.raw.longsound,
- new File(buildScenePath(project.getName(), project.getDefaultScene().getName()), SOUND_DIRECTORY_NAME),
+ new File(project.getDefaultScene().getDirectory(), SOUND_DIRECTORY_NAME),
"longsound.mp3");
soundInfo = new SoundInfo("testSound", soundFile);
@@ -178,9 +176,8 @@ private void createProject() throws IOException {
}
private void deleteProject() throws IOException {
- File projectDir = new File(buildProjectPath(project.getName()));
- if (projectDir.exists()) {
- StorageOperations.deleteDir(projectDir);
+ if (project.getDirectory().exists()) {
+ StorageOperations.deleteDir(project.getDirectory());
}
}
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SpriteControllerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SpriteControllerTest.java
index 8e68ffeb150..cd1f5dd813a 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SpriteControllerTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SpriteControllerTest.java
@@ -36,7 +36,6 @@
import org.catrobat.catroid.content.bricks.PlaceAtBrick;
import org.catrobat.catroid.formulaeditor.UserList;
import org.catrobat.catroid.formulaeditor.UserVariable;
-import org.catrobat.catroid.formulaeditor.datacontainer.DataContainer;
import org.catrobat.catroid.io.ResourceImporter;
import org.catrobat.catroid.io.StorageOperations;
import org.catrobat.catroid.io.XstreamSerializer;
@@ -53,7 +52,6 @@
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertNotSame;
-import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.assertTrue;
import static org.catrobat.catroid.common.Constants.BACKPACK_IMAGE_DIRECTORY;
@@ -64,8 +62,6 @@
import static org.catrobat.catroid.uiespresso.util.FileTestUtils.assertFileDoesNotExistInDirectory;
import static org.catrobat.catroid.uiespresso.util.FileTestUtils.assertFileExists;
import static org.catrobat.catroid.uiespresso.util.FileTestUtils.assertFileExistsInDirectory;
-import static org.catrobat.catroid.utils.PathBuilder.buildProjectPath;
-import static org.catrobat.catroid.utils.PathBuilder.buildScenePath;
@RunWith(AndroidJUnit4.class)
public class SpriteControllerTest {
@@ -89,14 +85,13 @@ public void tearDown() throws IOException {
@Test
public void testCopySprite() throws IOException {
SpriteController controller = new SpriteController();
- DataContainer dataContainer = scene.getDataContainer();
String spriteVarName = "spriteVar";
String spriteListName = "spriteList";
- assertTrue(dataContainer.addUserVariable(sprite, new UserVariable(spriteVarName)));
- assertTrue(dataContainer.addUserList(sprite, new UserList(spriteListName)));
+ assertTrue(sprite.addUserVariable(new UserVariable(spriteVarName)));
+ assertTrue(sprite.addUserList(new UserList(spriteListName)));
- Sprite copy = controller.copy(sprite, scene, scene);
+ Sprite copy = controller.copy(sprite, project, scene);
assertEquals(2, scene.getSpriteList().size());
@@ -105,15 +100,15 @@ public void testCopySprite() throws IOException {
assertEquals(sprite.getNumberOfScripts(), copy.getNumberOfScripts());
assertEquals(sprite.getNumberOfBricks(), copy.getNumberOfBricks());
- assertNotNull(dataContainer.getUserVariable(sprite, spriteVarName));
- assertNotNull(dataContainer.getUserVariable(copy, spriteVarName));
- assertNotSame(dataContainer.getUserVariable(sprite, spriteVarName),
- dataContainer.getUserVariable(copy, spriteVarName));
+ assertNotNull(sprite.getUserVariable(spriteVarName));
+ assertNotNull(copy.getUserVariable(spriteVarName));
+ assertNotSame(sprite.getUserVariable(spriteVarName),
+ copy.getUserVariable(spriteVarName));
- assertNotNull(dataContainer.getUserList(sprite, spriteListName));
- assertNotNull(dataContainer.getUserList(copy, spriteListName));
- assertNotSame(dataContainer.getUserList(sprite, spriteListName),
- dataContainer.getUserList(copy, spriteListName));
+ assertNotNull(sprite.getUserList(spriteListName));
+ assertNotNull(copy.getUserList(spriteListName));
+ assertNotSame(sprite.getUserList(spriteListName),
+ copy.getUserList(spriteListName));
assertFileExists(copy.getLookList().get(0).getFile());
assertFileExists(copy.getSoundList().get(0).getFile());
@@ -122,25 +117,21 @@ public void testCopySprite() throws IOException {
@Test
public void testDeleteSprite() {
SpriteController controller = new SpriteController();
- DataContainer dataContainer = scene.getDataContainer();
String spriteVarName = "spriteVar";
String spriteListName = "spriteList";
- assertTrue(dataContainer.addUserVariable(sprite, new UserVariable(spriteVarName)));
- assertTrue(dataContainer.addUserList(sprite, new UserList(spriteListName)));
+ assertTrue(sprite.addUserVariable(new UserVariable(spriteVarName)));
+ assertTrue(sprite.addUserList(new UserList(spriteListName)));
File deletedLookFile = sprite.getLookList().get(0).getFile();
File deletedSoundFile = sprite.getSoundList().get(0).getFile();
- controller.delete(sprite, scene);
+ controller.delete(sprite);
assertEquals(2, scene.getSpriteList().size());
assertFileDoesNotExist(deletedLookFile);
assertFileDoesNotExist(deletedSoundFile);
-
- assertNull(dataContainer.getUserVariable(sprite, spriteVarName));
- assertNull(dataContainer.getUserList(sprite, spriteListName));
}
@Test
@@ -175,7 +166,7 @@ public void testDeleteSpriteFromBackPack() throws IOException {
public void testUnpackSprite() throws IOException {
SpriteController controller = new SpriteController();
Sprite packedSprite = controller.pack(sprite);
- Sprite unpackedSprite = controller.unpack(packedSprite, scene);
+ Sprite unpackedSprite = controller.unpack(packedSprite, project, scene);
assertEquals(0, BackpackListManager.getInstance().getSprites().size());
@@ -196,7 +187,7 @@ public void testUnpackSprite() throws IOException {
@Test
public void testDeepCopySprite() throws IOException {
SpriteController controller = new SpriteController();
- Sprite copy = controller.copy(sprite, scene, scene);
+ Sprite copy = controller.copy(sprite, project, scene);
assertEquals(2, scene.getSpriteList().size());
@@ -260,7 +251,7 @@ private void createProject() throws IOException {
File soundFile = ResourceImporter.createSoundFileFromResourcesInDirectory(
InstrumentationRegistry.getContext().getResources(),
org.catrobat.catroid.test.R.raw.longsound,
- new File(buildScenePath(project.getName(), project.getDefaultScene().getName()), SOUND_DIRECTORY_NAME),
+ new File(project.getDefaultScene().getDirectory(), SOUND_DIRECTORY_NAME),
"longsound.mp3");
sprite.getSoundList().add(new SoundInfo("testSound", soundFile));
@@ -268,9 +259,8 @@ private void createProject() throws IOException {
}
private void deleteProject() throws IOException {
- File projectDir = new File(buildProjectPath(project.getName()));
- if (projectDir.exists()) {
- StorageOperations.deleteDir(projectDir);
+ if (project.getDirectory().exists()) {
+ StorageOperations.deleteDir(project.getDirectory());
}
}
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/messagecontainer/MessageContainerSaveStateTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/messagecontainer/MessageContainerSaveStateTest.java
index 59dfc5bf77d..e8d9f206132 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/messagecontainer/MessageContainerSaveStateTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/messagecontainer/MessageContainerSaveStateTest.java
@@ -34,9 +34,7 @@
import org.catrobat.catroid.content.Sprite;
import org.catrobat.catroid.content.StartScript;
import org.catrobat.catroid.content.bricks.BroadcastBrick;
-import org.catrobat.catroid.exceptions.CompatibilityProjectException;
-import org.catrobat.catroid.exceptions.LoadingProjectException;
-import org.catrobat.catroid.exceptions.OutdatedVersionProjectException;
+import org.catrobat.catroid.exceptions.ProjectException;
import org.catrobat.catroid.io.StorageOperations;
import org.catrobat.catroid.io.XstreamSerializer;
import org.junit.After;
@@ -81,10 +79,7 @@ public void testDoNotSaveUnusedMessages() {
assertEquals(1, broadcastMessages.size());
}
- private void createTestProjects() throws CompatibilityProjectException,
- OutdatedVersionProjectException,
- LoadingProjectException {
-
+ private void createTestProjects() throws ProjectException {
Project project1 = new Project(InstrumentationRegistry.getTargetContext(), projectName1);
Sprite sprite1 = new SingleSprite("cat");
@@ -101,7 +96,9 @@ private void createTestProjects() throws CompatibilityProjectException,
XstreamSerializer.getInstance().saveProject(project1);
- ProjectManager.getInstance().loadProject(projectName1, InstrumentationRegistry.getTargetContext());
+ ProjectManager.getInstance()
+ .loadProject(project1.getDirectory(), InstrumentationRegistry.getTargetContext());
+
ProjectManager.getInstance()
.setCurrentlyEditedScene(ProjectManager.getInstance().getCurrentProject().getDefaultScene());
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/messagecontainer/MessageContainerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/messagecontainer/MessageContainerTest.java
index 81ffc9ea569..878554851b1 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/messagecontainer/MessageContainerTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/messagecontainer/MessageContainerTest.java
@@ -34,11 +34,10 @@
import org.catrobat.catroid.content.Sprite;
import org.catrobat.catroid.content.StartScript;
import org.catrobat.catroid.content.bricks.BroadcastBrick;
-import org.catrobat.catroid.exceptions.CompatibilityProjectException;
-import org.catrobat.catroid.exceptions.LoadingProjectException;
-import org.catrobat.catroid.exceptions.OutdatedVersionProjectException;
+import org.catrobat.catroid.exceptions.ProjectException;
import org.catrobat.catroid.io.StorageOperations;
import org.catrobat.catroid.io.XstreamSerializer;
+import org.catrobat.catroid.io.asynctask.ProjectSaveTask;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -61,6 +60,9 @@ public class MessageContainerTest {
private final String broadcastMessage1 = "testBroadcast1";
private final String broadcastMessage2 = "testBroadcast2";
+ private Project project1;
+ private Project project2;
+
@Before
public void setUp() throws Exception {
createTestProjects();
@@ -82,14 +84,14 @@ public void testLoadProject() {
}
@Test
- public void testLoadTwoProjects() throws CompatibilityProjectException,
- OutdatedVersionProjectException,
- LoadingProjectException {
+ public void testLoadTwoProjects() throws ProjectException {
Project currentProject = ProjectManager.getInstance().getCurrentProject();
currentProject.getBroadcastMessageContainer().update();
- ProjectManager.getInstance().loadProject(projectName2, InstrumentationRegistry.getTargetContext());
+ ProjectManager.getInstance()
+ .loadProject(project2.getDirectory(), InstrumentationRegistry.getTargetContext());
+
currentProject = ProjectManager.getInstance().getCurrentProject();
ProjectManager.getInstance().setCurrentlyEditedScene(currentProject.getDefaultScene());
List broadcastMessages = currentProject.getBroadcastMessageContainer().getBroadcastMessages();
@@ -99,11 +101,8 @@ public void testLoadTwoProjects() throws CompatibilityProjectException,
assertEquals(1, broadcastMessages.size());
}
- private void createTestProjects() throws CompatibilityProjectException,
- OutdatedVersionProjectException,
- LoadingProjectException {
-
- Project project1 = new Project(InstrumentationRegistry.getTargetContext(), projectName1);
+ private void createTestProjects() throws ProjectException {
+ project1 = new Project(InstrumentationRegistry.getTargetContext(), projectName1);
Sprite sprite1 = new SingleSprite("cat");
Script script1 = new StartScript();
@@ -116,9 +115,10 @@ private void createTestProjects() throws CompatibilityProjectException,
project1.getDefaultScene().addSprite(sprite1);
- XstreamSerializer.getInstance().saveProject(project1);
+ ProjectSaveTask
+ .task(project1);
- Project project2 = new Project(InstrumentationRegistry.getTargetContext(), projectName2);
+ project2 = new Project(InstrumentationRegistry.getTargetContext(), projectName2);
Sprite sprite2 = new SingleSprite("cat");
Script script2 = new StartScript();
@@ -132,8 +132,8 @@ private void createTestProjects() throws CompatibilityProjectException,
project2.getDefaultScene().addSprite(sprite2);
XstreamSerializer.getInstance().saveProject(project2);
- ProjectManager.getInstance().loadProject(projectName1, InstrumentationRegistry.getTargetContext());
ProjectManager.getInstance()
- .setCurrentlyEditedScene(ProjectManager.getInstance().getCurrentProject().getDefaultScene());
+ .loadProject(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName2),
+ InstrumentationRegistry.getTargetContext());
}
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/script/ScriptTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/script/ScriptTest.java
deleted file mode 100644
index ec2328d466d..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/script/ScriptTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-package org.catrobat.catroid.test.content.script;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.content.Script;
-import org.catrobat.catroid.content.StartScript;
-import org.catrobat.catroid.content.bricks.Brick;
-import org.catrobat.catroid.content.bricks.HideBrick;
-import org.catrobat.catroid.content.bricks.PlaceAtBrick;
-import org.catrobat.catroid.content.bricks.ShowBrick;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-import static junit.framework.Assert.assertEquals;
-
-@RunWith(AndroidJUnit4.class)
-public class ScriptTest {
-
- private HideBrick hideBrick;
- private ShowBrick showBrick;
- private PlaceAtBrick placeAtBrick;
-
- @Before
- public void setUp() throws Exception {
- hideBrick = new HideBrick();
- showBrick = new ShowBrick();
- placeAtBrick = new PlaceAtBrick(0, 0);
- }
-
- @Test
- public void testAddBricks() {
- Script script = new StartScript();
- script.addBrick(hideBrick);
- script.addBrick(showBrick);
- script.addBrick(placeAtBrick);
-
- List brickList = script.getBrickList();
-
- assertEquals(3, brickList.size());
- assertEquals(0, brickList.indexOf(hideBrick));
- assertEquals(1, brickList.indexOf(showBrick));
- assertEquals(2, brickList.indexOf(placeAtBrick));
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/sprite/LookTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/sprite/LookTest.java
index 92afd0af9f3..c05d1c4897e 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/sprite/LookTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/sprite/LookTest.java
@@ -27,196 +27,28 @@
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.scenes.scene2d.Group;
-import com.badlogic.gdx.scenes.scene2d.Touchable;
import org.catrobat.catroid.content.Look;
import org.catrobat.catroid.content.SingleSprite;
import org.catrobat.catroid.content.Sprite;
import org.catrobat.catroid.test.utils.TestUtils;
-import org.catrobat.catroid.utils.TouchUtil;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
@RunWith(AndroidJUnit4.class)
public class LookTest {
- private Look look;
private Sprite sprite;
- private float width = 32;
- private float height = 16;
-
@Before
public void setUp() {
Group parentGroup = new Group();
sprite = new SingleSprite("test");
parentGroup.addActor(sprite.look);
- look = sprite.look;
- }
-
- @Test
- public void testConstructor() {
- assertEquals(0f, look.getX());
- assertEquals(0f, look.getY());
- assertEquals(0f, look.getHeight());
- assertEquals(0f, look.getWidth());
- assertEquals(0f, look.getOriginX());
- assertEquals(0f, look.getOriginY());
- assertEquals(0f, look.getRotation());
- assertEquals(1f, look.getScaleX());
- assertEquals(1f, look.getScaleY());
- assertEquals(0f, look.getTransparencyInUserInterfaceDimensionUnit());
- assertEquals(100f, look.getBrightnessInUserInterfaceDimensionUnit());
- assertEquals(0f, look.getColorInUserInterfaceDimensionUnit());
- assertEquals(100f, look.getSizeInUserInterfaceDimensionUnit());
- assertEquals(0, look.getZIndex());
- assertTrue(look.isVisible());
- assertEquals(Touchable.enabled, look.getTouchable());
- assertEquals("", look.getImagePath());
- }
-
- @Test
- public void testPositions() {
- float x = 3f;
- float y = 10f;
- look.setWidth(width);
- look.setHeight(height);
-
- look.setXInUserInterfaceDimensionUnit(x);
- checkX(x);
-
- look.setYInUserInterfaceDimensionUnit(y);
- checkY(y);
-
- look.changeXInUserInterfaceDimensionUnit(x);
- checkX(2 * x);
-
- look.changeYInUserInterfaceDimensionUnit(y);
- checkY(2 * y);
-
- x = 5f;
- y = -3f;
- look.setPositionInUserInterfaceDimensionUnit(x, y);
- checkX(x);
- checkY(y);
- }
-
- private void checkX(float x) {
- assertEquals(x, look.getXInUserInterfaceDimensionUnit());
- assertEquals(x - width / 2, look.getX());
- }
-
- private void checkY(float y) {
- assertEquals(y, look.getYInUserInterfaceDimensionUnit());
- assertEquals(y - height / 2, look.getY());
- }
-
- @Test
- public void testDirection() {
- look.setDirectionInUserInterfaceDimensionUnit(90f);
- look.changeDirectionInUserInterfaceDimensionUnit(10f);
-
- assertEquals(100f, look.getDirectionInUserInterfaceDimensionUnit());
- assertEquals(-10f, look.getRotation());
-
- look.setDirectionInUserInterfaceDimensionUnit(90f);
- look.changeDirectionInUserInterfaceDimensionUnit(360f);
-
- assertEquals(90f, look.getDirectionInUserInterfaceDimensionUnit());
- assertEquals(0f, look.getRotation());
- }
-
- @Test
- public void testSize() {
- float size = 30f;
- look.setSizeInUserInterfaceDimensionUnit(size);
- assertEquals(size, look.getSizeInUserInterfaceDimensionUnit(), 1e-5);
- assertEquals(size / 100f, look.getScaleX());
- assertEquals(size / 100f, look.getScaleY());
-
- look.changeSizeInUserInterfaceDimensionUnit(size);
- assertEquals(2 * size, look.getSizeInUserInterfaceDimensionUnit(), 1e-5);
- assertEquals(2 * size / 100f, look.getScaleX());
- assertEquals(2 * size / 100f, look.getScaleY());
-
- look.setSizeInUserInterfaceDimensionUnit(-10f);
- assertEquals(0f, look.getSizeInUserInterfaceDimensionUnit());
- }
-
- @Test
- public void testTransparency() {
- float transparency = 20f;
- look.setTransparencyInUserInterfaceDimensionUnit(transparency);
- assertEquals(transparency, look.getTransparencyInUserInterfaceDimensionUnit(), 1e-5);
- assertEquals(0.8f, look.getAlpha());
-
- look.changeTransparencyInUserInterfaceDimensionUnit(transparency);
- assertEquals(2 * transparency, look.getTransparencyInUserInterfaceDimensionUnit(), 1e-5);
- assertEquals(0.6f, look.getAlpha());
-
- look.setTransparencyInUserInterfaceDimensionUnit(-10f);
- assertEquals(0f, look.getTransparencyInUserInterfaceDimensionUnit());
- assertEquals(1f, look.getAlpha());
-
- look.setTransparencyInUserInterfaceDimensionUnit(200f);
- assertEquals(100f, look.getTransparencyInUserInterfaceDimensionUnit());
- assertEquals(0f, look.getAlpha());
- }
-
- @Test
- public void testBrightness() {
- float brightness = 42f;
- look.setBrightnessInUserInterfaceDimensionUnit(brightness);
- assertEquals(brightness, look.getBrightnessInUserInterfaceDimensionUnit());
- assertEquals(0.42f, look.getBrightness());
-
- look.changeBrightnessInUserInterfaceDimensionUnit(brightness);
- assertEquals(2 * brightness, look.getBrightnessInUserInterfaceDimensionUnit());
- assertEquals(0.84f, look.getBrightness());
-
- look.setBrightnessInUserInterfaceDimensionUnit(-10);
- assertEquals(0f, look.getBrightnessInUserInterfaceDimensionUnit());
- assertEquals(0f, look.getBrightness());
- }
-
- @Test
- public void testColor() {
- int red = -40;
- int green = 80;
-
- look.setColorInUserInterfaceDimensionUnit(red);
- assertEquals(160.0f, look.getColorInUserInterfaceDimensionUnit());
-
- look.changeColorInUserInterfaceDimensionUnit(green);
- assertEquals(40.0f, look.getColorInUserInterfaceDimensionUnit());
- }
-
- @Test
- public void testDistanceTo() {
- look.setXInUserInterfaceDimensionUnit(25);
- look.setYInUserInterfaceDimensionUnit(55);
- float touchPosition = look.getDistanceToTouchPositionInUserInterfaceDimensions();
-
- float pointAx = look.getXInUserInterfaceDimensionUnit();
- float pointAy = look.getYInUserInterfaceDimensionUnit();
- int touchIndex = TouchUtil.getLastTouchIndex();
- float pointBx = TouchUtil.getX(touchIndex);
- float pointBy = TouchUtil.getY(touchIndex);
-
- float vectorX = pointBx - pointAx;
- float vectorY = pointBy - pointAy;
-
- double squareX = (float) Math.pow(vectorX, 2);
- double squareY = (float) Math.pow(vectorY, 2);
-
- float squareRootOfScalar = (float) Math.sqrt(squareX + squareY);
-
- assertEquals(touchPosition, squareRootOfScalar);
}
@Test
@@ -250,36 +82,4 @@ public void testTouchDownFlippedWithAlpha() {
assertTrue(look.doTouchDown(0, 0, 0));
assertFalse(look.doTouchDown(1, 0, 0));
}
-
- @Test
- public void testCloneValues() {
- Look origin = new Look(null);
- origin.setSizeInUserInterfaceDimensionUnit(12);
- origin.setPositionInUserInterfaceDimensionUnit(4, 12);
- origin.setColorInUserInterfaceDimensionUnit(42);
- origin.setTransparencyInUserInterfaceDimensionUnit(7);
- origin.setRotationMode(Look.ROTATION_STYLE_LEFT_RIGHT_ONLY);
- origin.setBrightnessInUserInterfaceDimensionUnit(3);
- origin.setDirectionInUserInterfaceDimensionUnit(8);
- origin.setLookVisible(false);
-
- Look clone = new Look(null);
- origin.copyTo(clone);
-
- assertEquals(origin.getSizeInUserInterfaceDimensionUnit(), clone.getSizeInUserInterfaceDimensionUnit());
-
- assertEquals(origin.getXInUserInterfaceDimensionUnit(), clone.getXInUserInterfaceDimensionUnit());
- assertEquals(origin.getYInUserInterfaceDimensionUnit(), clone.getYInUserInterfaceDimensionUnit());
-
- assertEquals(origin.getColorInUserInterfaceDimensionUnit(), clone.getColorInUserInterfaceDimensionUnit());
- assertEquals(origin.getTransparencyInUserInterfaceDimensionUnit(), clone.getTransparencyInUserInterfaceDimensionUnit());
-
- assertEquals(origin.getRotationMode(), clone.getRotationMode());
-
- assertEquals(origin.getBrightnessInUserInterfaceDimensionUnit(), clone.getBrightnessInUserInterfaceDimensionUnit());
-
- assertEquals(origin.getDirectionInUserInterfaceDimensionUnit(), clone.getDirectionInUserInterfaceDimensionUnit());
-
- assertEquals(origin.isLookVisible(), clone.isLookVisible());
- }
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/sprite/SpriteTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/sprite/SpriteTest.java
index b7f43f4a582..d0c204201a4 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/sprite/SpriteTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/sprite/SpriteTest.java
@@ -38,24 +38,13 @@
import org.catrobat.catroid.content.bricks.ChangeBrightnessByNBrick;
import org.catrobat.catroid.content.bricks.ShowTextBrick;
import org.catrobat.catroid.formulaeditor.Formula;
-import org.catrobat.catroid.formulaeditor.FormulaElement;
-import org.catrobat.catroid.formulaeditor.FormulaElement.ElementType;
import org.catrobat.catroid.formulaeditor.UserVariable;
-import org.catrobat.catroid.formulaeditor.datacontainer.DataContainer;
import org.catrobat.catroid.test.utils.TestUtils;
-import org.catrobat.catroid.ui.recyclerview.controller.SpriteController;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
@RunWith(AndroidJUnit4.class)
@@ -75,110 +64,15 @@ public void setUp() throws Exception {
sprite = new SingleSprite("testSprite");
project = new Project(InstrumentationRegistry.getTargetContext(), TestUtils.DEFAULT_TEST_PROJECT_NAME);
project.getDefaultScene().addSprite(sprite);
- project.getDefaultScene().getDataContainer()
- .addUserVariable(sprite, new UserVariable(LOCAL_VARIABLE_NAME));
- project.getDefaultScene().getDataContainer()
- .getUserVariable(sprite, LOCAL_VARIABLE_NAME).setValue(LOCAL_VARIABLE_VALUE);
+ sprite.addUserVariable(new UserVariable(LOCAL_VARIABLE_NAME));
+ sprite.getUserVariable(LOCAL_VARIABLE_NAME).setValue(LOCAL_VARIABLE_VALUE);
UserVariable globalVariable = new UserVariable(GLOBAL_VARIABLE_NAME, GLOBAL_VARIABLE_VALUE);
- project.getDefaultScene().getDataContainer().addUserVariable(globalVariable);
+ project.addUserVariable(globalVariable);
ProjectManager.getInstance().setCurrentProject(project);
}
- @Test
- public void testAddScript() {
- Sprite sprite = new SingleSprite("new SingleSprite");
- Script firstScript = new StartScript();
- Script secondScript = new StartScript();
- sprite.addScript(firstScript);
- assertEquals(1, sprite.getNumberOfScripts());
-
- sprite.addScript(0, secondScript);
- assertEquals(2, sprite.getNumberOfScripts());
-
- assertEquals(1, sprite.getScriptIndex(firstScript));
- assertEquals(0, sprite.getScriptIndex(secondScript));
-
- sprite.removeAllScripts();
- assertEquals(0, sprite.getNumberOfScripts());
- }
-
- @Test
- public void testGetScript() {
- Sprite sprite = new SingleSprite("new SingleSprite");
- Script firstScript = new StartScript();
- Script secondScript = new StartScript();
- sprite.addScript(firstScript);
- sprite.addScript(secondScript);
- assertEquals(firstScript, sprite.getScript(0));
- assertEquals(secondScript, sprite.getScript(1));
- }
-
- @Test
- public void testRemoveAllScripts() {
- Sprite sprite = new SingleSprite("new SingleSprite");
- Script firstScript = new StartScript();
- Script secondScript = new StartScript();
- sprite.addScript(firstScript);
- sprite.addScript(secondScript);
-
- sprite.removeAllScripts();
-
- assertEquals(0, sprite.getNumberOfScripts());
- }
-
- @Test
- public void testRemoveScript() {
- Sprite sprite = new SingleSprite("new SingleSprite");
- Script firstScript = new StartScript();
- Script secondScript = new StartScript();
- sprite.addScript(firstScript);
- sprite.addScript(secondScript);
-
- sprite.removeScript(firstScript);
-
- assertEquals(1, sprite.getNumberOfScripts());
- assertEquals(secondScript, sprite.getScript(0));
- }
-
- @Test
- public void testGetScriptIndex() {
- Sprite sprite = new SingleSprite("new SingleSprite");
- Script firstScript = new StartScript();
- Script secondScript = new StartScript();
- sprite.addScript(firstScript);
- sprite.addScript(secondScript);
- assertEquals(0, sprite.getScriptIndex(firstScript));
- assertEquals(1, sprite.getScriptIndex(secondScript));
- }
-
- @Test
- public void testSpriteCloneWithLocalVariable() throws IOException {
- Script script = new StartScript();
- Brick brick = new ChangeBrightnessByNBrick(new Formula(new FormulaElement(ElementType.USER_VARIABLE,
- LOCAL_VARIABLE_NAME, null)));
-
- script.addBrick(brick);
- sprite.addScript(script);
- Sprite clonedSprite = new SpriteController().copy(sprite, project.getDefaultScene(), project.getDefaultScene());
-
- UserVariable clonedVariable = project.getDefaultScene().getDataContainer()
- .getUserVariable(clonedSprite, LOCAL_VARIABLE_NAME);
-
- assertNotNull(clonedVariable);
- assertEquals(LOCAL_VARIABLE_NAME, clonedVariable.getName());
- assertEquals(LOCAL_VARIABLE_VALUE, clonedVariable.getValue());
-
- List userVariableList = project.getDefaultScene().getDataContainer()
- .getSpriteUserVariables(clonedSprite);
-
- Set hashSet = new HashSet<>();
- for (UserVariable userVariable : userVariableList) {
- assertTrue(hashSet.add(userVariable.getName()));
- }
- }
-
@Test
public void testUserVariableVisibilityOfLocalVariablesInDifferentScenes() {
String variableName = "sceneTestVariable";
@@ -195,8 +89,8 @@ public void testUserVariableVisibilityOfLocalVariablesInDifferentScenes() {
Brick textBrick = new ShowTextBrick(10, 10);
secondScript.addBrick(textBrick);
sprite2.addScript(secondScript);
- secondScene.getDataContainer().addUserVariable(sprite2, new UserVariable(variableName));
- UserVariable userVariable = secondScene.getDataContainer().getUserVariable(sprite2, variableName);
+ sprite2.addUserVariable(new UserVariable(variableName));
+ UserVariable userVariable = sprite2.getUserVariable(variableName);
userVariable.setValue(LOCAL_VARIABLE_VALUE);
userVariable.setVisible(false);
ProjectManager.getInstance().setCurrentlyPlayingScene(secondScene);
@@ -206,13 +100,12 @@ public void testUserVariableVisibilityOfLocalVariablesInDifferentScenes() {
new Formula(10), userVariable));
secondScript.run(sprite2, thread);
- DataContainer dataContainer = ProjectManager.getInstance().getCurrentlyPlayingScene().getDataContainer();
- userVariable = dataContainer.getUserVariable(sprite2, variableName);
+ userVariable = sprite2.getUserVariable(variableName);
assertFalse(userVariable.getVisible());
thread.act(1f);
- userVariable = dataContainer.getUserVariable(sprite2, variableName);
+ userVariable = sprite2.getUserVariable(variableName);
assertTrue(userVariable.getVisible());
}
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/devices/arduino/ArduinoSettingsTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/devices/arduino/ArduinoSettingsTest.java
index 9f797d01616..6a482f7bfdc 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/devices/arduino/ArduinoSettingsTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/devices/arduino/ArduinoSettingsTest.java
@@ -34,10 +34,10 @@
import org.catrobat.catroid.content.Sprite;
import org.catrobat.catroid.content.StartScript;
import org.catrobat.catroid.content.bricks.ArduinoSendPWMValueBrick;
-import org.catrobat.catroid.exceptions.CompatibilityProjectException;
-import org.catrobat.catroid.exceptions.LoadingProjectException;
-import org.catrobat.catroid.exceptions.OutdatedVersionProjectException;
+import org.catrobat.catroid.exceptions.ProjectException;
import org.catrobat.catroid.io.StorageOperations;
+import org.catrobat.catroid.io.asynctask.ProjectSaveTask;
+import org.catrobat.catroid.test.utils.TestUtils;
import org.catrobat.catroid.ui.settingsfragments.SettingsFragment;
import org.junit.After;
import org.junit.Before;
@@ -53,49 +53,51 @@
@RunWith(AndroidJUnit4.class)
public class ArduinoSettingsTest {
- private String projectName = "testProject";
- Context context = null;
+ private boolean sharedPreferenceBuffer;
+ private String projectName = ArduinoSettingsTest.class.getSimpleName();
+ private Project project;
@Before
public void setUp() throws Exception {
-
- context = InstrumentationRegistry.getTargetContext();
+ Context context = InstrumentationRegistry.getTargetContext();
+ sharedPreferenceBuffer = SettingsFragment.isArduinoSharedPreferenceEnabled(context);
SettingsFragment.setArduinoSharedPreferenceEnabled(context, false);
+ createProjectArduino();
}
@After
public void tearDown() throws Exception {
- SettingsFragment.setArduinoSharedPreferenceEnabled(context, false);
+ TestUtils.deleteProjects(projectName);
+ SettingsFragment
+ .setArduinoSharedPreferenceEnabled(InstrumentationRegistry.getTargetContext(), sharedPreferenceBuffer);
}
@Test
- public void testIfArduinoBricksAreEnabledIfItItUsedInAProgram() throws IOException, CompatibilityProjectException,
- OutdatedVersionProjectException, LoadingProjectException, InterruptedException {
-
- createProjectArduino();
+ public void testIfArduinoBricksAreEnabledIfItItUsedInAProgram() throws IOException, ProjectException {
+ Context context = InstrumentationRegistry.getTargetContext();
assertFalse(SettingsFragment.isArduinoSharedPreferenceEnabled(context));
- ProjectManager.getInstance().loadProject(projectName, context);
+ ProjectManager.getInstance().loadProject(project.getDirectory(), context);
assertTrue(SettingsFragment.isArduinoSharedPreferenceEnabled(context));
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName));
}
- private void createProjectArduino() throws InterruptedException {
- Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
+ private void createProjectArduino() {
+ project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
Sprite sprite = new SingleSprite("Arduino");
StartScript startScript = new StartScript();
- ArduinoSendPWMValueBrick arduinoArduinoSendPWMValueBrick = new ArduinoSendPWMValueBrick(3, 255);
- startScript.addBrick(arduinoArduinoSendPWMValueBrick);
+ ArduinoSendPWMValueBrick brick = new ArduinoSendPWMValueBrick(3, 255);
+ startScript.addBrick(brick);
sprite.addScript(startScript);
+
project.getDefaultScene().addSprite(sprite);
ProjectManager.getInstance().setCurrentProject(project);
- ProjectManager.getInstance().saveProject(context);
- Thread.sleep(100);
- ProjectManager.getInstance().setCurrentProject(null);
+ ProjectSaveTask
+ .task(project);
}
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/devices/mindstorms/ev3/LegoEV3ImplTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/devices/mindstorms/ev3/LegoEV3ImplTest.java
index 1678da43ac5..ec2e6044b90 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/devices/mindstorms/ev3/LegoEV3ImplTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/devices/mindstorms/ev3/LegoEV3ImplTest.java
@@ -52,6 +52,7 @@ public void setUp() throws Exception {
ev3 = new LegoEV3Impl(this.applicationContext);
logger = ConnectionDataLogger.createLocalConnectionLogger();
+ logger.setTimeoutMilliSeconds(100);
ev3.setConnection(logger.getConnectionProxy());
}
@@ -155,7 +156,7 @@ public void testPlayToneWithZeroDuration() {
}
@Test
- public void testPlayToneWithZeroVolume() {
+ public void testPlayToneWithZeroVolume() throws Exception {
int inputHz = 13000;
int inputDurationInMs = 0;
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/devices/phiro/PhiroSettingsTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/devices/phiro/PhiroSettingsTest.java
index efdd4771c7a..06d5ade00a9 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/devices/phiro/PhiroSettingsTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/devices/phiro/PhiroSettingsTest.java
@@ -23,7 +23,6 @@
package org.catrobat.catroid.test.devices.phiro;
-import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
@@ -34,13 +33,12 @@
import org.catrobat.catroid.content.Sprite;
import org.catrobat.catroid.content.StartScript;
import org.catrobat.catroid.content.bricks.SetSizeToBrick;
-import org.catrobat.catroid.exceptions.CompatibilityProjectException;
-import org.catrobat.catroid.exceptions.LoadingProjectException;
-import org.catrobat.catroid.exceptions.OutdatedVersionProjectException;
+import org.catrobat.catroid.exceptions.ProjectException;
import org.catrobat.catroid.formulaeditor.Formula;
import org.catrobat.catroid.formulaeditor.FormulaElement;
import org.catrobat.catroid.formulaeditor.Sensors;
import org.catrobat.catroid.io.StorageOperations;
+import org.catrobat.catroid.io.asynctask.ProjectSaveTask;
import org.catrobat.catroid.ui.settingsfragments.SettingsFragment;
import org.junit.After;
import org.junit.Before;
@@ -56,49 +54,50 @@
@RunWith(AndroidJUnit4.class)
public class PhiroSettingsTest {
+ private boolean sharedPreferenceBuffer;
private String projectName = "testProject";
- Context context = null;
+ private Project project;
@Before
public void setUp() throws Exception {
-
- context = InstrumentationRegistry.getTargetContext();
- SettingsFragment.setPhiroSharedPreferenceEnabled(context, false);
+ sharedPreferenceBuffer =
+ SettingsFragment.isPhiroSharedPreferenceEnabled(InstrumentationRegistry.getTargetContext());
+ SettingsFragment.setPhiroSharedPreferenceEnabled(InstrumentationRegistry.getTargetContext(), false);
+ createProject();
}
@After
public void tearDown() throws Exception {
- SettingsFragment.setPhiroSharedPreferenceEnabled(context, false);
+ SettingsFragment
+ .setPhiroSharedPreferenceEnabled(InstrumentationRegistry.getTargetContext(), sharedPreferenceBuffer);
}
@Test
- public void testIfPhiroBricksAreEnabledIfItItUsedInAProgram() throws IOException, CompatibilityProjectException,
- OutdatedVersionProjectException, LoadingProjectException, InterruptedException {
-
- createProjectPhiro();
+ public void testIfPhiroBricksAreEnabledIfItItUsedInAProgram() throws IOException, ProjectException {
+ assertFalse(SettingsFragment.isPhiroSharedPreferenceEnabled(InstrumentationRegistry.getTargetContext()));
- assertFalse(SettingsFragment.isPhiroSharedPreferenceEnabled(context));
+ ProjectManager.getInstance()
+ .loadProject(project.getDirectory(), InstrumentationRegistry.getTargetContext());
- ProjectManager.getInstance().loadProject(projectName, context);
-
- assertTrue(SettingsFragment.isPhiroSharedPreferenceEnabled(context));
+ assertTrue(SettingsFragment.isPhiroSharedPreferenceEnabled(InstrumentationRegistry.getTargetContext()));
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName));
}
- private void createProjectPhiro() throws InterruptedException {
- Project projectPhiro = new Project(InstrumentationRegistry.getTargetContext(), projectName);
+ private void createProject() {
+ project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
Sprite sprite = new SingleSprite("Phiro");
StartScript startScript = new StartScript();
- SetSizeToBrick setSizeToBrick = new SetSizeToBrick(new Formula(new FormulaElement(FormulaElement.ElementType.SENSOR,
- Sensors.PHIRO_BOTTOM_LEFT.name(), null)));
+ SetSizeToBrick setSizeToBrick = new SetSizeToBrick(
+ new Formula(new FormulaElement(FormulaElement.ElementType.SENSOR,
+ Sensors.PHIRO_BOTTOM_LEFT.name(), null)));
+
startScript.addBrick(setSizeToBrick);
sprite.addScript(startScript);
- projectPhiro.getDefaultScene().addSprite(sprite);
+ project.getDefaultScene().addSprite(sprite);
- ProjectManager.getInstance().setCurrentProject(projectPhiro);
- ProjectManager.getInstance().saveProject(context);
- Thread.sleep(100);
- ProjectManager.getInstance().setCurrentProject(null);
+ ProjectManager.getInstance().setCurrentProject(project);
+ ProjectSaveTask
+ .task(project);
}
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/formulaeditor/DataContainerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/formulaeditor/DataContainerTest.java
deleted file mode 100644
index 0f5cc7b8582..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/formulaeditor/DataContainerTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-package org.catrobat.catroid.test.formulaeditor;
-
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.content.Project;
-import org.catrobat.catroid.content.Sprite;
-import org.catrobat.catroid.formulaeditor.UserList;
-import org.catrobat.catroid.formulaeditor.UserVariable;
-import org.catrobat.catroid.formulaeditor.datacontainer.DataContainer;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-
-@RunWith(AndroidJUnit4.class)
-public class DataContainerTest {
-
- @Test
- public void testAddProjectVariablesWithSameName() {
-
- String projectName = "project";
- String varName = "var0";
-
- UserVariable var = new UserVariable(varName);
-
- Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
-
- DataContainer dataContainer = new DataContainer(project);
- assertTrue(dataContainer.addUserVariable(var));
- assertFalse(dataContainer.addUserVariable(var));
- }
-
- @Test
- public void testGetVariables() {
-
- String projectName = "project";
- String spriteName = "sprite";
- String gVarName = "gVar";
- String lVarName = "lVar";
-
- UserVariable gVar = new UserVariable(gVarName);
- UserVariable lVar = new UserVariable(lVarName);
-
- Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
- Sprite sprite = new Sprite(spriteName);
- project.getDefaultScene().addSprite(sprite);
-
- DataContainer dataContainer = new DataContainer(project);
- assertTrue(dataContainer.addUserVariable(gVar));
- assertTrue(dataContainer.addUserVariable(sprite, lVar));
-
- assertEquals(gVar, dataContainer.getUserVariable(sprite, gVarName));
- assertEquals(lVar, dataContainer.getUserVariable(sprite, lVarName));
-
- assertEquals(1, dataContainer.getProjectUserVariables().size());
- assertEquals(1, dataContainer.getSpriteUserVariables(sprite).size());
-
- assertEquals(gVar, dataContainer.getProjectUserVariable(gVarName));
- assertNull(dataContainer.getProjectUserVariable(lVarName));
- }
-
- @Test
- public void testGetLists() {
-
- String projectName = "project";
- String spriteName = "sprite";
- String gListName = "gList";
- String lListName = "lList";
-
- UserList gList = new UserList(gListName);
- UserList lList = new UserList(lListName);
-
- Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
- Sprite sprite = new Sprite(spriteName);
- project.getDefaultScene().addSprite(sprite);
-
- DataContainer dataContainer = new DataContainer(project);
- assertTrue(dataContainer.addUserList(gList));
- assertTrue(dataContainer.addUserList(sprite, lList));
-
- assertEquals(gList, dataContainer.getUserList(sprite, gListName));
- assertEquals(lList, dataContainer.getUserList(sprite, lListName));
-
- assertEquals(1, dataContainer.getProjectUserLists().size());
- assertEquals(1, dataContainer.getSpriteUserLists(sprite).size());
-
- assertEquals(gList, dataContainer.getUserList(gListName));
- assertNull(dataContainer.getUserList(lListName));
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/formulaeditor/datacontainer/UserDataListWrapperTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/formulaeditor/datacontainer/UserDataListWrapperTest.java
deleted file mode 100644
index eeec78f0367..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/formulaeditor/datacontainer/UserDataListWrapperTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.test.formulaeditor.datacontainer;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.formulaeditor.UserVariable;
-import org.catrobat.catroid.formulaeditor.datacontainer.UserDataListWrapper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-@RunWith(AndroidJUnit4.class)
-public class UserDataListWrapperTest {
-
- @Test
- public void testReferencesWithAdd() {
-
- String varName = "var0";
-
- UserVariable var = new UserVariable(varName);
- List variables = new ArrayList<>();
-
- UserDataListWrapper userDataList = new UserDataListWrapper<>(variables);
- userDataList.add(var);
-
- assertEquals(userDataList.contains(varName), variables.contains(var));
- }
-
- @Test
- public void testReferencesWithContains() {
-
- String varName = "var0";
-
- UserVariable var = new UserVariable(varName);
- List variables = new ArrayList<>();
- variables.add(var);
-
- UserDataListWrapper userDataList = new UserDataListWrapper<>(variables);
-
- assertEquals(userDataList.contains(varName), variables.contains(var));
- }
-
- @Test
- public void testReferencesWithGet() {
-
- String varName = "var0";
-
- UserVariable var = new UserVariable(varName);
- List variables = new ArrayList<>();
- variables.add(var);
-
- UserDataListWrapper userDataList = new UserDataListWrapper<>(variables);
-
- assertEquals(var, userDataList.get(varName));
- }
-
- @Test
- public void testReferencesWithRemove() {
-
- String varName = "var0";
-
- UserVariable var = new UserVariable(varName);
- List variables = new ArrayList<>();
- variables.add(var);
-
- UserDataListWrapper userDataList = new UserDataListWrapper<>(variables);
- userDataList.remove(varName);
-
- assertEquals(userDataList.size(), variables.size());
- assertTrue(variables.isEmpty());
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/BackwardCompatibleCatrobatLanguageXStreamTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/BackwardCompatibleCatrobatLanguageXStreamTest.java
deleted file mode 100644
index ee300fee2dd..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/BackwardCompatibleCatrobatLanguageXStreamTest.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-package org.catrobat.catroid.test.io;
-
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.common.FlavoredConstants;
-import org.catrobat.catroid.content.Project;
-import org.catrobat.catroid.io.StorageOperations;
-import org.catrobat.catroid.io.XstreamSerializer;
-import org.catrobat.catroid.io.ZipArchiver;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Locale;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-
-@RunWith(AndroidJUnit4.class)
-public class BackwardCompatibleCatrobatLanguageXStreamTest {
-
- private static final String ZIP_FILENAME_FALLING_BALLS = "Falling_balls.catrobat";
- private static final String ZIP_FILENAME_COLOR_LEANER_BALLOONS = "Color_Learner_-_Balloons.catrobat";
- private static final String ZIP_FILENAME_PONG_STARTER = "Pong_Starter.catrobat";
- private static final String ZIP_FILENAME_WHIP = "Whip.catrobat";
- private static final String ZIP_FILENAME_AIR_FIGHT = "Air_fight_0.5.catrobat";
- private static final String ZIP_FILENAME_XRAY_PHONE = "X-Ray_phone.catrobat";
- private static final String ZIP_FILENAME_ALL_BRICKS = "All_Bricks.catrobat";
- private static final String ZIP_FILENAME_NOTE_AND_SPEAK_BRICK = "Note_And_Speak_Brick.catrobat";
- private static final String ZIP_FILENAME_GHOST_EFFECT_BRICKS = "Ghost_Effect_Bricks.catrobat";
- private static final String ZIP_FILENAME_LEGO_NXT = "old-lego-nxt.catrobat";
-
- private static final String PROJECT_NAME_FALLING_BALLS = "falling balls";
- private static final String PROJECT_NAME_COLOR_LEANER_BALLOONS = "color learner - balloons";
- private static final String PROJECT_NAME_PONG_STARTER = "pong starter";
- private static final String PROJECT_NAME_WHIP = "whip";
- private static final String PROJECT_NAME_AIR_FIGHT = "air fight 0.5";
- private static final String PROJECT_NAME_XRAY_PHONE = "x-ray phone";
- private static final String PROJECT_NAME_ALL_BRICKS = "all bricks";
- private static final String PROJECT_NAME_NOTE_AND_SPEAK_BRICK = "noteandspeakbrick";
- private static final String PROJECT_NAME_GHOST_EFFECT_BRICKS = "ghosteffectbricks";
- private static final String PROJECT_NAME_LEGO_NXT = "oldlegonxt";
-
- @Test
- public void testLoadingProjectsOfCatrobatLanguageVersion08() throws Exception {
- copyProjectFromAssets(ZIP_FILENAME_FALLING_BALLS, PROJECT_NAME_FALLING_BALLS);
- copyProjectFromAssets(ZIP_FILENAME_COLOR_LEANER_BALLOONS, PROJECT_NAME_COLOR_LEANER_BALLOONS);
-
- Project fallingBallsProject = XstreamSerializer.getInstance()
- .loadProject(PROJECT_NAME_FALLING_BALLS, InstrumentationRegistry.getTargetContext());
-
- assertNotNull(fallingBallsProject);
- assertEquals(PROJECT_NAME_FALLING_BALLS, fallingBallsProject.getName().toLowerCase(Locale.getDefault()));
-
- Project colorLeanerBalloonsProject = XstreamSerializer.getInstance()
- .loadProject(PROJECT_NAME_COLOR_LEANER_BALLOONS, InstrumentationRegistry.getTargetContext());
-
- assertNotNull(colorLeanerBalloonsProject);
- assertEquals(PROJECT_NAME_COLOR_LEANER_BALLOONS, colorLeanerBalloonsProject.getName().toLowerCase(Locale.getDefault()));
-
- StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_FALLING_BALLS));
- StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_COLOR_LEANER_BALLOONS));
- }
-
- @Test
- public void testLoadingProjectsOfCatrobatLanguageVersion09() throws Exception {
- copyProjectFromAssets(ZIP_FILENAME_PONG_STARTER, PROJECT_NAME_PONG_STARTER);
- copyProjectFromAssets(ZIP_FILENAME_WHIP, PROJECT_NAME_WHIP);
-
- Project pongStarterProject = XstreamSerializer.getInstance()
- .loadProject(PROJECT_NAME_PONG_STARTER, InstrumentationRegistry.getTargetContext());
-
- assertNotNull(pongStarterProject);
- assertEquals(PROJECT_NAME_PONG_STARTER, pongStarterProject.getName().toLowerCase(Locale.getDefault()));
-
- Project whipProject = XstreamSerializer.getInstance()
- .loadProject(PROJECT_NAME_WHIP, InstrumentationRegistry.getTargetContext());
-
- assertNotNull(whipProject);
- assertEquals(PROJECT_NAME_WHIP, whipProject.getName().toLowerCase(Locale.getDefault()));
-
- StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_PONG_STARTER));
- StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_WHIP));
- }
-
- @Test
- public void testLoadingProjectsOfCatrobatLanguageVersion091() throws Exception {
- copyProjectFromAssets(ZIP_FILENAME_AIR_FIGHT, PROJECT_NAME_AIR_FIGHT);
- copyProjectFromAssets(ZIP_FILENAME_XRAY_PHONE, PROJECT_NAME_XRAY_PHONE);
- copyProjectFromAssets(ZIP_FILENAME_ALL_BRICKS, PROJECT_NAME_ALL_BRICKS);
-
- Project airFightProject = XstreamSerializer.getInstance().loadProject(PROJECT_NAME_AIR_FIGHT,
- InstrumentationRegistry.getTargetContext());
-
- assertNotNull(airFightProject);
- assertEquals(PROJECT_NAME_AIR_FIGHT, airFightProject.getName().toLowerCase(Locale.getDefault()));
-
- Project xRayPhoneProject = XstreamSerializer.getInstance().loadProject(PROJECT_NAME_XRAY_PHONE,
- InstrumentationRegistry.getTargetContext());
-
- assertNotNull(xRayPhoneProject);
- assertEquals(PROJECT_NAME_XRAY_PHONE, xRayPhoneProject.getName().toLowerCase(Locale.getDefault()));
-
- Project allBricksProject = XstreamSerializer.getInstance().loadProject(PROJECT_NAME_ALL_BRICKS,
- InstrumentationRegistry.getTargetContext());
-
- assertNotNull(allBricksProject);
- assertEquals(PROJECT_NAME_ALL_BRICKS, allBricksProject.getName().toLowerCase(Locale.getDefault()));
-
- StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_AIR_FIGHT));
- StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_XRAY_PHONE));
- StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_ALL_BRICKS));
- }
-
- @Test
- public void testLoadingProjectsOfCatrobatLanguageVersion092() throws Exception {
- copyProjectFromAssets(ZIP_FILENAME_NOTE_AND_SPEAK_BRICK, PROJECT_NAME_NOTE_AND_SPEAK_BRICK);
-
- Project noteAndSpeakBrickProject = XstreamSerializer.getInstance()
- .loadProject(PROJECT_NAME_NOTE_AND_SPEAK_BRICK, InstrumentationRegistry.getTargetContext());
-
- assertNotNull(noteAndSpeakBrickProject);
- assertEquals(PROJECT_NAME_NOTE_AND_SPEAK_BRICK, noteAndSpeakBrickProject.getName().toLowerCase(Locale.getDefault()));
-
- StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_NOTE_AND_SPEAK_BRICK));
- }
-
- @Test
- public void testLoadingProjectsOfCatrobatLanguageVersion095() throws Exception {
- copyProjectFromAssets(ZIP_FILENAME_GHOST_EFFECT_BRICKS, PROJECT_NAME_GHOST_EFFECT_BRICKS);
-
- Project ghostBricksProject = XstreamSerializer.getInstance()
- .loadProject(PROJECT_NAME_GHOST_EFFECT_BRICKS, InstrumentationRegistry.getTargetContext());
-
- assertNotNull(ghostBricksProject);
- assertEquals(PROJECT_NAME_GHOST_EFFECT_BRICKS, ghostBricksProject.getName().toLowerCase(Locale.getDefault()));
-
- StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_GHOST_EFFECT_BRICKS));
- }
-
- @Test
- public void testLoadingLegoNxtProjectsOfCatrobatLanguageVersion092() throws Exception {
- copyProjectFromAssets(ZIP_FILENAME_LEGO_NXT, PROJECT_NAME_LEGO_NXT);
-
- Project legoProject = XstreamSerializer.getInstance()
- .loadProject(PROJECT_NAME_LEGO_NXT, InstrumentationRegistry.getTargetContext());
-
- assertNotNull(legoProject);
- assertEquals(PROJECT_NAME_LEGO_NXT, legoProject.getName().toLowerCase(Locale.getDefault()));
-
- StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_LEGO_NXT));
- }
-
- private void copyProjectFromAssets(String assetName, String projectName) throws IOException {
- InputStream inputStream = InstrumentationRegistry.getContext().getAssets().open(assetName);
- new ZipArchiver().unzip(inputStream, new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName));
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/DefaultChromeCastProgramLoadingTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/DefaultChromeCastProgramLoadingTest.java
index ac6a129a3b5..2c183e77656 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/DefaultChromeCastProgramLoadingTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/DefaultChromeCastProgramLoadingTest.java
@@ -23,7 +23,6 @@
package org.catrobat.catroid.test.io;
-import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
@@ -49,22 +48,16 @@
@RunWith(AndroidJUnit4.class)
public class DefaultChromeCastProgramLoadingTest {
- private final XstreamSerializer storageHandler;
private String projectName;
private Project currentProjectBuffer;
- private Context targetContext;
private Project project;
- public DefaultChromeCastProgramLoadingTest() {
- storageHandler = XstreamSerializer.getInstance();
- }
-
@Before
public void setUp() throws Exception {
- targetContext = InstrumentationRegistry.getTargetContext();
currentProjectBuffer = ProjectManager.getInstance().getCurrentProject();
- projectName = targetContext.getString(R.string.default_cast_project_name);
- project = new ChromeCastProjectCreator().createDefaultProject(projectName, targetContext, true);
+ projectName = InstrumentationRegistry.getTargetContext().getString(R.string.default_cast_project_name);
+ project = new ChromeCastProjectCreator()
+ .createDefaultProject(projectName, InstrumentationRegistry.getTargetContext(), true);
}
@After
@@ -75,7 +68,9 @@ public void tearDown() throws Exception {
@Test
public void testLoadingChromeCastProgram() throws IOException, LoadingProjectException {
- Project loadedProject = storageHandler.loadProject(projectName, targetContext);
+ Project loadedProject = XstreamSerializer.getInstance()
+ .loadProject(project.getDirectory(), InstrumentationRegistry.getTargetContext());
+
Scene preScene = project.getDefaultScene();
Scene postScene = loadedProject.getDefaultScene();
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/DefaultDroneProgramLoadingTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/DefaultDroneProgramLoadingTest.java
index 67610832541..56f1009f7ef 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/DefaultDroneProgramLoadingTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/DefaultDroneProgramLoadingTest.java
@@ -42,29 +42,24 @@
import org.junit.runner.RunWith;
import java.io.IOException;
-import java.util.ArrayList;
+import java.util.List;
import static junit.framework.Assert.assertEquals;
@RunWith(AndroidJUnit4.class)
public class DefaultDroneProgramLoadingTest {
- private final XstreamSerializer storageHandler;
+
private String projectName;
private Project currentProjectBuffer;
- private Context targetContext;
private Project project;
- private int expectedSizeOfLookList = 1;
-
- public DefaultDroneProgramLoadingTest() {
- storageHandler = XstreamSerializer.getInstance();
- }
@Before
public void setUp() throws Exception {
- targetContext = InstrumentationRegistry.getTargetContext();
+ Context targetContext = InstrumentationRegistry.getTargetContext();
currentProjectBuffer = ProjectManager.getInstance().getCurrentProject();
projectName = targetContext.getString(R.string.default_drone_project_name);
- project = new ArDroneProjectCreator().createDefaultProject(projectName, targetContext, false);
+ project = new ArDroneProjectCreator()
+ .createDefaultProject(projectName, InstrumentationRegistry.getTargetContext(), false);
}
@After
@@ -75,28 +70,31 @@ public void tearDown() throws Exception {
@Test
public void testDroneProgramLoadingSuccessfully() throws IOException, LoadingProjectException {
- Project loadedProject = storageHandler.loadProject(projectName, targetContext);
+ Project loadedProject = XstreamSerializer.getInstance()
+ .loadProject(project.getDirectory(), InstrumentationRegistry.getTargetContext());
+
Scene preScene = project.getDefaultScene();
Scene postScene = loadedProject.getDefaultScene();
- ArrayList preSpriteList = (ArrayList) project.getDefaultScene().getSpriteList();
- ArrayList postSpriteList = (ArrayList) loadedProject.getDefaultScene().getSpriteList();
+ List preSpriteList = project.getDefaultScene().getSpriteList();
+ List postSpriteList = loadedProject.getDefaultScene().getSpriteList();
assertEquals(project.getName(), loadedProject.getName());
assertEquals(preScene.getName(), postScene.getName());
assertEquals(preSpriteList, postSpriteList);
- assertEquals(expectedSizeOfLookList, postSpriteList.get(0).getLookList().size());
- assertEquals(expectedSizeOfLookList, postSpriteList.get(1).getLookList().size());
- assertEquals(expectedSizeOfLookList, postSpriteList.get(2).getLookList().size());
- assertEquals(expectedSizeOfLookList, postSpriteList.get(3).getLookList().size());
- assertEquals(expectedSizeOfLookList, postSpriteList.get(4).getLookList().size());
- assertEquals(expectedSizeOfLookList, postSpriteList.get(5).getLookList().size());
- assertEquals(expectedSizeOfLookList, postSpriteList.get(6).getLookList().size());
- assertEquals(expectedSizeOfLookList, postSpriteList.get(7).getLookList().size());
- assertEquals(expectedSizeOfLookList, postSpriteList.get(8).getLookList().size());
- assertEquals(expectedSizeOfLookList, postSpriteList.get(9).getLookList().size());
- assertEquals(expectedSizeOfLookList, postSpriteList.get(10).getLookList().size());
- assertEquals(expectedSizeOfLookList, postSpriteList.get(11).getLookList().size());
+
+ assertEquals(1, postSpriteList.get(0).getLookList().size());
+ assertEquals(1, postSpriteList.get(1).getLookList().size());
+ assertEquals(1, postSpriteList.get(2).getLookList().size());
+ assertEquals(1, postSpriteList.get(3).getLookList().size());
+ assertEquals(1, postSpriteList.get(4).getLookList().size());
+ assertEquals(1, postSpriteList.get(5).getLookList().size());
+ assertEquals(1, postSpriteList.get(6).getLookList().size());
+ assertEquals(1, postSpriteList.get(7).getLookList().size());
+ assertEquals(1, postSpriteList.get(8).getLookList().size());
+ assertEquals(1, postSpriteList.get(9).getLookList().size());
+ assertEquals(1, postSpriteList.get(10).getLookList().size());
+ assertEquals(1, postSpriteList.get(11).getLookList().size());
}
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/DefaultJumpingSumoProgramLoadingTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/DefaultJumpingSumoProgramLoadingTest.java
index d98c351d125..b27e24565b5 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/DefaultJumpingSumoProgramLoadingTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/DefaultJumpingSumoProgramLoadingTest.java
@@ -75,7 +75,7 @@ public void tearDown() throws Exception {
@Test
public void testJumpingSumoProgramLoadingSuccessfully() throws IOException, LoadingProjectException {
- Project loadedProject = storageHandler.loadProject(projectName, targetContext);
+ Project loadedProject = storageHandler.loadProject(project.getDirectory(), targetContext);
Scene preScene = project.getDefaultScene();
Scene postScene = loadedProject.getDefaultScene();
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/XstreamSerializerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/XstreamSerializerTest.java
index 264a9726511..0cd5764e4c6 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/XstreamSerializerTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/XstreamSerializerTest.java
@@ -51,14 +51,13 @@
import org.catrobat.catroid.content.bricks.SpeakBrick;
import org.catrobat.catroid.devices.mindstorms.nxt.sensors.NXTSensor;
import org.catrobat.catroid.drone.ardrone.DroneBrickFactory;
-import org.catrobat.catroid.exceptions.CompatibilityProjectException;
-import org.catrobat.catroid.exceptions.LoadingProjectException;
-import org.catrobat.catroid.exceptions.OutdatedVersionProjectException;
import org.catrobat.catroid.formulaeditor.Formula;
import org.catrobat.catroid.formulaeditor.FormulaElement;
import org.catrobat.catroid.formulaeditor.Sensors;
import org.catrobat.catroid.io.StorageOperations;
import org.catrobat.catroid.io.XstreamSerializer;
+import org.catrobat.catroid.io.asynctask.ProjectLoadTask;
+import org.catrobat.catroid.io.asynctask.ProjectSaveTask;
import org.catrobat.catroid.test.utils.TestUtils;
import org.catrobat.catroid.ui.settingsfragments.SettingsFragment;
import org.junit.After;
@@ -81,7 +80,6 @@
import static org.catrobat.catroid.common.Constants.CODE_XML_FILE_NAME;
import static org.catrobat.catroid.common.Constants.PERMISSIONS_FILE_NAME;
import static org.catrobat.catroid.common.Constants.TMP_CODE_XML_FILE_NAME;
-import static org.catrobat.catroid.utils.PathBuilder.buildProjectPath;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.number.OrderingComparison.greaterThan;
@@ -106,7 +104,9 @@ public XstreamSerializerTest() {
@Before
public void setUp() throws Exception {
TestUtils.deleteProjects(projectName);
- DefaultProjectHandler.createAndSaveDefaultProject(InstrumentationRegistry.getTargetContext());
+
+ DefaultProjectHandler
+ .createAndSaveDefaultProject(InstrumentationRegistry.getTargetContext());
currentProjectBuffer = ProjectManager.getInstance().getCurrentProject();
}
@@ -114,7 +114,6 @@ public void setUp() throws Exception {
@After
public void tearDown() throws Exception {
ProjectManager.getInstance().setCurrentProject(currentProjectBuffer);
-
TestUtils.deleteProjects(projectName);
}
@@ -152,9 +151,11 @@ public void testSerializeProject() throws Exception {
project.getDefaultScene().addSprite(thirdSprite);
project.getDefaultScene().addSprite(fourthSprite);
- storageHandler.saveProject(project);
+ ProjectSaveTask
+ .task(project);
- Project loadedProject = storageHandler.loadProject(projectName, InstrumentationRegistry.getContext());
+ Project loadedProject = XstreamSerializer.getInstance()
+ .loadProject(project.getDirectory(), InstrumentationRegistry.getContext());
Scene preScene = project.getDefaultScene();
Scene postScene = loadedProject.getDefaultScene();
@@ -220,8 +221,8 @@ public void testSanityCheck() throws IOException {
project.getDefaultScene().addSprite(thirdSprite);
project.getDefaultScene().addSprite(fourthSprite);
- File tmpCodeFile = new File(buildProjectPath(project.getName()), TMP_CODE_XML_FILE_NAME);
- File currentCodeFile = new File(buildProjectPath(project.getName()), CODE_XML_FILE_NAME);
+ File tmpCodeFile = new File(project.getDirectory(), TMP_CODE_XML_FILE_NAME);
+ File currentCodeFile = new File(project.getDirectory(), CODE_XML_FILE_NAME);
assertFalse(tmpCodeFile.exists());
assertFalse(currentCodeFile.exists());
@@ -270,7 +271,7 @@ public void testWritePermissionFile() throws IOException {
ProjectManager.getInstance().setCurrentProject(project);
XstreamSerializer.getInstance().saveProject(project);
- File permissionsFile = new File(buildProjectPath(project.getName()), PERMISSIONS_FILE_NAME);
+ File permissionsFile = new File(project.getDirectory(), PERMISSIONS_FILE_NAME);
assertTrue(permissionsFile.exists());
//only for assertions. Add future permission; Vibration and LED not activated
@@ -288,8 +289,7 @@ public void testWritePermissionFile() throws IOException {
}
@Test
- public void testSerializeSettings() throws CompatibilityProjectException, OutdatedVersionProjectException,
- LoadingProjectException {
+ public void testSerializeSettings() {
NXTSensor.Sensor[] sensorMapping = new NXTSensor.Sensor[] {
NXTSensor.Sensor.TOUCH, NXTSensor.Sensor.SOUND,
NXTSensor.Sensor.LIGHT_INACTIVE, NXTSensor.Sensor.ULTRASONIC
@@ -298,7 +298,6 @@ public void testSerializeSettings() throws CompatibilityProjectException, Outdat
Project project = generateMultiplePermissionsProject();
ProjectManager.getInstance().setCurrentProject(project);
- String projectName = project.getName();
SettingsFragment.setLegoMindstormsNXTSensorMapping(InstrumentationRegistry.getTargetContext(), sensorMapping);
ProjectManager.getInstance().saveProject(InstrumentationRegistry.getTargetContext());
@@ -319,10 +318,11 @@ public void testSerializeSettings() throws CompatibilityProjectException, Outdat
NXTSensor.Sensor[] changedSensorMapping = sensorMapping.clone();
changedSensorMapping[0] = NXTSensor.Sensor.LIGHT_ACTIVE;
- SettingsFragment.setLegoMindstormsNXTSensorMapping(InstrumentationRegistry.getTargetContext(), changedSensorMapping);
+ SettingsFragment
+ .setLegoMindstormsNXTSensorMapping(InstrumentationRegistry.getTargetContext(), changedSensorMapping);
- ProjectManager.getInstance().setCurrentProject(null);
- ProjectManager.getInstance().loadProject(projectName, InstrumentationRegistry.getTargetContext());
+ assertTrue(ProjectLoadTask
+ .task(project.getDirectory(), InstrumentationRegistry.getTargetContext()));
actualSensorMapping = SettingsFragment.getLegoNXTSensorMapping(InstrumentationRegistry.getTargetContext());
@@ -386,11 +386,15 @@ private Project generateMultiplePermissionsProject() {
@Test
public void testExtractDefaultSceneNameFromXml() {
- final String firstSceneName = "First Scene";
+ String firstSceneName = "First Scene";
+
Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
+
project.getSceneList().get(0).setName(firstSceneName);
- storageHandler.saveProject(project);
- assertEquals(firstSceneName, XstreamSerializer.extractDefaultSceneNameFromXml(projectName));
+ ProjectSaveTask
+ .task(project);
+
+ assertEquals(firstSceneName, XstreamSerializer.extractDefaultSceneNameFromXml(project.getDirectory()));
}
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/asynctask/ProjectExportTaskTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/asynctask/ProjectExportTaskTest.java
index 5f8ee4144eb..40ddd547a2a 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/asynctask/ProjectExportTaskTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/asynctask/ProjectExportTaskTest.java
@@ -29,12 +29,10 @@
import android.support.test.InstrumentationRegistry;
import android.support.test.rule.GrantPermissionRule;
import android.support.test.runner.AndroidJUnit4;
-import android.util.Pair;
import android.util.SparseArray;
import org.catrobat.catroid.ProjectManager;
import org.catrobat.catroid.content.Project;
-import org.catrobat.catroid.content.Scene;
import org.catrobat.catroid.io.StorageOperations;
import org.catrobat.catroid.io.asynctask.ProjectExportTask;
import org.catrobat.catroid.test.utils.Reflection;
@@ -55,7 +53,7 @@
@RunWith(AndroidJUnit4.class)
public class ProjectExportTaskTest {
- private String projectName;
+ private Project project;
@Rule
public GrantPermissionRule runtimePermissionRule = GrantPermissionRule.grant(
@@ -64,10 +62,9 @@ public class ProjectExportTaskTest {
@Before
public void setUp() {
- Project project = new Project(InstrumentationRegistry.getTargetContext(),
+ project = new Project(InstrumentationRegistry.getTargetContext(),
ProjectExportTaskTest.class.getSimpleName());
- project.addScene(new Scene());
- projectName = project.getName();
+
ProjectManager.getInstance().setCurrentProject(project);
ProjectManager.getInstance().saveProject(InstrumentationRegistry.getTargetContext());
}
@@ -75,16 +72,21 @@ public void setUp() {
@Test
public void exportProjectTest() {
StatusBarNotificationManager notificationManager = StatusBarNotificationManager.getInstance();
- int notificationID = notificationManager
- .createSaveProjectToExternalMemoryNotification(InstrumentationRegistry.getTargetContext(), projectName);
- ProjectExportTask.task(new Pair<>(projectName, notificationID));
+ int notificationId = notificationManager
+ .createSaveProjectToExternalMemoryNotification(InstrumentationRegistry.getTargetContext(), project.getName());
+ ProjectExportTask
+ .task(project.getDirectory(), notificationId);
- File externalProjectZip = new File(EXTERNAL_STORAGE_ROOT_EXPORT_DIRECTORY, projectName + CATROBAT_EXTENSION);
+ File externalProjectZip = new File(EXTERNAL_STORAGE_ROOT_EXPORT_DIRECTORY,
+ project.getDirectory().getName() + CATROBAT_EXTENSION);
Assert.assertTrue(externalProjectZip.exists());
}
@After
public void tearDown() throws Exception {
+ if (project.getDirectory().isDirectory()) {
+ StorageOperations.deleteDir(project.getDirectory());
+ }
if (EXTERNAL_STORAGE_ROOT_EXPORT_DIRECTORY.exists()) {
StorageOperations.deleteDir(EXTERNAL_STORAGE_ROOT_EXPORT_DIRECTORY);
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/asynctask/ProjectUnzipAndImportTaskTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/asynctask/ProjectUnzipAndImportTaskTest.java
index 4a3fe2997a5..238a2d9eecd 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/asynctask/ProjectUnzipAndImportTaskTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/asynctask/ProjectUnzipAndImportTaskTest.java
@@ -26,8 +26,8 @@
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
+import org.catrobat.catroid.content.backwardcompatibility.ProjectMetaDataParser;
import org.catrobat.catroid.io.StorageOperations;
-import org.catrobat.catroid.io.XstreamSerializer;
import org.catrobat.catroid.io.asynctask.ProjectUnzipAndImportTask;
import org.catrobat.catroid.test.utils.TestUtils;
import org.catrobat.catroid.utils.FileMetaDataExtractor;
@@ -88,7 +88,7 @@ public void testUnzipAndImportSingleProject() throws IOException {
assertThat(FileMetaDataExtractor.getProjectNames(DEFAULT_ROOT_DIRECTORY), hasItem(AIR_FIGHT_0_5));
File xmlFile = new File(new File(DEFAULT_ROOT_DIRECTORY, AIR_FIGHT_0_5), CODE_XML_FILE_NAME);
- assertEquals(AIR_FIGHT_0_5, XstreamSerializer.getInstance().getProjectName(xmlFile));
+ assertEquals(AIR_FIGHT_0_5, new ProjectMetaDataParser(xmlFile).getProjectMetaData().getName());
}
@Test
@@ -98,11 +98,11 @@ public void testUnzipAndImportMultipleProjects() throws IOException {
assertThat(FileMetaDataExtractor.getProjectNames(DEFAULT_ROOT_DIRECTORY), hasItem(AIR_FIGHT_0_5));
File xmlFile = new File(new File(DEFAULT_ROOT_DIRECTORY, AIR_FIGHT_0_5), CODE_XML_FILE_NAME);
- assertEquals(AIR_FIGHT_0_5, XstreamSerializer.getInstance().getProjectName(xmlFile));
+ assertEquals(AIR_FIGHT_0_5, new ProjectMetaDataParser(xmlFile).getProjectMetaData().getName());
assertThat(FileMetaDataExtractor.getProjectNames(DEFAULT_ROOT_DIRECTORY), hasItem(FALLING_BALLS));
xmlFile = new File(new File(DEFAULT_ROOT_DIRECTORY, FALLING_BALLS), CODE_XML_FILE_NAME);
- assertEquals(FALLING_BALLS, XstreamSerializer.getInstance().getProjectName(xmlFile));
+ assertEquals(FALLING_BALLS, new ProjectMetaDataParser(xmlFile).getProjectMetaData().getName());
}
@Test
@@ -112,13 +112,13 @@ public void testUnzipAndImportSameProjectTwice() throws IOException {
assertThat(FileMetaDataExtractor.getProjectNames(DEFAULT_ROOT_DIRECTORY), hasItem(AIR_FIGHT_0_5));
File xmlFile = new File(new File(DEFAULT_ROOT_DIRECTORY, AIR_FIGHT_0_5), CODE_XML_FILE_NAME);
- assertEquals(AIR_FIGHT_0_5, XstreamSerializer.getInstance().getProjectName(xmlFile));
+ assertEquals(AIR_FIGHT_0_5, new ProjectMetaDataParser(xmlFile).getProjectMetaData().getName());
assertTrue(ProjectUnzipAndImportTask
.task(projectAirFightFile));
assertThat(FileMetaDataExtractor.getProjectNames(DEFAULT_ROOT_DIRECTORY), hasItem(AIR_FIGHT_0_5_1));
xmlFile = new File(new File(DEFAULT_ROOT_DIRECTORY, AIR_FIGHT_0_5_1), CODE_XML_FILE_NAME);
- assertEquals(AIR_FIGHT_0_5_1, XstreamSerializer.getInstance().getProjectName(xmlFile));
+ assertEquals(AIR_FIGHT_0_5_1, new ProjectMetaDataParser(xmlFile).getProjectMetaData().getName());
}
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/ziparchiver/UnzipProjectFromAssetsTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/ziparchiver/UnzipProjectFromAssetsTest.java
index 445e2619156..26555910351 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/io/ziparchiver/UnzipProjectFromAssetsTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/io/ziparchiver/UnzipProjectFromAssetsTest.java
@@ -28,7 +28,6 @@
import org.catrobat.catroid.io.StorageOperations;
import org.catrobat.catroid.io.ZipArchiver;
-import org.catrobat.catroid.utils.PathBuilder;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -42,6 +41,8 @@
import static junit.framework.Assert.assertTrue;
+import static org.catrobat.catroid.common.FlavoredConstants.DEFAULT_ROOT_DIRECTORY;
+
@RunWith(AndroidJUnit4.class)
public class UnzipProjectFromAssetsTest {
@@ -49,12 +50,12 @@ public class UnzipProjectFromAssetsTest {
@Before
public void setUp() {
- projectDir = new File(PathBuilder.buildProjectPath("testZipProject"));
+ projectDir = new File(DEFAULT_ROOT_DIRECTORY, UnzipProjectFromAssetsTest.class.getSimpleName());
}
@After
public void tearDown() throws IOException {
- if (projectDir.exists()) {
+ if (projectDir.isDirectory()) {
StorageOperations.deleteDir(projectDir);
}
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsBoundaryBoxTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsBoundaryBoxTest.java
index ef084e60714..cfb542d63a6 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsBoundaryBoxTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsBoundaryBoxTest.java
@@ -75,11 +75,11 @@ public void testProperties() {
Array fixtures = body.getFixtureList();
assertEquals(1, fixtures.size);
- for (Fixture fixture : fixtures) {
- Filter filter = fixture.getFilterData();
- assertEquals(PhysicsWorld.MASK_BOUNDARYBOX, filter.maskBits);
- assertEquals(PhysicsWorld.CATEGORY_BOUNDARYBOX, filter.categoryBits);
- }
+ Fixture fixture = fixtures.get(0);
+
+ Filter filter = fixture.getFilterData();
+ assertEquals(PhysicsWorld.MASK_BOUNDARYBOX, filter.maskBits);
+ assertEquals(PhysicsWorld.CATEGORY_BOUNDARYBOX, filter.categoryBits);
}
}
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsLookTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsLookTest.java
index fcc79f49f24..2a0ab24da1e 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsLookTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsLookTest.java
@@ -24,7 +24,6 @@
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
-import android.util.Log;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.math.Vector2;
@@ -46,7 +45,6 @@
import org.catrobat.catroid.physics.PhysicsObject;
import org.catrobat.catroid.physics.PhysicsWorld;
import org.catrobat.catroid.physics.shapebuilder.PhysicsShapeBuilder;
-import org.catrobat.catroid.physics.shapebuilder.PhysicsShapeScaleUtils;
import org.catrobat.catroid.test.R;
import org.catrobat.catroid.test.utils.Reflection;
import org.catrobat.catroid.test.utils.TestUtils;
@@ -57,8 +55,6 @@
import org.junit.runner.RunWith;
import java.io.File;
-import java.util.LinkedList;
-import java.util.Queue;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
@@ -66,19 +62,18 @@
import static org.catrobat.catroid.common.Constants.IMAGE_DIRECTORY_NAME;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.number.OrderingComparison.greaterThan;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertThat;
@RunWith(AndroidJUnit4.class)
public class PhysicsLookTest {
- private static final String TAG = PhysicsLookTest.class.getSimpleName();
- PhysicsWorld physicsWorld;
+ private PhysicsWorld physicsWorld;
private final String projectName = "testProject";
- private File projectDir;
- private Project project;
private File testImage;
private String testImageFilename;
private Sprite sprite;
+
static {
GdxNativesLoader.load();
}
@@ -86,12 +81,12 @@ public class PhysicsLookTest {
@Before
public void setUp() throws Exception {
physicsWorld = new PhysicsWorld(1920, 1600);
- projectDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName);
+ File projectDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName);
if (projectDir.exists()) {
StorageOperations.deleteDir(projectDir);
}
testImageFilename = PhysicsTestUtils.getInternalImageFilenameFromFilename("testImage.png");
- project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
+ Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
XstreamSerializer.getInstance().saveProject(project);
ProjectManager.getInstance().setCurrentProject(project);
@@ -172,94 +167,37 @@ public void testSetScale() throws Exception {
PhysicsObject physicsObject = physicsWorld.getPhysicsObject(sprite);
PhysicsLook physicsLook = new PhysicsLook(sprite, physicsWorld);
-
- Shape[] shapes = (Shape[]) Reflection.getPrivateField(physicsObject, "shapes");
- assertEquals(null, shapes);
-
physicsLook.setLookData(lookData);
- Queue vertexXQueue = new LinkedList();
- Queue vertexYQueue = new LinkedList();
- shapes = (Shape[]) Reflection.getPrivateField(physicsObject, "shapes");
- assertNotNull(shapes);
- assertThat(shapes.length, is(greaterThan(0)));
- Log.d(TAG, "shapes.length: " + shapes.length);
- for (Shape shape : shapes) {
- switch (shape.getType()) {
- case Chain:
- Log.d(TAG, "type = Chain: ");
- break;
- case Circle:
- Log.d(TAG, "type = Circle: ");
- break;
- case Edge:
- Log.d(TAG, "type = Edge: ");
- break;
- case Polygon:
- int vertexCount = ((PolygonShape) shape).getVertexCount();
- Log.d(TAG, "type = Polygon: " + vertexCount);
- for (int idx = 0; idx < vertexCount; idx++) {
- Vector2 vertex = new Vector2();
- ((PolygonShape) shape).getVertex(idx, vertex);
- vertexXQueue.add(Float.valueOf(vertex.x));
- vertexYQueue.add(Float.valueOf(vertex.y));
- Log.d(TAG, "x=" + vertex.x + ";y=" + vertex.y);
- }
- break;
- }
- }
-
- float[] accuracyLevels = (float[]) Reflection.getPrivateField(PhysicsShapeBuilder.class, "ACCURACY_LEVELS");
float testScaleFactor = 1.1f;
- if (accuracyLevels.length > 1) {
- for (int i = 0; i < accuracyLevels.length - 1; i++) {
- if (Math.abs(accuracyLevels[i] - 1.0f) < 0.05) {
- testScaleFactor = (accuracyLevels[i] + accuracyLevels[i + 1]);
- testScaleFactor /= 2.0f;
- testScaleFactor -= 0.025f;
- }
- }
- }
+
+ Vector2[] expectedVertices = new Vector2[] {
+ new Vector2(10.84f, -7.31f),
+ new Vector2(10.84f, -0.6f),
+ new Vector2(9.63f, 10.62f),
+ new Vector2(-10.84f, 10.62f),
+ new Vector2(-10.84f, 6.44f),
+ new Vector2(-3.35f, -7.31f),
+ new Vector2(-0.06f, -10.61f),
+ new Vector2(7.54f, -10.61f),
+ };
physicsLook.setScale(testScaleFactor, testScaleFactor);
- shapes = (Shape[]) Reflection.getPrivateField(physicsObject, "shapes");
- assertNotNull(shapes);
- assertThat(shapes.length, is(greaterThan(0)));
- for (Shape shape : shapes) {
- switch (shape.getType()) {
- case Chain:
- Log.d(TAG, "type = Chain: ");
- break;
- case Circle:
- Log.d(TAG, "type = Circle: ");
- break;
- case Edge:
- Log.d(TAG, "type = Edge: ");
- break;
- case Polygon:
- int vertexCount = ((PolygonShape) shape).getVertexCount();
- Log.d(TAG, "type = Polygon: " + vertexCount);
- for (int idx = 0; idx < vertexCount; idx++) {
- Vector2 vertex = new Vector2();
- ((PolygonShape) shape).getVertex(idx, vertex);
-
- Object[] objectsX = {vertexXQueue.poll(), testScaleFactor};
- Reflection.ParameterList parameterListX = new Reflection.ParameterList(objectsX);
- float scaledX = (float) Reflection.invokeMethod(PhysicsShapeScaleUtils.class, "scaleCoordinate",
- parameterListX);
-
- Object[] objectsY = {vertexYQueue.poll(), testScaleFactor};
- Reflection.ParameterList parameterListY = new Reflection.ParameterList(objectsY);
- float scaledY = (float) Reflection.invokeMethod(PhysicsShapeScaleUtils.class, "scaleCoordinate",
- parameterListY);
-
- assertEquals(scaledX, vertex.x);
- assertEquals(scaledY, vertex.y);
- Log.d(TAG, "x=" + vertex.x + ";y=" + vertex.y);
- }
- break;
- }
+ Shape[] scaledShapes = (Shape[]) Reflection.getPrivateField(physicsObject, "shapes");
+ assertNotNull(scaledShapes);
+ assertEquals(1, scaledShapes.length);
+
+ Shape scaledShape = scaledShapes[0];
+ assertEquals(Shape.Type.Polygon, scaledShape.getType());
+
+ int scaledVertexCount = ((PolygonShape) scaledShape).getVertexCount();
+ assertEquals(8, scaledVertexCount);
+ Vector2[] scaledVertices = new Vector2[8];
+ for (int idx = 0; idx < scaledVertexCount; idx++) {
+ scaledVertices[idx] = new Vector2();
+ ((PolygonShape) scaledShape).getVertex(idx, scaledVertices[idx]);
}
+ assertArrayEquals(expectedVertices, scaledVertices);
}
@Test
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsObjectCollisionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsObjectCollisionTest.java
index 62367f9c5e8..d220ef6e0b8 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsObjectCollisionTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsObjectCollisionTest.java
@@ -122,15 +122,4 @@ public void testCollisionNoneNone() {
assertTrue(rule.simulateFullCollision());
assertFalse(contactFixturePairs.contains(expectedcontactFixtures));
}
-
- public void testCollisionDynamicDynamic() {
- assertTrue(rule.simulateFullCollision());
- assertTrue(contactFixturePairs.contains(expectedcontactFixtures));
- }
-
- public void testCollisionDynamicFixed() {
- rule.physicsObject2.setType(PhysicsObject.Type.FIXED);
- assertTrue(rule.simulateFullCollision());
- assertTrue(contactFixturePairs.contains(expectedcontactFixtures));
- }
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsObjectTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsObjectTest.java
index 579d0943bc5..74fe8ecbfce 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsObjectTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsObjectTest.java
@@ -50,8 +50,6 @@
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
-import java.util.Locale;
-
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertNotSame;
@@ -244,101 +242,6 @@ public void testSetTypeToDynamicUpdatesMass() throws Exception {
assertEquals(mass, body.getMass());
}
- @Test
- public void testAngle() throws Exception {
- for (PhysicsObject.Type type : PhysicsObject.Type.values()) {
- PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
- assertEquals(0.0f, PhysicsTestUtils.getBody(physicsObject).getAngle());
-
- float[] angles = {45.0f, 1.0f, 131.4f, -10.0f, -180.0f};
- for (float angle : angles) {
- physicsObject.setDirection(angle);
- assertEquals(angle, physicsObject.getDirection(), TestUtils.DELTA);
- }
- }
- }
-
- @Test
- public void testPosition() throws Exception {
- for (PhysicsObject.Type type : PhysicsObject.Type.values()) {
- PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
- assertEquals(new Vector2(), PhysicsTestUtils.getBody(physicsObject).getPosition());
-
- Vector2[] positions = {new Vector2(12.34f, 56.78f), new Vector2(-87.65f, -43.21f)};
- for (Vector2 position : positions) {
- physicsObject.setPosition(position.x, position.y);
-
- Vector2 physicsObjectCatroidPosition = PhysicsWorldConverter
- .convertBox2dToNormalVector(PhysicsTestUtils.getBody(physicsObject).getPosition());
- assertEquals(position, physicsObjectCatroidPosition);
- assertEquals(position, physicsObject.getPosition());
- }
-
- for (Vector2 position : positions) {
- physicsObject.setPosition(position);
-
- Vector2 physicsObjectCatroidPosition = PhysicsWorldConverter
- .convertBox2dToNormalVector(PhysicsTestUtils.getBody(physicsObject).getPosition());
- assertEquals(position, physicsObjectCatroidPosition);
- assertEquals(position, physicsObject.getPosition());
- }
- }
- }
-
- @Test
- public void testAngleAndPosition() throws Exception {
- for (PhysicsObject.Type type : PhysicsObject.Type.values()) {
- PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
- assertEquals(0.0f, PhysicsTestUtils.getBody(physicsObject).getAngle());
- assertEquals(new Vector2(), PhysicsTestUtils.getBody(physicsObject).getPosition());
-
- float angle = 15.6f;
- float expectedAngle = 15.6f;
- Vector2 position = new Vector2(12.34f, 56.78f);
- physicsObject.setDirection(angle);
- physicsObject.setPosition(position.x, position.y);
-
- float physicsObjectCatroidAngle = PhysicsWorldConverter.convertBox2dToNormalAngle(PhysicsTestUtils.getBody(
- physicsObject).getAngle());
- Vector2 physicsObjectCatroidPosition = PhysicsWorldConverter.convertBox2dToNormalVector(PhysicsTestUtils
- .getBody(physicsObject).getPosition());
-
- assertEquals(expectedAngle, physicsObjectCatroidAngle, TestUtils.DELTA);
- assertEquals(position, physicsObjectCatroidPosition);
- }
- }
-
- @Test
- public void testSetDensity() throws Exception {
- for (PhysicsObject.Type type : PhysicsObject.Type.values()) {
- PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
- physicsObject.setShape(new Shape[] {new PolygonShape(), new PolygonShape()});
-
- float[] densityValues = {0.123f, -0.765f, 24.32f};
- assertThat(PhysicsTestUtils.getBody(physicsObject).getFixtureList().size, is(not(equalTo(0))));
-
- for (float density : densityValues) {
- Object[] values = {density};
- String methodName = "setDensity";
- ParameterList paramList = new ParameterList(values);
- Reflection.invokeMethod(physicsObject, methodName, paramList);
- if (density > 0) {
- assertEquals(density, PhysicsTestUtils.getFixtureDef(physicsObject).density);
- } else {
- assertEquals(0.0f, PhysicsTestUtils.getFixtureDef(physicsObject).density);
- }
- for (Fixture fixture : PhysicsTestUtils.getBody(physicsObject).getFixtureList()) {
-
- if (density > 0) {
- assertEquals(density, fixture.getDensity());
- } else {
- assertEquals(0.0f, fixture.getDensity());
- }
- }
- }
- }
- }
-
@Test
public void testSetDensityUpdatesMassData() throws Exception {
PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, PhysicsObject.Type.DYNAMIC,
@@ -373,99 +276,6 @@ public void testSetDensityAtMassChange() throws Exception {
}
}
- @Test
- public void testSetFriction() throws Exception {
- for (PhysicsObject.Type type : PhysicsObject.Type.values()) {
- PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
- physicsObject.setShape(new Shape[] {new PolygonShape(), new PolygonShape()});
- float[] frictionValues = {0.123f, -0.765f, 0.32f};
-
- assertThat(PhysicsTestUtils.getBody(physicsObject).getFixtureList().size, is(not(equalTo(0))));
-
- for (float friction : frictionValues) {
- physicsObject.setFriction(friction);
- if (friction > 0) {
- assertEquals(friction, PhysicsTestUtils.getFixtureDef(physicsObject).friction);
- } else {
- assertEquals(0.0f, PhysicsTestUtils.getFixtureDef(physicsObject).friction);
- }
- for (Fixture fixture : PhysicsTestUtils.getBody(physicsObject).getFixtureList()) {
-
- if (friction > 0) {
- assertEquals(friction, fixture.getFriction());
- } else {
- assertEquals(0.0f, fixture.getFriction());
- }
- }
- }
- }
- }
-
- @Test
- public void testSetBounceFactor() throws Exception {
- for (PhysicsObject.Type type : PhysicsObject.Type.values()) {
- PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
- physicsObject.setShape(new Shape[] {new PolygonShape(), new PolygonShape()});
- float[] bounceFactors = {0.123f, -0.765f, 0.32f};
-
- assertThat(PhysicsTestUtils.getBody(physicsObject).getFixtureList().size, is(not(equalTo(0))));
-
- for (float value : bounceFactors) {
- physicsObject.setBounceFactor(value);
- if (value > 0) {
- assertEquals(value, PhysicsTestUtils.getFixtureDef(physicsObject).restitution);
- } else {
- assertEquals(0.0f, PhysicsTestUtils.getFixtureDef(physicsObject).restitution);
- }
- for (Fixture fixture : PhysicsTestUtils.getBody(physicsObject).getFixtureList()) {
-
- if (value > 0) {
- assertEquals(value, fixture.getRestitution());
- } else {
- assertEquals(0.0f, fixture.getRestitution());
- }
- }
- }
- }
- }
-
- @Test
- public void testMass() throws Exception {
- for (PhysicsObject.Type type : PhysicsObject.Type.values()) {
- PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type, 5.0f, 5.0f);
- Body body = PhysicsTestUtils.getBody(physicsObject);
-
- checkBodyMassDependingOnType(type, body, PhysicsObject.DEFAULT_MASS);
- assertEquals(PhysicsObject.DEFAULT_MASS, PhysicsTestUtils.getMass(physicsObject));
-
- float[] masses = {PhysicsObject.MIN_MASS, 0.01f, 1.0f, 12345.0f};
- for (float mass : masses) {
- physicsObject.setMass(mass);
- checkBodyMassDependingOnType(type, body, mass);
- assertEquals(mass, PhysicsTestUtils.getMass(physicsObject));
- }
-
- physicsObject.setMass(PhysicsObject.MIN_MASS / 10.0f);
- checkBodyMassDependingOnType(type, body, PhysicsObject.MIN_MASS);
- assertEquals(PhysicsObject.MIN_MASS / 10.0f, PhysicsTestUtils.getMass(physicsObject));
-
- physicsObject.setMass(0.0f);
- checkBodyMassDependingOnType(type, body, PhysicsObject.MIN_MASS);
- assertEquals(0.0f, PhysicsTestUtils.getMass(physicsObject));
-
- physicsObject.setMass(-1.0f);
- checkBodyMassDependingOnType(type, body, PhysicsObject.MIN_MASS);
- assertEquals(PhysicsObject.MIN_MASS, PhysicsTestUtils.getMass(physicsObject));
- }
- }
-
- private void checkBodyMassDependingOnType(PhysicsObject.Type type, Body body, float expectedBodyMass) {
- if (type != PhysicsObject.Type.DYNAMIC) {
- expectedBodyMass = 0.0f;
- }
- assertEquals("Wrong mass for " + type.toString().toLowerCase(Locale.getDefault()), expectedBodyMass, body.getMass(), TestUtils.DELTA);
- }
-
@Test
public void testMassWithNoShapeArea() throws Exception {
PhysicsObject[] physicsObjects = {
@@ -525,9 +335,6 @@ public void testIfOnEndgeBounce() throws Exception {
checkCollisionMask(physicsObject, PhysicsWorld.CATEGORY_PHYSICSOBJECT, PhysicsWorld.MASK_PHYSICSOBJECT);
}
- /*
- * Helper
- */
private void checkCollisionMask(PhysicsObject physicsObject, short categoryBits, short maskBits) throws Exception {
FixtureDef fixtureDef = PhysicsTestUtils.getFixtureDef(physicsObject);
assertEquals(categoryBits, fixtureDef.filter.categoryBits);
@@ -590,4 +397,58 @@ public void testCloneValues() {
assertEquals(origin.getPosition(), clone.getPosition());
assertEquals(origin.getDirection(), clone.getDirection());
}
+
+ @Test
+ public void testDynamicTypeMass() throws Exception {
+ PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, PhysicsObject.Type.DYNAMIC, 5.0f,
+ 5.0f);
+ Body body = PhysicsTestUtils.getBody(physicsObject);
+
+ assertEquals(PhysicsObject.DEFAULT_MASS, body.getMass(), TestUtils.DELTA);
+ assertEquals(PhysicsObject.DEFAULT_MASS, PhysicsTestUtils.getMass(physicsObject));
+
+ physicsObject.setMass(1.0f);
+ assertEquals(1.0f, body.getMass(), TestUtils.DELTA);
+ assertEquals(1.0f, PhysicsTestUtils.getMass(physicsObject));
+
+ physicsObject.setMass(PhysicsObject.MIN_MASS / 10.0f);
+ assertEquals(PhysicsObject.MIN_MASS, body.getMass(), TestUtils.DELTA);
+ assertEquals(PhysicsObject.MIN_MASS / 10.0f, PhysicsTestUtils.getMass(physicsObject));
+
+ physicsObject.setMass(0.0f);
+ assertEquals(PhysicsObject.MIN_MASS, body.getMass(), TestUtils.DELTA);
+ assertEquals(0.0f, PhysicsTestUtils.getMass(physicsObject));
+
+ physicsObject.setMass(-1.0f);
+ assertEquals(PhysicsObject.MIN_MASS, body.getMass(), TestUtils.DELTA);
+ assertEquals(PhysicsObject.MIN_MASS, PhysicsTestUtils.getMass(physicsObject));
+ }
+
+ @Test
+ public void testFixedTypeMass() throws Exception {
+ PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, PhysicsObject.Type.FIXED, 5.0f,
+ 5.0f);
+ Body body = PhysicsTestUtils.getBody(physicsObject);
+
+ assertEquals(0.0f, body.getMass(), TestUtils.DELTA);
+ assertEquals(PhysicsObject.DEFAULT_MASS, PhysicsTestUtils.getMass(physicsObject));
+
+ physicsObject.setMass(1.0f);
+ assertEquals(0.0f, body.getMass(), TestUtils.DELTA);
+ assertEquals(1.0f, PhysicsTestUtils.getMass(physicsObject));
+ }
+
+ @Test
+ public void testNoneTypeMass() throws Exception {
+ PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, PhysicsObject.Type.NONE, 5.0f,
+ 5.0f);
+ Body body = PhysicsTestUtils.getBody(physicsObject);
+
+ assertEquals(0.0f, body.getMass(), TestUtils.DELTA);
+ assertEquals(PhysicsObject.DEFAULT_MASS, PhysicsTestUtils.getMass(physicsObject));
+
+ physicsObject.setMass(1.0f);
+ assertEquals(0.0f, body.getMass(), TestUtils.DELTA);
+ assertEquals(1.0f, PhysicsTestUtils.getMass(physicsObject));
+ }
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsObjectTypesTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsObjectTypesTest.java
new file mode 100644
index 00000000000..5c5071196be
--- /dev/null
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsObjectTypesTest.java
@@ -0,0 +1,236 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2018 The Catrobat Team
+ * ()
+ *
+ * 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 .
+ */
+package org.catrobat.catroid.test.physics;
+
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.physics.box2d.Fixture;
+import com.badlogic.gdx.physics.box2d.PolygonShape;
+import com.badlogic.gdx.physics.box2d.Shape;
+import com.badlogic.gdx.utils.GdxNativesLoader;
+
+import org.catrobat.catroid.physics.PhysicsObject;
+import org.catrobat.catroid.physics.PhysicsWorld;
+import org.catrobat.catroid.physics.PhysicsWorldConverter;
+import org.catrobat.catroid.test.utils.TestUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+
+import static junit.framework.Assert.assertEquals;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.assertThat;
+
+@RunWith(Parameterized.class)
+public class PhysicsObjectTypesTest {
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable data() {
+ return Arrays.asList(new Object[][] {
+ {PhysicsObject.Type.DYNAMIC.toString(), PhysicsObject.Type.DYNAMIC},
+ {PhysicsObject.Type.FIXED.toString(), PhysicsObject.Type.FIXED},
+ {PhysicsObject.Type.NONE.toString(), PhysicsObject.Type.NONE}
+ });
+ }
+
+ @Parameterized.Parameter
+ public String name;
+
+ @Parameterized.Parameter(1)
+ public PhysicsObject.Type type;
+
+ @Rule
+ public final ExpectedException exception = ExpectedException.none();
+
+ static {
+ GdxNativesLoader.load();
+ }
+
+ private PhysicsWorld physicsWorld;
+
+ @Before
+ public void setUp() throws Exception {
+ physicsWorld = new PhysicsWorld(1920, 1600);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ physicsWorld = null;
+ }
+
+ @Test
+ public void testAngle() throws Exception {
+ PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
+ assertEquals(0.0f, PhysicsTestUtils.getBody(physicsObject).getAngle());
+
+ physicsObject.setDirection(45.0f);
+ assertEquals(45.0f, physicsObject.getDirection(), TestUtils.DELTA);
+
+ physicsObject.setDirection(-10.0f);
+ assertEquals(-10.0f, physicsObject.getDirection(), TestUtils.DELTA);
+
+ physicsObject.setDirection(-180.0f);
+ assertEquals(-180.0f, physicsObject.getDirection(), TestUtils.DELTA);
+ }
+
+ @Test
+ public void testPosition() throws Exception {
+ PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
+ assertEquals(new Vector2(), PhysicsTestUtils.getBody(physicsObject).getPosition());
+
+ Vector2 testVector1 = new Vector2(12.34f, 56.78f);
+ physicsObject.setPosition(testVector1.x, testVector1.y);
+ assertPositionCorrectlyConverted(physicsObject, testVector1);
+
+ physicsObject.setPosition(testVector1);
+ assertPositionCorrectlyConverted(physicsObject, testVector1);
+
+ Vector2 testVector2 = new Vector2(-87.65f, -43.21f);
+ physicsObject.setPosition(testVector2.x, testVector2.y);
+ assertPositionCorrectlyConverted(physicsObject, testVector2);
+
+ physicsObject.setPosition(testVector2);
+ assertPositionCorrectlyConverted(physicsObject, testVector2);
+ }
+
+ private void assertPositionCorrectlyConverted(PhysicsObject physicsObject, Vector2 position) throws Exception {
+ Vector2 physicsObjectCatroidPosition = PhysicsWorldConverter
+ .convertBox2dToNormalVector(PhysicsTestUtils.getBody(physicsObject).getPosition());
+ assertEquals(position, physicsObjectCatroidPosition);
+ assertEquals(position, physicsObject.getPosition());
+ }
+
+ @Test
+ public void testAngleAndPosition() throws Exception {
+ PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
+ assertEquals(0.0f, PhysicsTestUtils.getBody(physicsObject).getAngle());
+ assertEquals(new Vector2(), PhysicsTestUtils.getBody(physicsObject).getPosition());
+
+ float angle = 15.6f;
+ float expectedAngle = 15.6f;
+ Vector2 position = new Vector2(12.34f, 56.78f);
+ physicsObject.setDirection(angle);
+ physicsObject.setPosition(position.x, position.y);
+
+ float physicsObjectCatroidAngle = PhysicsWorldConverter.convertBox2dToNormalAngle(PhysicsTestUtils.getBody(
+ physicsObject).getAngle());
+ Vector2 physicsObjectCatroidPosition = PhysicsWorldConverter.convertBox2dToNormalVector(PhysicsTestUtils
+ .getBody(physicsObject).getPosition());
+
+ assertEquals(expectedAngle, physicsObjectCatroidAngle, TestUtils.DELTA);
+ assertEquals(position, physicsObjectCatroidPosition);
+ }
+
+ @Test
+ public void testSetDensity() throws Exception {
+ PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
+ physicsObject.setShape(new Shape[] {new PolygonShape(), new PolygonShape()});
+
+ assertThat(PhysicsTestUtils.getBody(physicsObject).getFixtureList().size, is(not(equalTo(0))));
+
+ assertDensitySet(0.123f, 0.123f, physicsObject);
+ }
+
+ @Test
+ public void testSetNegativeDensity() throws Exception {
+ PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
+ physicsObject.setShape(new Shape[] {new PolygonShape(), new PolygonShape()});
+
+ assertThat(PhysicsTestUtils.getBody(physicsObject).getFixtureList().size, is(not(equalTo(0))));
+
+ assertDensitySet(-0.234f, 0.0f, physicsObject);
+ }
+
+ private void assertDensitySet(float density, float expected, PhysicsObject physicsObject) throws Exception {
+ physicsObject.setDensity(density);
+ assertEquals(expected, PhysicsTestUtils.getFixtureDef(physicsObject).density);
+ for (Fixture fixture : PhysicsTestUtils.getBody(physicsObject).getFixtureList()) {
+ assertEquals(expected, fixture.getDensity());
+ }
+ }
+
+ @Test
+ public void testSetFriction() throws Exception {
+ PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
+ physicsObject.setShape(new Shape[] {new PolygonShape(), new PolygonShape()});
+
+ assertThat(PhysicsTestUtils.getBody(physicsObject).getFixtureList().size, is(not(equalTo(0))));
+
+ assertFrictionSet(0.123f, 0.123f, physicsObject);
+ }
+
+ @Test
+ public void testSetNegativeFriction() throws Exception {
+ PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
+ physicsObject.setShape(new Shape[] {new PolygonShape(), new PolygonShape()});
+
+ assertThat(PhysicsTestUtils.getBody(physicsObject).getFixtureList().size, is(not(equalTo(0))));
+
+ assertFrictionSet(-0.765f, 0.0f, physicsObject);
+ }
+
+ private void assertFrictionSet(float friction, float expected, PhysicsObject physicsObject) throws Exception {
+ physicsObject.setFriction(friction);
+ assertEquals(expected, PhysicsTestUtils.getFixtureDef(physicsObject).friction);
+ for (Fixture fixture : PhysicsTestUtils.getBody(physicsObject).getFixtureList()) {
+ assertEquals(expected, fixture.getFriction());
+ }
+ }
+
+ @Test
+ public void testSetBounceFactor() throws Exception {
+ PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
+ physicsObject.setShape(new Shape[] {new PolygonShape(), new PolygonShape()});
+
+ assertThat(PhysicsTestUtils.getBody(physicsObject).getFixtureList().size, is(not(equalTo(0))));
+
+ assertBounceFactorSet(0.123f, 0.123f, physicsObject);
+ }
+
+ @Test
+ public void testSetNegativeBounceFactor() throws Exception {
+ PhysicsObject physicsObject = PhysicsTestUtils.createPhysicsObject(physicsWorld, type);
+ physicsObject.setShape(new Shape[] {new PolygonShape(), new PolygonShape()});
+
+ assertThat(PhysicsTestUtils.getBody(physicsObject).getFixtureList().size, is(not(equalTo(0))));
+
+ assertBounceFactorSet(-0.765f, 0.0f, physicsObject);
+ }
+
+ private void assertBounceFactorSet(float bounceFactor, float expected, PhysicsObject physicsObject) throws
+ Exception {
+ physicsObject.setBounceFactor(bounceFactor);
+ assertEquals(expected, PhysicsTestUtils.getFixtureDef(physicsObject).restitution);
+ for (Fixture fixture : PhysicsTestUtils.getBody(physicsObject).getFixtureList()) {
+ assertEquals(expected, fixture.getRestitution());
+ }
+ }
+}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsShapeBuilderTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsShapeBuilderTest.java
index 01cc87b7d26..86054188faa 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsShapeBuilderTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsShapeBuilderTest.java
@@ -25,7 +25,6 @@
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
-import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.physics.box2d.PolygonShape;
import com.badlogic.gdx.physics.box2d.Shape;
import com.badlogic.gdx.utils.GdxNativesLoader;
@@ -133,10 +132,14 @@ public void testSimpleSingleConvexPolygon() {
Shape[] shapes = physicsShapeBuilder.getScaledShapes(lookData,
sprite.look.getSizeInUserInterfaceDimensionUnit() / 100f);
+ assertNotNull(shapes);
+ assertEquals(1, shapes.length);
+
+ Shape shape = shapes[0];
+ assertEquals(Shape.Type.Polygon, shape.getType());
- int expectedPolynoms = 1;
- int[] expectedVertices = {4};
- checkBuiltShapes(shapes, expectedPolynoms, expectedVertices);
+ int expectedVertices = 4;
+ assertEquals(expectedVertices, ((PolygonShape) shape).getVertexCount());
}
@Test
@@ -157,28 +160,4 @@ public void testDifferentAccuracySettings() throws Exception {
}
assertThat(lowestAccuracyShapes.length, is(lessThan(highestAccuracyShapes.length)));
}
-
- private void checkBuiltShapes(Shape[] shapes, int expectedPolynomCount, int[] expectedVertices) {
- assertNotNull(shapes);
- assertEquals(expectedPolynomCount, shapes.length);
- assertEquals(expectedPolynomCount, expectedVertices.length);
-
- for (int idx = 0; idx < shapes.length; idx++) {
- Shape shape = shapes[idx];
- switch (shape.getType()) {
- case Chain:
- case Circle:
- case Edge:
- break;
- case Polygon:
- int vertexCount = ((PolygonShape) shape).getVertexCount();
- for (int vertexIdx = 0; vertexIdx < vertexCount; vertexIdx++) {
- Vector2 vertex = new Vector2();
- ((PolygonShape) shape).getVertex(vertexIdx, vertex);
- }
- assertEquals(expectedVertices[idx], vertexCount);
- break;
- }
- }
- }
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsSpriteCloneTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsSpriteCloneTest.java
index b4b12772ae8..733e900bf4e 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsSpriteCloneTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsSpriteCloneTest.java
@@ -25,35 +25,19 @@
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
-import com.badlogic.gdx.math.Vector2;
-
import org.catrobat.catroid.ProjectManager;
import org.catrobat.catroid.common.LookData;
-import org.catrobat.catroid.content.CollisionScript;
import org.catrobat.catroid.content.Look;
import org.catrobat.catroid.content.Project;
-import org.catrobat.catroid.content.Script;
import org.catrobat.catroid.content.SingleSprite;
import org.catrobat.catroid.content.Sprite;
import org.catrobat.catroid.content.StartScript;
import org.catrobat.catroid.content.bricks.Brick;
-import org.catrobat.catroid.content.bricks.FormulaBrick;
-import org.catrobat.catroid.content.bricks.ScriptBrick;
-import org.catrobat.catroid.formulaeditor.Formula;
-import org.catrobat.catroid.formulaeditor.InterpretationException;
import org.catrobat.catroid.io.ResourceImporter;
import org.catrobat.catroid.io.XstreamSerializer;
import org.catrobat.catroid.physics.PhysicsObject;
import org.catrobat.catroid.physics.PhysicsWorld;
-import org.catrobat.catroid.physics.content.bricks.CollisionReceiverBrick;
-import org.catrobat.catroid.physics.content.bricks.SetBounceBrick;
-import org.catrobat.catroid.physics.content.bricks.SetFrictionBrick;
-import org.catrobat.catroid.physics.content.bricks.SetGravityBrick;
-import org.catrobat.catroid.physics.content.bricks.SetMassBrick;
import org.catrobat.catroid.physics.content.bricks.SetPhysicsObjectTypeBrick;
-import org.catrobat.catroid.physics.content.bricks.SetVelocityBrick;
-import org.catrobat.catroid.physics.content.bricks.TurnLeftSpeedBrick;
-import org.catrobat.catroid.physics.content.bricks.TurnRightSpeedBrick;
import org.catrobat.catroid.test.utils.TestUtils;
import org.catrobat.catroid.ui.recyclerview.controller.SpriteController;
import org.junit.After;
@@ -67,7 +51,6 @@
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertNotSame;
-import static junit.framework.Assert.assertTrue;
import static org.catrobat.catroid.common.Constants.IMAGE_DIRECTORY_NAME;
@@ -76,14 +59,7 @@ public class PhysicsSpriteCloneTest {
private Sprite sprite;
private Project project;
- private static final float BOUNCE_TEST_VALUE = 0.5f;
- private static final float FRICTION_TEST_VALUE = 0.5f;
- private static final Vector2 GRAVITY_TEST_VALUE = new Vector2(10.0f, 10.0f);
- private static final float MASS_TEST_VALUE = 5.0f;
private static final PhysicsObject.Type TYPE_TEST_VALUE = PhysicsObject.Type.DYNAMIC;
- private static final Vector2 VELOCITY_TEST_VALUE = new Vector2(15.0f, 15.0f);
- private static final float TURN_LEFT_SPEED_TEST_VALUE = 2.0f;
- private static final float TURN_RIGHT_SPEED_TEST_VALUE = 3.0f;
@Before
public void setUp() throws Exception {
@@ -105,82 +81,6 @@ public void tearDown() throws Exception {
TestUtils.deleteProjects();
}
- private void checkIfScriptsAndBricksClassesOfSpriteAreEqual(Sprite sprite, Sprite clonedSprite) {
- int scriptCount = clonedSprite.getNumberOfScripts();
- for (int scriptIndex = 0; scriptIndex < scriptCount; scriptIndex++) {
- Script script = sprite.getScript(scriptIndex);
- Script clonedScript = clonedSprite.getScript(scriptIndex);
- assertEquals(script.getClass().toString(), clonedScript.getClass().toString());
- ScriptBrick scriptBrick = sprite.getScript(scriptIndex).getScriptBrick();
- ScriptBrick clonedScriptBrick = clonedSprite.getScript(scriptIndex).getScriptBrick();
- assertEquals(scriptBrick.getClass().toString(), clonedScriptBrick.getClass().toString());
- int brickCount = clonedSprite.getScript(scriptIndex).getBrickList().size();
- for (int brickIndex = 0; brickIndex < brickCount; brickIndex++) {
- Brick brick = sprite.getScript(scriptIndex).getBrickList().get(brickIndex);
- Brick clonedBrick = clonedSprite.getScript(scriptIndex).getBrickList().get(brickIndex);
- assertEquals(brick.getClass().toString(), clonedBrick.getClass().toString());
- }
- }
- }
-
- @Test
- public void testSpriteCloneWithPhysicsScriptAndBricks() throws IOException {
- CollisionScript collisionScript = new CollisionScript(null);
- collisionScript.getScriptBrick();
- Brick setBounceBrick = new SetBounceBrick(BOUNCE_TEST_VALUE);
- Brick setFrictionBrick = new SetFrictionBrick(FRICTION_TEST_VALUE);
- Brick setGravityBrick = new SetGravityBrick(GRAVITY_TEST_VALUE);
- Brick setMassBrick = new SetMassBrick(MASS_TEST_VALUE);
- Brick setPhysicsObjectTypeBrick = new SetPhysicsObjectTypeBrick(TYPE_TEST_VALUE);
- Brick setVelocityBrick = new SetVelocityBrick(VELOCITY_TEST_VALUE);
- Brick turnLeftSpeedBrick = new TurnLeftSpeedBrick(TURN_LEFT_SPEED_TEST_VALUE);
- Brick turnRightSpeedBrick = new TurnRightSpeedBrick(TURN_RIGHT_SPEED_TEST_VALUE);
-
- collisionScript.addBrick(setBounceBrick);
- collisionScript.addBrick(setFrictionBrick);
- collisionScript.addBrick(setGravityBrick);
- collisionScript.addBrick(setMassBrick);
- collisionScript.addBrick(setPhysicsObjectTypeBrick);
- collisionScript.addBrick(setVelocityBrick);
- collisionScript.addBrick(turnLeftSpeedBrick);
- collisionScript.addBrick(turnRightSpeedBrick);
-
- sprite.addScript(collisionScript);
-
- Sprite clonedSprite = new SpriteController().copy(sprite, project.getDefaultScene(), project.getDefaultScene());
-
- checkIfScriptsAndBricksClassesOfSpriteAreEqual(sprite, clonedSprite);
- }
-
- @Test
- public void testSpriteCloneWithCollisionScript() throws IOException, InterpretationException {
- CollisionScript collisionScript = new CollisionScript(null);
- collisionScript.getScriptBrick();
- Brick setBounceBrick = new SetBounceBrick(BOUNCE_TEST_VALUE);
-
- collisionScript.addBrick(setBounceBrick);
- sprite.addScript(collisionScript);
-
- Sprite clonedSprite = new SpriteController().copy(sprite, project.getDefaultScene(), project.getDefaultScene());
-
- checkIfScriptsAndBricksClassesOfSpriteAreEqual(sprite, clonedSprite);
-
- Script clonedScript = clonedSprite.getScript(0);
- assertTrue(clonedScript instanceof CollisionScript);
- ScriptBrick clonedScriptBrick = clonedScript.getScriptBrick();
- assertTrue(clonedScriptBrick instanceof CollisionReceiverBrick);
-
- Brick clonedSetBounceBrick = clonedScript.getBrickList().get(0);
- assertTrue(clonedSetBounceBrick instanceof SetBounceBrick);
-
- Formula clonedSetBounceBrickFormula = ((FormulaBrick) clonedSetBounceBrick)
- .getFormulaWithBrickField(Brick.BrickField.PHYSICS_BOUNCE_FACTOR);
- float clonedBounceFactorValue = 0;
- clonedBounceFactorValue = clonedSetBounceBrickFormula.interpretFloat(clonedSprite);
-
- assertEquals(BOUNCE_TEST_VALUE, clonedBounceFactorValue);
- }
-
@Test
public void testSpriteClonePhysicsLookAndPhysicsObject() throws IOException {
StartScript startScript = new StartScript();
@@ -210,7 +110,7 @@ public void testSpriteClonePhysicsLookAndPhysicsObject() throws IOException {
PhysicsObject physicsObject = physicsWorld.getPhysicsObject(sprite);
- Sprite clonedSprite = new SpriteController().copy(sprite, project.getDefaultScene(), project.getDefaultScene());
+ Sprite clonedSprite = new SpriteController().copy(sprite, project, project.getDefaultScene());
assertNotNull(clonedSprite.look);
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsWorldConverterTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsWorldConverterTest.java
deleted file mode 100644
index d598f18053a..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsWorldConverterTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-package org.catrobat.catroid.test.physics;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import com.badlogic.gdx.math.Vector2;
-
-import junit.framework.Assert;
-
-import org.catrobat.catroid.physics.PhysicsWorld;
-import org.catrobat.catroid.physics.PhysicsWorldConverter;
-import org.catrobat.catroid.test.utils.TestUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class PhysicsWorldConverterTest {
-
- private float ratio = PhysicsWorld.RATIO;
-
- @Test
- public void testAngleConversion() {
- float angle = 0.0f;
- Assert.assertEquals(angle, PhysicsWorldConverter.convertBox2dToNormalAngle(angle));
- Assert.assertEquals(angle, PhysicsWorldConverter.convertNormalToBox2dAngle(angle), TestUtils.DELTA);
-
- Assert.assertEquals((float) (Math.PI / 2.0), PhysicsWorldConverter.convertNormalToBox2dAngle(90.0f), TestUtils.DELTA);
- Assert.assertEquals((float) Math.PI, PhysicsWorldConverter.convertNormalToBox2dAngle(180.0f), TestUtils.DELTA);
- Assert.assertEquals(90.0f, PhysicsWorldConverter.convertBox2dToNormalAngle((float) (Math.PI / 2.0)), TestUtils.DELTA);
- Assert.assertEquals(180.0f, PhysicsWorldConverter.convertBox2dToNormalAngle((float) Math.PI), TestUtils.DELTA);
-
- float[] angles = {123.456f, -123.456f, 1024.0f};
- for (float currentAngle : angles) {
- Assert.assertEquals((float) Math.toDegrees(currentAngle), PhysicsWorldConverter.convertBox2dToNormalAngle(currentAngle));
- Assert.assertEquals((float) Math.toRadians(currentAngle), PhysicsWorldConverter.convertNormalToBox2dAngle(currentAngle));
- }
- }
-
- @Test
- public void testLengthConversion() {
- float length = 0.0f;
- Assert.assertEquals(length, PhysicsWorldConverter.convertBox2dToNormalCoordinate(length));
- Assert.assertEquals(length, PhysicsWorldConverter.convertNormalToBox2dCoordinate(length));
-
- float[] lengths = {123.456f, -654.321f};
- for (float currentLength : lengths) {
- Assert.assertEquals(currentLength * ratio, PhysicsWorldConverter.convertBox2dToNormalCoordinate(currentLength));
- Assert.assertEquals(currentLength / ratio, PhysicsWorldConverter.convertNormalToBox2dCoordinate(currentLength));
- }
- }
-
- @Test
- public void testVectorConversation() {
- Vector2 vector = new Vector2();
- Assert.assertEquals(vector, PhysicsWorldConverter.convertBox2dToNormalVector(vector));
- Assert.assertEquals(vector, PhysicsWorldConverter.convertCatroidToBox2dVector(vector));
-
- Vector2[] vectors = {new Vector2(123.456f, 123.456f), new Vector2(654.321f, -123.456f),
- new Vector2(-654.321f, 0.0f), new Vector2(-123.456f, -654.321f)};
-
- Vector2 expected;
- for (Vector2 currentVector : vectors) {
- expected = new Vector2(currentVector.x * ratio, currentVector.y * ratio);
- Assert.assertEquals(expected, PhysicsWorldConverter.convertBox2dToNormalVector(currentVector));
-
- expected = new Vector2(currentVector.x / ratio, currentVector.y / ratio);
- Assert.assertEquals(expected, PhysicsWorldConverter.convertCatroidToBox2dVector(currentVector));
- }
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsWorldTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsWorldTest.java
index 18ed2294b0e..d3149da73a3 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsWorldTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsWorldTest.java
@@ -155,8 +155,7 @@ public void testGetSamePhysicsObject() {
}
@Test
- public void testSteps() throws SecurityException, IllegalArgumentException, NoSuchFieldException,
- IllegalAccessException {
+ public void testSteps() throws SecurityException, IllegalArgumentException {
Sprite sprite = new Sprite("TestSprite");
sprite.look = new PhysicsLook(sprite, physicsWorld);
@@ -176,7 +175,6 @@ public void testSteps() throws SecurityException, IllegalArgumentException, NoSu
assertEquals(velocity.y, physicsObject.getY(), 1e-8);
assertEquals(rotationSpeed, physicsObject.getDirection(), 1e-8);
- // TODO[Physics] angle problem
physicsWorld.step(1.0f);
assertEquals(2 * velocity.x, physicsObject.getX(), 1e-8);
assertEquals(2 * velocity.y, physicsObject.getY(), 1e-8);
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/actions/IfOnEdgeBouncePhysicsActionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/actions/IfOnEdgeBouncePhysicsActionTest.java
index 97692f7a26c..3bd443049b4 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/actions/IfOnEdgeBouncePhysicsActionTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/actions/IfOnEdgeBouncePhysicsActionTest.java
@@ -23,7 +23,6 @@
package org.catrobat.catroid.test.physics.actions;
import android.support.test.runner.AndroidJUnit4;
-import android.util.Log;
import com.badlogic.gdx.scenes.scene2d.Action;
@@ -74,16 +73,6 @@ public void setUp() {
project = rule.project;
}
- private static final String TAG = IfOnEdgeBouncePhysicsActionTest.class.getSimpleName();
-
- private void logState(String explanationText, Sprite sprite, PhysicsObject physicsObject) {
- Log.d(TAG, explanationText);
- Log.d(TAG, "getX():" + sprite.look.getXInUserInterfaceDimensionUnit());
- Log.d(TAG, "getY():" + sprite.look.getYInUserInterfaceDimensionUnit());
- Log.d(TAG, "getVelocity():" + physicsObject.getVelocity().x + " / " + physicsObject.getVelocity().y);
- Log.d(TAG, "-------------------------------------------------");
- }
-
@Test
public void testNormalBehavior() {
@@ -101,14 +90,11 @@ public void testNormalBehavior() {
ActionFactory factory = sprite.getActionFactory();
Action ifOnEdgeBouncePhysicsAction = factory.createIfOnEdgeBounceAction(sprite);
- logState("Values after action creation", sprite, physicsObject);
ifOnEdgeBouncePhysicsAction.act(0.1f);
float setYValueAfterAct = sprite.look.getYInUserInterfaceDimensionUnit();
- logState("Values after act of the action", sprite, physicsObject);
physicsWorld.step(0.3f);
- logState("Values after step of physics world", sprite, physicsObject);
assertThat(sprite.look.getYInUserInterfaceDimensionUnit(), is(greaterThan(setYValueAfterAct)));
}
@@ -130,15 +116,12 @@ public void testVelocityThresholdAtTopCollision() {
ActionFactory factory = sprite.getActionFactory();
Action ifOnEdgeBouncePhysicsAction = factory.createIfOnEdgeBounceAction(sprite);
- logState("Values after action creation", sprite, physicsObject);
ifOnEdgeBouncePhysicsAction.act(0.1f);
- logState("Values after act of the action", sprite, physicsObject);
assertEquals(setVelocityYValue, physicsObject.getVelocity().y, TestUtils.DELTA);
physicsWorld.step(0.3f);
- logState("Values after step of physics world", sprite, physicsObject);
assertThat(sprite.look.getYInUserInterfaceDimensionUnit(), is(lessThan(setYValue)));
}
@@ -166,10 +149,8 @@ public void testSpriteOverlapsRightAndTopAxis() {
ActionFactory factory = sprite.getActionFactory();
Action ifOnEdgeBouncePhysicsAction = factory.createIfOnEdgeBounceAction(sprite);
- logState("Values after action creation", sprite, physicsObject);
ifOnEdgeBouncePhysicsAction.act(0.1f);
- logState("Values after first act of the action", sprite, physicsObject);
float borderX = sprite.look.getXInUserInterfaceDimensionUnit();
float borderY = sprite.look.getYInUserInterfaceDimensionUnit();
@@ -181,7 +162,6 @@ public void testSpriteOverlapsRightAndTopAxis() {
assertEquals(setVelocityYValue, physicsObject.getVelocity().y, TestUtils.DELTA);
physicsWorld.step(0.1f);
- logState("Values after first step of physics world", sprite, physicsObject);
float prevX = sprite.look.getXInUserInterfaceDimensionUnit();
float prevY = sprite.look.getYInUserInterfaceDimensionUnit();
@@ -190,10 +170,7 @@ public void testSpriteOverlapsRightAndTopAxis() {
assertEquals(prevX, sprite.look.getXInUserInterfaceDimensionUnit(), TestUtils.DELTA);
assertEquals(prevY, sprite.look.getYInUserInterfaceDimensionUnit(), TestUtils.DELTA);
- logState("Values after second act of the action", sprite, physicsObject);
-
physicsWorld.step(2.3f);
- logState("Values after second step of physics world", sprite, physicsObject);
assertThat(sprite.look.getXInUserInterfaceDimensionUnit(), is(lessThan(setXValue)));
assertThat(sprite.look.getYInUserInterfaceDimensionUnit(), is(lessThan(setYValue)));
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/actions/PhysicsObjectStateTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/actions/PhysicsObjectStateTest.java
index 8de7b863ff5..d298d32cf07 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/actions/PhysicsObjectStateTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/actions/PhysicsObjectStateTest.java
@@ -169,8 +169,6 @@ public void testVisibleAndPositionAndGlideTo() throws Exception {
allConditionsInactiveCheck();
}
- // HELPER ----------------------------------------------------------------------------------------------------------
-
private void allConditionsInactiveCheck() throws Exception {
((PhysicsLook) sprite.look).updatePhysicsObjectState(true);
boolean hangedUp = (Boolean) Reflection.getPrivateField(physicsObjectStateHandler, "hangedUp");
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/collision/CollisionFormulaConversionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/collision/CollisionFormulaConversionTest.java
index 40729a1eff5..30cd1296bc7 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/collision/CollisionFormulaConversionTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/physics/collision/CollisionFormulaConversionTest.java
@@ -40,7 +40,6 @@
import org.catrobat.catroid.content.bricks.Brick;
import org.catrobat.catroid.content.bricks.FormulaBrick;
import org.catrobat.catroid.content.bricks.IfLogicBeginBrick;
-import org.catrobat.catroid.exceptions.ProjectException;
import org.catrobat.catroid.formulaeditor.Formula;
import org.catrobat.catroid.formulaeditor.FormulaElement;
import org.catrobat.catroid.test.utils.TestUtils;
@@ -63,7 +62,6 @@
public class CollisionFormulaConversionTest {
private static final String COLLISION_TEST_PROJECT = "COLLISION_TEST_PROJECT";
- private static final float OLD_CATROBAT_LANGUAGE_VERSION = 0.992f;
private ProjectManager projectManager;
@Before
@@ -79,17 +77,6 @@ public void tearDown() throws Exception {
TestUtils.removeFromPreferences(InstrumentationRegistry.getContext(), Constants.PREF_PROJECTNAME_KEY);
}
- @Test
- public void testCatrobatLanguageVersionUpdated() throws IOException, ProjectException {
- TestUtils.createProjectWithLanguageVersion(OLD_CATROBAT_LANGUAGE_VERSION,
- "testProject");
- projectManager.loadProject(TestUtils.DEFAULT_TEST_PROJECT_NAME, InstrumentationRegistry.getTargetContext());
-
- assertEquals(Constants.CURRENT_CATROBAT_LANGUAGE_VERSION,
- projectManager.getCurrentProject().getCatrobatLanguageVersion());
- TestUtils.deleteProjects();
- }
-
@Test
public void testFormulaUpdated() throws IOException {
String firstSpriteName = "a";
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/pocketmusic/note/TrackTestDataFactory.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/pocketmusic/note/TrackTestDataFactory.java
index c037836bae0..4b65a2edb60 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/pocketmusic/note/TrackTestDataFactory.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/pocketmusic/note/TrackTestDataFactory.java
@@ -35,56 +35,6 @@ public final class TrackTestDataFactory {
private TrackTestDataFactory() {
}
- public static Track createSimpleTrack() {
- Track track = new Track(MusicalKey.VIOLIN, MusicalInstrument.ACOUSTIC_GRAND_PIANO);
-
- long tick = 0;
-
- track.addNoteEvent(tick, new NoteEvent(NoteName.C4, true));
-
- tick += NoteLength.QUARTER.toTicks(Project.DEFAULT_BEATS_PER_MINUTE);
-
- track.addNoteEvent(tick, new NoteEvent(NoteName.C4, false));
- track.addNoteEvent(tick, new NoteEvent(NoteName.E4, true));
-
- tick += NoteLength.QUARTER.toTicks(Project.DEFAULT_BEATS_PER_MINUTE);
-
- track.addNoteEvent(tick, new NoteEvent(NoteName.E4, false));
- track.addNoteEvent(tick, new NoteEvent(NoteName.F4, true));
-
- tick += NoteLength.QUARTER.toTicks(Project.DEFAULT_BEATS_PER_MINUTE);
-
- track.addNoteEvent(tick, new NoteEvent(NoteName.F4, false));
- track.addNoteEvent(tick, new NoteEvent(NoteName.C4, true));
-
- tick += NoteLength.QUARTER.toTicks(Project.DEFAULT_BEATS_PER_MINUTE);
-
- track.addNoteEvent(tick, new NoteEvent(NoteName.C4, false));
- track.addNoteEvent(tick, new NoteEvent(NoteName.C5, true));
-
- tick += NoteLength.QUARTER.toTicks(Project.DEFAULT_BEATS_PER_MINUTE);
-
- track.addNoteEvent(tick, new NoteEvent(NoteName.C5, false));
-
- return track;
- }
-
- public static Track createTrackWithSeveralBreaks() {
- Track track = new Track(MusicalKey.VIOLIN, MusicalInstrument.ACOUSTIC_GRAND_PIANO);
- long tick = 0;
-
- tick += NoteLength.HALF.toTicks(Project.DEFAULT_BEATS_PER_MINUTE);
- tick += NoteLength.QUARTER.toTicks(Project.DEFAULT_BEATS_PER_MINUTE);
-
- track.addNoteEvent(tick, new NoteEvent(NoteName.C4, true));
-
- tick += NoteLength.QUARTER.toTicks(Project.DEFAULT_BEATS_PER_MINUTE);
-
- track.addNoteEvent(tick, new NoteEvent(NoteName.C4, false));
-
- return track;
- }
-
public static Track createSemiComplexTrack(MusicalInstrument instrument) {
Track track = new Track(MusicalKey.VIOLIN, instrument);
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/stage/DrawAxesTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/stage/DrawAxesTest.java
new file mode 100644
index 00000000000..0aabdf8cc79
--- /dev/null
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/stage/DrawAxesTest.java
@@ -0,0 +1,102 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2018 The Catrobat Team
+ * ()
+ *
+ * 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 .
+ */
+
+package org.catrobat.catroid.test.stage;
+
+import android.support.annotation.IdRes;
+import android.support.test.InstrumentationRegistry;
+
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+
+import org.catrobat.catroid.ProjectManager;
+import org.catrobat.catroid.content.Project;
+import org.catrobat.catroid.stage.StageListener;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.mockito.Mockito;
+
+import java.util.Arrays;
+
+import static junit.framework.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public class DrawAxesTest {
+ private StageListener stageListener;
+ private static Project project;
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable data() {
+ return Arrays.asList(new Object[][] {
+ {1440, 2560, false, 8, 8f},
+ {1440, 2560, true, 8, 4.5f},
+ {500, 500, false, 16, 0.78125f},
+ {768, 1280, true, 16, 1.2f},
+ {768, 1280, false, 20, 1.6f},
+ {240, 320, true, 24, 0.25f},
+ {240, 432, false, 32, 0.3375f},
+ {230, 400, true, 10, 0.575f},
+ {1080, 1920, false, 40, 1.2f},
+ {800, 1280, true, 40, 0.5f},
+ {480, 800, true, 48, 0.25f}
+ });
+ }
+
+ @Parameterized.Parameter
+ public @IdRes int projectLayoutHeight;
+
+ @Parameterized.Parameter(1)
+ public @IdRes int projectLayoutWidth;
+
+ @Parameterized.Parameter(2)
+ public @IdRes boolean projectLandscapeMode;
+
+ @Parameterized.Parameter(3)
+ public @IdRes int labelLayoutHeight;
+
+ @Parameterized.Parameter(4)
+ public @IdRes float expectedScaleFactor;
+
+ @Before
+ public void setUp() throws Exception {
+ project = new Project(InstrumentationRegistry.getTargetContext(), "Project");
+ ProjectManager.getInstance().setCurrentProject(project);
+ project.getXmlHeader().setVirtualScreenHeight(projectLayoutHeight);
+ project.getXmlHeader().setVirtualScreenWidth(projectLayoutWidth);
+ project.getXmlHeader().setlandscapeMode(projectLandscapeMode);
+ }
+
+ @Test
+ public void testAxisFontSize() {
+ stageListener = new StageListener();
+
+ BitmapFont font = Mockito.mock(BitmapFont.class);
+ GlyphLayout layout = Mockito.mock(GlyphLayout.class);
+ layout.height = labelLayoutHeight;
+
+ float scaleFactor = stageListener.getFontScaleFactor(project, font, layout);
+ assertEquals(expectedScaleFactor, scaleFactor);
+ }
+}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/ui/CategoryBricksFactoryTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/ui/CategoryBricksFactoryTest.java
deleted file mode 100644
index 86c2c97ecb9..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/ui/CategoryBricksFactoryTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-package org.catrobat.catroid.test.ui;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.ProjectManager;
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.Project;
-import org.catrobat.catroid.content.SingleSprite;
-import org.catrobat.catroid.content.Sprite;
-import org.catrobat.catroid.content.bricks.Brick;
-import org.catrobat.catroid.ui.fragment.CategoryBricksFactory;
-import org.catrobat.catroid.ui.settingsfragments.SettingsFragment;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-@RunWith(AndroidJUnit4.class)
-public class CategoryBricksFactoryTest {
-
- private final CategoryBricksFactory factory = new CategoryBricksFactory();
- private Sprite background;
- private Sprite sprite = new SingleSprite("newSprite");
- private Context context = InstrumentationRegistry.getContext();
-
- @Before
- public void setUp() throws Exception {
- context = InstrumentationRegistry.getTargetContext();
-
- SettingsFragment.resetSharedPreferences(context);
-
- Project project = new Project(context, "Project");
- background = project.getDefaultScene().getSpriteList().get(0);
- project.getDefaultScene().addSprite(sprite);
- ProjectManager.getInstance().setCurrentProject(project);
- }
-
- @Test
- public void testEventBrick() {
- final int expectedBrickCount = 10;
- checkBrickCountInCategory(R.string.category_event, background, expectedBrickCount);
- checkBrickCountInCategory(R.string.category_event, sprite, expectedBrickCount);
- }
-
- @Test
- public void testControlBricks() {
- final int expectedBrickCount = 14;
- checkBrickCountInCategory(R.string.category_control, background, expectedBrickCount);
- checkBrickCountInCategory(R.string.category_control, sprite, expectedBrickCount);
- }
-
- @Test
- public void testMotionBricks() {
- final int expectedBackgroundBrickCount = 22;
- checkBrickCountInCategory(R.string.category_motion, background, expectedBackgroundBrickCount);
- final int expectedSpriteBrickCount = 25;
- checkBrickCountInCategory(R.string.category_motion, sprite, expectedSpriteBrickCount);
- }
-
- @Test
- public void testSoundBricks() {
- final int expectedBrickCount = 8;
- checkBrickCountInCategory(R.string.category_sound, background, expectedBrickCount);
- checkBrickCountInCategory(R.string.category_sound, sprite, expectedBrickCount);
- }
-
- @Test
- public void testLooksBricks() {
- final int expectedBackgroundBrickCount = 24;
- checkBrickCountInCategory(R.string.category_looks, background, expectedBackgroundBrickCount);
- final int expectedBrickCount = 30;
- checkBrickCountInCategory(R.string.category_looks, sprite, expectedBrickCount);
- }
-
- @Test
- public void testPenBricks() {
- final int expectedBackgroundBrickCount = 1;
- checkBrickCountInCategory(R.string.category_pen, background, expectedBackgroundBrickCount);
- final int expectedSpriteBrickCount = 6;
- checkBrickCountInCategory(R.string.category_pen, sprite, expectedSpriteBrickCount);
- }
-
- @Test
- public void testDataBricks() {
- final int expectedBrickCount = 11;
- checkBrickCountInCategory(R.string.category_data, background, expectedBrickCount);
- checkBrickCountInCategory(R.string.category_data, sprite, expectedBrickCount);
- }
-
- @Test
- public void testLegoNxtBricks() {
- final int expectedBrickCount = 4;
- checkBrickCountInCategory(R.string.category_lego_nxt, background, expectedBrickCount);
- checkBrickCountInCategory(R.string.category_lego_nxt, sprite, expectedBrickCount);
- }
-
- @Test
- public void testUnknownCategory() {
- List bricks = factory.getBricks("NON_EXISTING_CATEGORY", sprite, context);
- assertTrue(bricks.isEmpty());
- }
-
- private void checkBrickCountInCategory(int categoryId, Sprite sprite, int expectedBrickCount) {
- List bricks = factory.getBricks(context.getString(categoryId), sprite, context);
- assertEquals(String.format("Wrong bricks count in %s category", context.getString(categoryId)), expectedBrickCount, bricks.size());
- }
-}
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 98d05445767..5951ccfca1c 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
@@ -63,7 +63,7 @@ public static void deleteProjects(String... projectNames) throws IOException {
}
}
- public static void createProjectWithLanguageVersion(float catrobatLanguageVersion, String projectName) {
+ public static Project createProjectWithLanguageVersion(float catrobatLanguageVersion, String projectName) {
Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
project.setCatrobatLanguageVersion(catrobatLanguageVersion);
@@ -76,6 +76,7 @@ public static void createProjectWithLanguageVersion(float catrobatLanguageVersio
project.getDefaultScene().addSprite(firstSprite);
XstreamSerializer.getInstance().saveProject(project);
+ return project;
}
public static void removeFromPreferences(Context context, String key) {
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/DefaultProjectComparatorTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/DefaultProjectComparatorTest.java
new file mode 100644
index 00000000000..81c1fb624d4
--- /dev/null
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/DefaultProjectComparatorTest.java
@@ -0,0 +1,160 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2018 The Catrobat Team
+ * ()
+ *
+ * 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 .
+ */
+
+package org.catrobat.catroid.test.utiltests;
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.catrobat.catroid.common.DefaultProjectHandler;
+import org.catrobat.catroid.common.ScreenValues;
+import org.catrobat.catroid.content.Project;
+import org.catrobat.catroid.content.Script;
+import org.catrobat.catroid.content.SingleSprite;
+import org.catrobat.catroid.content.Sprite;
+import org.catrobat.catroid.content.WhenScript;
+import org.catrobat.catroid.content.bricks.Brick;
+import org.catrobat.catroid.content.bricks.HideBrick;
+import org.catrobat.catroid.io.StorageOperations;
+import org.catrobat.catroid.utils.Utils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.catrobat.catroid.common.FlavoredConstants.DEFAULT_ROOT_DIRECTORY;
+
+@RunWith(AndroidJUnit4.class)
+public class DefaultProjectComparatorTest {
+
+ private static final String PROJECT_NAME = DefaultProjectComparatorTest.class.getSimpleName();
+ private Project defaultProject;
+ private File projectDir = new File(DEFAULT_ROOT_DIRECTORY, PROJECT_NAME);
+
+ private int screenWidthBuffer;
+ private int screenHeightBuffer;
+
+ @Before
+ public void setUp() throws IOException {
+ screenWidthBuffer = ScreenValues.SCREEN_WIDTH;
+ screenHeightBuffer = ScreenValues.SCREEN_HEIGHT;
+
+ ScreenValues.SCREEN_WIDTH = 480;
+ ScreenValues.SCREEN_HEIGHT = 800;
+
+ if (projectDir.isDirectory()) {
+ StorageOperations.deleteDir(projectDir);
+ }
+
+ defaultProject = DefaultProjectHandler
+ .createAndSaveDefaultProject(PROJECT_NAME, InstrumentationRegistry.getTargetContext());
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ ScreenValues.SCREEN_WIDTH = screenWidthBuffer;
+ ScreenValues.SCREEN_HEIGHT = screenHeightBuffer;
+
+ if (projectDir.isDirectory()) {
+ StorageOperations.deleteDir(projectDir);
+ }
+ }
+
+ @Test
+ public void testCompareProjectToDefaultProject() {
+ assertTrue(Utils.isDefaultProject(defaultProject, InstrumentationRegistry.getTargetContext()));
+
+ addSpriteAndCompareToDefaultProject();
+ addScriptAndCompareToDefalutProject();
+ addBrickAndCompareToDefaultProject();
+ removeBrickAndCompareToDefaultProject();
+ removeScriptAndCompareToDefaultProject();
+ removeSpriteAndCompareToDefaultProject();
+ }
+
+ private void addSpriteAndCompareToDefaultProject() {
+ Sprite sprite = new SingleSprite("TestSprite");
+ defaultProject.getDefaultScene().addSprite(sprite);
+ assertFalse(Utils.isDefaultProject(defaultProject, InstrumentationRegistry.getTargetContext()));
+ defaultProject.getDefaultScene().removeSprite(sprite);
+ assertTrue(Utils.isDefaultProject(defaultProject, InstrumentationRegistry.getTargetContext()));
+ }
+
+ private void addScriptAndCompareToDefalutProject() {
+ Sprite sprite = defaultProject.getDefaultScene().getSpriteList().get(1);
+ WhenScript whenScript = new WhenScript();
+ sprite.addScript(whenScript);
+ assertFalse(Utils.isDefaultProject(defaultProject, InstrumentationRegistry.getTargetContext()));
+ sprite.removeScript(whenScript);
+ assertTrue(Utils.isDefaultProject(defaultProject, InstrumentationRegistry.getTargetContext()));
+ }
+
+ private void addBrickAndCompareToDefaultProject() {
+ Sprite sprite = defaultProject.getDefaultScene().getSpriteList().get(1);
+ Brick brick = new HideBrick();
+ Script script = sprite.getScript(0);
+ script.addBrick(brick);
+ assertFalse(Utils.isDefaultProject(defaultProject, InstrumentationRegistry.getTargetContext()));
+ script.removeBrick(brick);
+ assertTrue(Utils.isDefaultProject(defaultProject, InstrumentationRegistry.getTargetContext()));
+ }
+
+ private void removeBrickAndCompareToDefaultProject() {
+ Script script = defaultProject.getDefaultScene().getSpriteList().get(1).getScript(0);
+ List brickList = script.getBrickList();
+ Brick brick = brickList.get(brickList.size() - 1);
+ brickList.remove(brickList.size() - 1);
+ assertFalse(Utils.isDefaultProject(defaultProject, InstrumentationRegistry.getTargetContext()));
+
+ brickList.add(brick);
+ assertTrue(Utils.isDefaultProject(defaultProject, InstrumentationRegistry.getTargetContext()));
+ }
+
+ private void removeScriptAndCompareToDefaultProject() {
+ Script script = defaultProject.getDefaultScene().getSpriteList().get(1).getScript(0);
+ Sprite sprite = defaultProject.getDefaultScene().getSpriteList().get(1);
+ sprite.removeScript(script);
+ assertFalse(Utils.isDefaultProject(defaultProject, InstrumentationRegistry.getTargetContext()));
+
+ sprite.addScript(script);
+ assertTrue(Utils.isDefaultProject(defaultProject, InstrumentationRegistry.getTargetContext()));
+ }
+
+ private void removeSpriteAndCompareToDefaultProject() {
+ Sprite sprite = defaultProject.getDefaultScene().getSpriteList().get(3);
+ int lastIndex = defaultProject.getDefaultScene().getSpriteList().size() - 1;
+ List spriteList = defaultProject.getDefaultScene().getSpriteList();
+ spriteList.remove(lastIndex);
+ assertFalse(Utils.isDefaultProject(defaultProject, InstrumentationRegistry.getTargetContext()));
+
+ spriteList.add(sprite);
+ assertTrue(Utils.isDefaultProject(defaultProject, InstrumentationRegistry.getTargetContext()));
+ }
+}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/MD5ChecksumTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/MD5ChecksumTest.java
new file mode 100644
index 00000000000..3e64bd7632e
--- /dev/null
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/MD5ChecksumTest.java
@@ -0,0 +1,80 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2018 The Catrobat Team
+ * ()
+ *
+ * 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 .
+ */
+
+package org.catrobat.catroid.test.utiltests;
+
+import android.support.test.runner.AndroidJUnit4;
+
+import org.catrobat.catroid.io.StorageOperations;
+import org.catrobat.catroid.utils.Utils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Locale;
+
+import static junit.framework.Assert.assertEquals;
+
+import static org.catrobat.catroid.common.Constants.TMP_PATH;
+
+@RunWith(AndroidJUnit4.class)
+public class MD5ChecksumTest {
+
+ private static final String MD5_EMPTY = "D41D8CD98F00B204E9800998ECF8427E";
+ private static final String MD5_CATROID = "4F982D927F4784F69AD6D6AF38FD96AD";
+ private static final String MD5_HELLO_WORLD = "ED076287532E86365E841E92BFC50D8C";
+
+ @Test
+ public void testMD5CheckSumOfFile() throws IOException {
+ PrintWriter printWriter;
+
+ File tempDir = new File(TMP_PATH);
+ tempDir.mkdirs();
+
+ File md5TestFile = new File(tempDir, "catroid.txt");
+
+ if (md5TestFile.exists()) {
+ md5TestFile.delete();
+ }
+
+ md5TestFile.createNewFile();
+ assertEquals(MD5_EMPTY.toLowerCase(Locale.US), Utils.md5Checksum(md5TestFile));
+
+ printWriter = new PrintWriter(md5TestFile);
+ printWriter.print("catroid");
+ printWriter.close();
+
+ assertEquals(MD5_CATROID.toLowerCase(Locale.US), Utils.md5Checksum(md5TestFile));
+
+ StorageOperations.deleteDir(tempDir);
+ }
+
+ @Test
+ public void testMD5CheckSumOfString() {
+ assertEquals(MD5_CATROID.toLowerCase(Locale.US), Utils.md5Checksum("catroid"));
+ assertEquals(MD5_EMPTY.toLowerCase(Locale.US), Utils.md5Checksum(""));
+ assertEquals(MD5_HELLO_WORLD.toLowerCase(Locale.US), Utils.md5Checksum("Hello World!"));
+ }
+}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/UtilFileSizeTranslationsTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/UtilFileSizeTranslationsTest.java
index ad5ab798cda..db97ba48a75 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/UtilFileSizeTranslationsTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/UtilFileSizeTranslationsTest.java
@@ -26,14 +26,12 @@
import android.support.test.runner.AndroidJUnit4;
import org.catrobat.catroid.ProjectManager;
-import org.catrobat.catroid.common.FlavoredConstants;
import org.catrobat.catroid.content.Project;
import org.catrobat.catroid.io.ResourceImporter;
import org.catrobat.catroid.io.StorageOperations;
import org.catrobat.catroid.io.XstreamSerializer;
import org.catrobat.catroid.ui.settingsfragments.SettingsFragment;
import org.catrobat.catroid.utils.FileMetaDataExtractor;
-import org.catrobat.catroid.utils.PathBuilder;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -50,7 +48,7 @@
import static org.catrobat.catroid.common.Constants.IMAGE_DIRECTORY_NAME;
import static org.catrobat.catroid.common.Constants.SOUND_DIRECTORY_NAME;
-import static org.catrobat.catroid.utils.PathBuilder.buildScenePath;
+import static org.catrobat.catroid.common.FlavoredConstants.DEFAULT_ROOT_DIRECTORY;
@RunWith(AndroidJUnit4.class)
public class UtilFileSizeTranslationsTest {
@@ -59,47 +57,51 @@ public class UtilFileSizeTranslationsTest {
private File projectFolder;
private File imageFile;
private File soundFile;
- private NumberFormat currentNumberformat;
private String projectName = "fileSizeArabicTest";
@Before
public void setUp() throws Exception {
SettingsFragment.updateLocale(getTargetContext(), new Locale("ar"));
-
createProjectWithFiles();
}
@After
public void tearDown() throws Exception {
SettingsFragment.updateLocale(getTargetContext(), defaultLocale);
- File projectDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName);
- if (projectDir.exists() && projectDir.isDirectory()) {
+ File projectDir = new File(DEFAULT_ROOT_DIRECTORY, projectName);
+ if (projectDir.isDirectory()) {
StorageOperations.deleteDir(projectDir);
}
}
@Test
public void testFileSize() {
- currentNumberformat = NumberFormat.getInstance(Locale.getDefault());
+ NumberFormat currentNumberFormat = NumberFormat.getInstance(Locale.getDefault());
+ currentNumberFormat.setMaximumFractionDigits(1);
String arabicKb = "كيلوبايت";
- double soundExpectedSize = 63.3;
- double lookExpectedSize = 2.6;
- double projectExpectedSize = 67.4;
- assertEquals(currentNumberformat.format(soundExpectedSize) + " " + arabicKb, FileMetaDataExtractor.getSizeAsString(soundFile, InstrumentationRegistry.getTargetContext()));
+ double soundExpectedSize = scaleFileSize(FileMetaDataExtractor.getSizeOfFileOrDirectoryInByte(soundFile));
+ double lookExpectedSize = scaleFileSize(FileMetaDataExtractor.getSizeOfFileOrDirectoryInByte(imageFile));
+ double projectExpectedSize =
+ scaleFileSize(FileMetaDataExtractor.getSizeOfFileOrDirectoryInByte(projectFolder));
+
+ assertEquals(currentNumberFormat.format(soundExpectedSize) + " " + arabicKb,
+ FileMetaDataExtractor.getSizeAsString(soundFile, InstrumentationRegistry.getTargetContext()));
- assertEquals(currentNumberformat.format(lookExpectedSize) + " " + arabicKb, FileMetaDataExtractor.getSizeAsString(imageFile, InstrumentationRegistry.getTargetContext()));
+ assertEquals(currentNumberFormat.format(lookExpectedSize) + " " + arabicKb,
+ FileMetaDataExtractor.getSizeAsString(imageFile, InstrumentationRegistry.getTargetContext()));
- assertEquals(currentNumberformat.format(projectExpectedSize) + " " + arabicKb, FileMetaDataExtractor.getSizeAsString(projectFolder, InstrumentationRegistry.getTargetContext()));
+ assertEquals(currentNumberFormat.format(projectExpectedSize) + " " + arabicKb,
+ FileMetaDataExtractor.getSizeAsString(projectFolder, InstrumentationRegistry.getTargetContext()));
}
- public void createProjectWithFiles() throws IOException {
+ private void createProjectWithFiles() throws IOException {
Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
XstreamSerializer.getInstance().saveProject(project);
ProjectManager.getInstance().setCurrentProject(project);
ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene());
- projectFolder = new File(PathBuilder.buildProjectPath(projectName));
+ projectFolder = new File(DEFAULT_ROOT_DIRECTORY, projectName);
imageFile = ResourceImporter.createImageFileFromResourcesInDirectory(
InstrumentationRegistry.getContext().getResources(),
@@ -111,7 +113,11 @@ public void createProjectWithFiles() throws IOException {
soundFile = ResourceImporter.createSoundFileFromResourcesInDirectory(
InstrumentationRegistry.getContext().getResources(),
org.catrobat.catroid.test.R.raw.longsound,
- new File(buildScenePath(project.getName(), project.getDefaultScene().getName()), SOUND_DIRECTORY_NAME),
+ new File(project.getDefaultScene().getDirectory(), SOUND_DIRECTORY_NAME),
"longsound.mp3");
}
+
+ private double scaleFileSize(long sizeInByte) {
+ return sizeInByte / (double) 1024;
+ }
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveBackwardBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveBackwardBrickTest.java
deleted file mode 100644
index 64d0376119f..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveBackwardBrickTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.DroneMoveBackwardBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ARDroneMoveBackwardBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialSeconds = 1000;
- int initialPower = 20;
- BrickTestUtils.createProjectAndGetStartScript("ARDroneMoveBackwardBrickTest").addBrick(new
- DroneMoveBackwardBrick(initialSeconds, initialPower));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testARDroneMoveBackwardBrick() {
- int secondsValue = 3;
- int powerValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_drone_move_backward);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_move_backward_edit_text_second)
- .performEnterNumber(secondsValue)
- .checkShowsNumber(secondsValue);
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_move_backward_edit_text_power)
- .performEnterNumber(powerValue)
- .checkShowsNumber(powerValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveDownBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveDownBrickTest.java
deleted file mode 100644
index 2d7773fb001..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveDownBrickTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.DroneMoveDownBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ARDroneMoveDownBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialSeconds = 1000;
- int initialPower = 20;
- BrickTestUtils.createProjectAndGetStartScript("ARDroneMoveDownBrickTest").addBrick(new
- DroneMoveDownBrick(initialSeconds, initialPower));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testARDroneMoveDownBrick() {
- int secondsValue = 3;
- int powerValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_drone_move_down);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_move_down_edit_text_second)
- .performEnterNumber(secondsValue)
- .checkShowsNumber(secondsValue);
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_move_down_edit_text_power)
- .performEnterNumber(powerValue)
- .checkShowsNumber(powerValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveForwardBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveForwardBrickTest.java
deleted file mode 100644
index 0a4c60ee63e..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveForwardBrickTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.DroneMoveForwardBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ARDroneMoveForwardBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialSeconds = 1000;
- int initialPower = 20;
- BrickTestUtils.createProjectAndGetStartScript("ARDroneMoveForwardBrickTest").addBrick(new
- DroneMoveForwardBrick(initialSeconds, initialPower));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testARDroneMoveForwardBrick() {
- int secondsValue = 3;
- int powerValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_drone_move_forward);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_move_forward_edit_text_second)
- .performEnterNumber(secondsValue)
- .checkShowsNumber(secondsValue);
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_move_forward_edit_text_power)
- .performEnterNumber(powerValue)
- .checkShowsNumber(powerValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveLeftBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveLeftBrickTest.java
deleted file mode 100644
index 2e9df60f55b..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveLeftBrickTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.DroneMoveLeftBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ARDroneMoveLeftBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialSeconds = 1000;
- int initialPower = 20;
- BrickTestUtils.createProjectAndGetStartScript("ARDroneMoveLeftBrickTest").addBrick(new
- DroneMoveLeftBrick(initialSeconds, initialPower));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testARDroneMoveLeftBrick() {
- int secondsValue = 3;
- int powerValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_drone_move_left);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_move_left_edit_text_second)
- .performEnterNumber(secondsValue)
- .checkShowsNumber(secondsValue);
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_move_left_edit_text_power)
- .performEnterNumber(powerValue)
- .checkShowsNumber(powerValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveRightBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveRightBrickTest.java
deleted file mode 100644
index 018d7984ba8..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveRightBrickTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.DroneMoveRightBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ARDroneMoveRightBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialSeconds = 1000;
- int initialPower = 20;
- BrickTestUtils.createProjectAndGetStartScript("ARDroneMoveRightBrickTest").addBrick(new
- DroneMoveRightBrick(initialSeconds, initialPower));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testARDroneMoveRightBrick() {
- int secondsValue = 3;
- int powerValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_drone_move_right);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_move_right_edit_text_second)
- .performEnterNumber(secondsValue)
- .checkShowsNumber(secondsValue);
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_move_right_edit_text_power)
- .performEnterNumber(powerValue)
- .checkShowsNumber(powerValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveUpBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveUpBrickTest.java
deleted file mode 100644
index c6a01c6d108..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneMoveUpBrickTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.DroneMoveUpBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ARDroneMoveUpBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialSeconds = 1000;
- int initialPower = 20;
- BrickTestUtils.createProjectAndGetStartScript("ARDroneMoveUpBrickTest").addBrick(new
- DroneMoveUpBrick(initialSeconds, initialPower));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testARDroneMoveUpBrick() {
- int secondsValue = 3;
- int powerValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_drone_move_up);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_move_up_edit_text_second)
- .performEnterNumber(secondsValue)
- .checkShowsNumber(secondsValue);
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_move_up_edit_text_power)
- .performEnterNumber(powerValue)
- .checkShowsNumber(powerValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDronePlayLedAnimationBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDronePlayLedAnimationBrickTest.java
deleted file mode 100644
index 768b5873882..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDronePlayLedAnimationBrickTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import com.parrot.freeflight.drone.DroneProxy.ARDRONE_LED_ANIMATION;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.DronePlayLedAnimationBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ARDronePlayLedAnimationBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
-
- BrickTestUtils.createProjectAndGetStartScript("ARDronePlayLedAnimationBrickTest")
- .addBrick(new DronePlayLedAnimationBrick(ARDRONE_LED_ANIMATION.ARDRONE_LED_ANIMATION_BLINK_GREEN_RED));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testARDronePlayLedAnimationBrick() {
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_drone_play_led_animation);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_drone_play_led_animation_spinner)
- .checkShowsText(R.string.drone_animation_blinkgreenred);
-
- List spinnerValuesResourceIds = Arrays.asList(
- R.string.drone_animation_blinkgreenred,
- R.string.drone_animation_blinkgreen,
- R.string.drone_animation_blinkred,
- R.string.drone_animation_blinkorange,
- R.string.drone_animation_snakegreenred,
- R.string.drone_animation_fire,
- R.string.drone_animation_standard,
- R.string.drone_animation_red,
- R.string.drone_animation_green,
- R.string.drone_animation_redsnake,
- R.string.drone_animation_blank,
- R.string.drone_animation_rightmissile,
- R.string.drone_animation_leftmissile,
- R.string.drone_animation_doublemissile,
- R.string.drone_animation_frontleftgreenothersred,
- R.string.drone_animation_frontrightgreenothersred,
- R.string.drone_animation_rearrightgreenothersred,
- R.string.drone_animation_rearleftgreenothersred,
- R.string.drone_animation_leftgreenrightred,
- R.string.drone_animation_leftredrightgreen,
- R.string.drone_animation_blinkstandard);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_drone_play_led_animation_spinner)
- .checkStringIdValuesAvailable(spinnerValuesResourceIds);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneTurnLeftBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneTurnLeftBrickTest.java
deleted file mode 100644
index 8013063c5e8..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneTurnLeftBrickTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.DroneTurnLeftBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ARDroneTurnLeftBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialSeconds = 1000;
- int initialPower = 20;
- BrickTestUtils.createProjectAndGetStartScript("ARDroneTurnLeftBrickTest").addBrick(new
- DroneTurnLeftBrick(initialSeconds, initialPower));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testARDroneTurnLeftBrick() {
- int secondsValue = 3;
- int powerValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_drone_turn_left);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_turn_left_edit_text_second)
- .performEnterNumber(secondsValue)
- .checkShowsNumber(secondsValue);
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_turn_left_edit_text_power)
- .performEnterNumber(powerValue)
- .checkShowsNumber(powerValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneTurnRightBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneTurnRightBrickTest.java
deleted file mode 100644
index 8ad5ccb6f5e..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ARDroneTurnRightBrickTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.DroneTurnRightBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ARDroneTurnRightBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialSeconds = 1000;
- int initialPower = 20;
- BrickTestUtils.createProjectAndGetStartScript("ARDroneTurnRightBrickTest").addBrick(new
- DroneTurnRightBrick(initialSeconds, initialPower));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testARDroneTurnRightBrick() {
- int secondsValue = 3;
- int powerValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_drone_turn_right);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_turn_right_edit_text_second)
- .performEnterNumber(secondsValue)
- .checkShowsNumber(secondsValue);
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_drone_turn_right_edit_text_power)
- .performEnterNumber(powerValue)
- .checkShowsNumber(powerValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/AddItemToUserListTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/AddItemToUserListTest.java
deleted file mode 100644
index a2e120dd1ba..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/AddItemToUserListTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.AddItemToUserListBrick;
-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.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper.onDataList;
-import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor;
-
-@RunWith(AndroidJUnit4.class)
-public class AddItemToUserListTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("addItemToUserListTest").addBrick(new AddItemToUserListBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testAddItemToUserListBrick() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_add_item_to_userlist);
- onView(withId(R.id.brick_add_item_to_userlist_edit_text)).perform(click());
-
- onFormulaEditor()
- .performOpenDataFragment();
- onDataList()
- .performAdd("newList", FormulaEditorDataListWrapper.ItemType.LIST)
- .performClose();
- onFormulaEditor()
- .performCloseAndSave();
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_add_item_to_userlist_edit_text)
- .performEnterNumber(42)
- .checkShowsNumber(42);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ArduinoSendDigitalValueBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ArduinoSendDigitalValueBrickTest.java
deleted file mode 100644
index f8d9151f546..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ArduinoSendDigitalValueBrickTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.ArduinoSendDigitalValueBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ArduinoSendDigitalValueBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("arduinoSendDigitalValueBricktest1")
- .addBrick(new ArduinoSendDigitalValueBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testArduinoSendDigitalValueBrick() {
- int valToChange = 17;
- int pinToChange = 2;
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_arduino_select_digital_value);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_arduino_set_digital_pin_edit_text)
- .performEnterNumber(pinToChange)
- .checkShowsNumber(pinToChange);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_arduino_set_digital_value_edit_text)
- .performEnterNumber(valToChange)
- .checkShowsNumber(valToChange);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ArduinoSendPWMValueBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ArduinoSendPWMValueBrickTest.java
deleted file mode 100644
index 087bfbad54c..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ArduinoSendPWMValueBrickTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.ArduinoSendPWMValueBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ArduinoSendPWMValueBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("ArduinoSendPWMValueBrick")
- .addBrick(new ArduinoSendPWMValueBrick(3, 0));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testArduinoSendPWMValueBrick() {
- int pinNumber = 5;
- int analogValue = 255;
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_arduino_select_analog_value);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_arduino_set_analog_pin_edit_text)
- .performEnterNumber(pinNumber)
- .checkShowsNumber(pinNumber);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_arduino_set_analog_value_edit_text)
- .performEnterNumber(analogValue)
- .checkShowsNumber(analogValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/AskBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/AskBrickTest.java
deleted file mode 100644
index 3ffaf3c45da..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/AskBrickTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-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.AskBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-import static org.catrobat.catroid.uiespresso.util.UiTestUtils.getResourcesString;
-
-@RunWith(AndroidJUnit4.class)
-public class AskBrickTest {
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- createProject("AskBrickTest");
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testAskBrick() {
- int askBrickPosition = 1;
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
-
- onBrickAtPosition(askBrickPosition).checkShowsText(R.string.brick_ask_label);
- onBrickAtPosition(askBrickPosition).checkShowsText(R.string.brick_ask_store);
-
- String question = "Will it work?";
- onBrickAtPosition(askBrickPosition).onFormulaTextField(R.id.brick_ask_question_edit_text)
- .performEnterString(question)
- .checkShowsText(question);
- }
-
- private void createProject(String projectName) {
- Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
- Sprite sprite1 = new Sprite("testSprite");
- Script sprite1StartScript = new StartScript();
- sprite1.addScript(sprite1StartScript);
-
- project.getDefaultScene().addSprite(sprite1);
- ProjectManager.getInstance().setCurrentProject(project);
- ProjectManager.getInstance().setCurrentSprite(sprite1);
-
- sprite1StartScript.addBrick(new AskBrick(getResourcesString(R.string.brick_ask_default_question)));
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BrickValueParameterTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BrickValueParameterTest.java
deleted file mode 100644
index 5c9fb40e6a9..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BrickValueParameterTest.java
+++ /dev/null
@@ -1,1180 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.ProjectManager;
-import org.catrobat.catroid.R;
-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.AddItemToUserListBrick;
-import org.catrobat.catroid.content.bricks.ArduinoSendDigitalValueBrick;
-import org.catrobat.catroid.content.bricks.ArduinoSendPWMValueBrick;
-import org.catrobat.catroid.content.bricks.AskBrick;
-import org.catrobat.catroid.content.bricks.AskSpeechBrick;
-import org.catrobat.catroid.content.bricks.BroadcastBrick;
-import org.catrobat.catroid.content.bricks.BroadcastReceiverBrick;
-import org.catrobat.catroid.content.bricks.BroadcastWaitBrick;
-import org.catrobat.catroid.content.bricks.CameraBrick;
-import org.catrobat.catroid.content.bricks.ChangeBrightnessByNBrick;
-import org.catrobat.catroid.content.bricks.ChangeColorByNBrick;
-import org.catrobat.catroid.content.bricks.ChangeSizeByNBrick;
-import org.catrobat.catroid.content.bricks.ChangeTransparencyByNBrick;
-import org.catrobat.catroid.content.bricks.ChangeVariableBrick;
-import org.catrobat.catroid.content.bricks.ChangeVolumeByNBrick;
-import org.catrobat.catroid.content.bricks.ChangeXByNBrick;
-import org.catrobat.catroid.content.bricks.ChangeYByNBrick;
-import org.catrobat.catroid.content.bricks.ChooseCameraBrick;
-import org.catrobat.catroid.content.bricks.ClearBackgroundBrick;
-import org.catrobat.catroid.content.bricks.ClearGraphicEffectBrick;
-import org.catrobat.catroid.content.bricks.CloneBrick;
-import org.catrobat.catroid.content.bricks.ComeToFrontBrick;
-import org.catrobat.catroid.content.bricks.DeleteItemOfUserListBrick;
-import org.catrobat.catroid.content.bricks.DeleteThisCloneBrick;
-import org.catrobat.catroid.content.bricks.DroneEmergencyBrick;
-import org.catrobat.catroid.content.bricks.DroneMoveBackwardBrick;
-import org.catrobat.catroid.content.bricks.DroneMoveDownBrick;
-import org.catrobat.catroid.content.bricks.DroneMoveForwardBrick;
-import org.catrobat.catroid.content.bricks.DroneMoveLeftBrick;
-import org.catrobat.catroid.content.bricks.DroneMoveRightBrick;
-import org.catrobat.catroid.content.bricks.DroneMoveUpBrick;
-import org.catrobat.catroid.content.bricks.DroneSwitchCameraBrick;
-import org.catrobat.catroid.content.bricks.DroneTakeOffLandBrick;
-import org.catrobat.catroid.content.bricks.DroneTurnLeftBrick;
-import org.catrobat.catroid.content.bricks.DroneTurnRightBrick;
-import org.catrobat.catroid.content.bricks.FlashBrick;
-import org.catrobat.catroid.content.bricks.ForeverBrick;
-import org.catrobat.catroid.content.bricks.GlideToBrick;
-import org.catrobat.catroid.content.bricks.GoNStepsBackBrick;
-import org.catrobat.catroid.content.bricks.GoToBrick;
-import org.catrobat.catroid.content.bricks.HideBrick;
-import org.catrobat.catroid.content.bricks.HideTextBrick;
-import org.catrobat.catroid.content.bricks.IfLogicBeginBrick;
-import org.catrobat.catroid.content.bricks.IfOnEdgeBounceBrick;
-import org.catrobat.catroid.content.bricks.IfThenLogicBeginBrick;
-import org.catrobat.catroid.content.bricks.InsertItemIntoUserListBrick;
-import org.catrobat.catroid.content.bricks.LegoEv3MotorMoveBrick;
-import org.catrobat.catroid.content.bricks.LegoEv3MotorStopBrick;
-import org.catrobat.catroid.content.bricks.LegoEv3MotorTurnAngleBrick;
-import org.catrobat.catroid.content.bricks.LegoEv3PlayToneBrick;
-import org.catrobat.catroid.content.bricks.LegoEv3SetLedBrick;
-import org.catrobat.catroid.content.bricks.LegoNxtMotorMoveBrick;
-import org.catrobat.catroid.content.bricks.LegoNxtMotorStopBrick;
-import org.catrobat.catroid.content.bricks.LegoNxtMotorTurnAngleBrick;
-import org.catrobat.catroid.content.bricks.LegoNxtPlayToneBrick;
-import org.catrobat.catroid.content.bricks.MoveNStepsBrick;
-import org.catrobat.catroid.content.bricks.NextLookBrick;
-import org.catrobat.catroid.content.bricks.NoteBrick;
-import org.catrobat.catroid.content.bricks.PenDownBrick;
-import org.catrobat.catroid.content.bricks.PenUpBrick;
-import org.catrobat.catroid.content.bricks.PhiroIfLogicBeginBrick;
-import org.catrobat.catroid.content.bricks.PhiroMotorMoveBackwardBrick;
-import org.catrobat.catroid.content.bricks.PhiroMotorMoveForwardBrick;
-import org.catrobat.catroid.content.bricks.PhiroMotorStopBrick;
-import org.catrobat.catroid.content.bricks.PhiroPlayToneBrick;
-import org.catrobat.catroid.content.bricks.PhiroRGBLightBrick;
-import org.catrobat.catroid.content.bricks.PlaceAtBrick;
-import org.catrobat.catroid.content.bricks.PlaySoundAndWaitBrick;
-import org.catrobat.catroid.content.bricks.PlaySoundBrick;
-import org.catrobat.catroid.content.bricks.PointInDirectionBrick;
-import org.catrobat.catroid.content.bricks.PointToBrick;
-import org.catrobat.catroid.content.bricks.PreviousLookBrick;
-import org.catrobat.catroid.content.bricks.RaspiIfLogicBeginBrick;
-import org.catrobat.catroid.content.bricks.RaspiPwmBrick;
-import org.catrobat.catroid.content.bricks.RaspiSendDigitalValueBrick;
-import org.catrobat.catroid.content.bricks.RepeatBrick;
-import org.catrobat.catroid.content.bricks.RepeatUntilBrick;
-import org.catrobat.catroid.content.bricks.ReplaceItemInUserListBrick;
-import org.catrobat.catroid.content.bricks.SayBubbleBrick;
-import org.catrobat.catroid.content.bricks.SayForBubbleBrick;
-import org.catrobat.catroid.content.bricks.SceneStartBrick;
-import org.catrobat.catroid.content.bricks.SceneTransitionBrick;
-import org.catrobat.catroid.content.bricks.SetBackgroundAndWaitBrick;
-import org.catrobat.catroid.content.bricks.SetBackgroundBrick;
-import org.catrobat.catroid.content.bricks.SetBrightnessBrick;
-import org.catrobat.catroid.content.bricks.SetColorBrick;
-import org.catrobat.catroid.content.bricks.SetLookBrick;
-import org.catrobat.catroid.content.bricks.SetPenSizeBrick;
-import org.catrobat.catroid.content.bricks.SetRotationStyleBrick;
-import org.catrobat.catroid.content.bricks.SetSizeToBrick;
-import org.catrobat.catroid.content.bricks.SetTransparencyBrick;
-import org.catrobat.catroid.content.bricks.SetVariableBrick;
-import org.catrobat.catroid.content.bricks.SetVolumeToBrick;
-import org.catrobat.catroid.content.bricks.SetXBrick;
-import org.catrobat.catroid.content.bricks.SetYBrick;
-import org.catrobat.catroid.content.bricks.ShowBrick;
-import org.catrobat.catroid.content.bricks.ShowTextBrick;
-import org.catrobat.catroid.content.bricks.SpeakAndWaitBrick;
-import org.catrobat.catroid.content.bricks.SpeakBrick;
-import org.catrobat.catroid.content.bricks.StitchBrick;
-import org.catrobat.catroid.content.bricks.StopAllSoundsBrick;
-import org.catrobat.catroid.content.bricks.StopScriptBrick;
-import org.catrobat.catroid.content.bricks.ThinkBubbleBrick;
-import org.catrobat.catroid.content.bricks.ThinkForBubbleBrick;
-import org.catrobat.catroid.content.bricks.TurnLeftBrick;
-import org.catrobat.catroid.content.bricks.TurnRightBrick;
-import org.catrobat.catroid.content.bricks.VibrationBrick;
-import org.catrobat.catroid.content.bricks.WaitBrick;
-import org.catrobat.catroid.content.bricks.WaitUntilBrick;
-import org.catrobat.catroid.content.bricks.WhenBackgroundChangesBrick;
-import org.catrobat.catroid.content.bricks.WhenBrick;
-import org.catrobat.catroid.content.bricks.WhenClonedBrick;
-import org.catrobat.catroid.content.bricks.WhenConditionBrick;
-import org.catrobat.catroid.content.bricks.WhenRaspiPinChangedBrick;
-import org.catrobat.catroid.content.bricks.WhenStartedBrick;
-import org.catrobat.catroid.content.bricks.WhenTouchDownBrick;
-import org.catrobat.catroid.physics.content.bricks.CollisionReceiverBrick;
-import org.catrobat.catroid.physics.content.bricks.SetBounceBrick;
-import org.catrobat.catroid.physics.content.bricks.SetFrictionBrick;
-import org.catrobat.catroid.physics.content.bricks.SetGravityBrick;
-import org.catrobat.catroid.physics.content.bricks.SetMassBrick;
-import org.catrobat.catroid.physics.content.bricks.SetPhysicsObjectTypeBrick;
-import org.catrobat.catroid.physics.content.bricks.SetVelocityBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.UiTestUtils;
-import org.catrobat.catroid.uiespresso.util.matchers.BrickCategoryListMatchers;
-import org.catrobat.catroid.uiespresso.util.matchers.BrickPrototypeListMatchers;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.catrobat.catroid.utils.Utils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static android.support.test.espresso.Espresso.onData;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withSpinnerText;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import static org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_MINDSTORMS_EV3_BRICKS_ENABLED;
-import static org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_MINDSTORMS_NXT_BRICKS_ENABLED;
-import static org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_SHOW_ARDUINO_BRICKS;
-import static org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_SHOW_EMBROIDERY_BRICKS;
-import static org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_SHOW_NFC_BRICKS;
-import static org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_SHOW_PARROT_AR_DRONE_BRICKS;
-import static org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_SHOW_PHIRO_BRICKS;
-import static org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_SHOW_RASPI_BRICKS;
-import static org.catrobat.catroid.uiespresso.util.UiTestUtils.getResources;
-import static org.catrobat.catroid.uiespresso.util.UiTestUtils.getResourcesString;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.core.Is.is;
-
-@RunWith(AndroidJUnit4.class)
-public class BrickValueParameterTest {
-
- private String nameSpriteOne = "testSpriteOne";
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- private List allPeripheralCategories = new ArrayList<>(Arrays.asList(SETTINGS_MINDSTORMS_NXT_BRICKS_ENABLED,
- SETTINGS_MINDSTORMS_EV3_BRICKS_ENABLED, SETTINGS_SHOW_PARROT_AR_DRONE_BRICKS, SETTINGS_SHOW_PHIRO_BRICKS,
- SETTINGS_SHOW_ARDUINO_BRICKS, SETTINGS_SHOW_RASPI_BRICKS, SETTINGS_SHOW_NFC_BRICKS, SETTINGS_SHOW_EMBROIDERY_BRICKS));
- private List enabledByThisTestPeripheralCategories = new ArrayList<>();
-
- @Before
- public void setUp() throws Exception {
- createProject(getClass().getSimpleName());
- baseActivityTestRule.launchActivity();
-
- SharedPreferences sharedPreferences = PreferenceManager
- .getDefaultSharedPreferences(InstrumentationRegistry.getTargetContext());
-
- for (String category : allPeripheralCategories) {
- boolean categoryEnabled = sharedPreferences.getBoolean(category, false);
- if (!categoryEnabled) {
- sharedPreferences.edit().putBoolean(category, true).commit();
- enabledByThisTestPeripheralCategories.add(category);
- }
- }
- }
-
- @After
- public void tearDown() {
- SharedPreferences sharedPreferences = PreferenceManager
- .getDefaultSharedPreferences(InstrumentationRegistry.getTargetContext());
- for (String category : enabledByThisTestPeripheralCategories) {
- sharedPreferences.edit().putBoolean(category, false).commit();
- }
- enabledByThisTestPeripheralCategories.clear();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void categoriesTest() {
- onView(withId(R.id.button_add))
- .perform(click());
-
- List categoryResourceStrings = Arrays.asList(
- R.string.category_embroidery,
- R.string.category_event,
- R.string.category_control,
- R.string.category_motion,
- R.string.category_sound,
- R.string.category_looks,
- R.string.category_pen,
- R.string.category_data,
- R.string.category_lego_nxt,
- R.string.category_lego_ev3,
- R.string.category_arduino,
- R.string.category_drone,
- R.string.category_phiro,
- R.string.category_raspi);
-
- for (Integer categoryStringResource : categoryResourceStrings) {
- onData(allOf(is(instanceOf(String.class)), is(UiTestUtils.getResourcesString(categoryStringResource))))
- .inAdapterView(BrickCategoryListMatchers.isBrickCategoryView())
- .check(matches(isDisplayed()));
- }
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testEventBricksDefaultValues() {
- openCategory(R.string.category_event);
-
- checkIfBrickShowsText(WhenStartedBrick.class, R.string.brick_when_started);
-
- checkIfBrickShowsText(WhenBrick.class, R.string.brick_when);
-
- checkIfBrickShowsText(WhenTouchDownBrick.class, R.string.brick_when_touched);
-
- checkIfBrickShowsText(BroadcastReceiverBrick.class, R.string.brick_broadcast_receive);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(BroadcastReceiverBrick.class, R.id.brick_broadcast_spinner,
- R.string.brick_broadcast_default_value);
-
- checkIfBrickAtPositionShowsText(BroadcastBrick.class, 0, R.string.brick_broadcast);
- checkIfBrickAtPositionShowsSpinnerWithEditTextOverlayWithText(BroadcastBrick.class, 0, R.id.brick_broadcast_spinner,
- R.string.brick_broadcast_default_value);
-
- checkIfBrickShowsText(BroadcastWaitBrick.class, R.string.brick_broadcast_wait);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(BroadcastReceiverBrick.class, R.id.brick_broadcast_spinner,
- R.string.brick_broadcast_default_value);
-
- checkIfBrickShowsText(WhenConditionBrick.class, R.string.brick_when_becomes_true);
- checkIfBrickShowsText(WhenConditionBrick.class, R.string.brick_when_condition_when);
- checkIfBrickShowsEditTextWithText(WhenConditionBrick.class, R.id.brick_when_condition_edit_text, "1 < 2 ");
-
- checkIfBrickShowsText(CollisionReceiverBrick.class, R.string.brick_collision_receive);
- onData(instanceOf(CollisionReceiverBrick.class)).inAdapterView(BrickPrototypeListMatchers
- .isBrickPrototypeView())
- .onChildView(withId(R.id.brick_collision_receive_spinner))
- .onChildView(withText(CollisionReceiverBrick.ANYTHING_ESCAPE_CHAR
- + "any edge, actor, or object" + CollisionReceiverBrick.ANYTHING_ESCAPE_CHAR))
- .check(matches(isDisplayed()));
-
- checkIfBrickShowsText(WhenBackgroundChangesBrick.class, R.string.brick_when_background);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(WhenBackgroundChangesBrick.class,
- R.id.brick_when_background_spinner,
- R.string.new_option);
-
- checkIfBrickShowsText(WhenClonedBrick.class, R.string.brick_when_cloned);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testMotionBricksDefaultValues() {
- openCategory(R.string.category_motion);
-
- //Place at
- checkIfBrickShowsText(PlaceAtBrick.class, R.string.brick_place_at);
- checkIfBrickShowsText(PlaceAtBrick.class, R.string.x_label);
- checkIfBrickShowsText(PlaceAtBrick.class, R.string.y_label);
- checkIfBrickShowsEditTextWithText(PlaceAtBrick.class, R.id.brick_place_at_edit_text_x, "100 ");
- checkIfBrickShowsEditTextWithText(PlaceAtBrick.class, R.id.brick_place_at_edit_text_y, "200 ");
-
- //Set X to
- checkIfBrickShowsText(SetXBrick.class, R.string.brick_set_x);
- checkIfBrickShowsText(SetXBrick.class, "100 ");
-
- //Set Y to
- checkIfBrickShowsText(SetYBrick.class, R.string.brick_set_y);
- checkIfBrickShowsText(SetYBrick.class, "200 ");
-
- //Change X by
- checkIfBrickShowsText(ChangeXByNBrick.class, R.string.brick_change_x_by);
- checkIfBrickShowsText(ChangeXByNBrick.class, "10 ");
-
- //Change Y by
- checkIfBrickShowsText(ChangeYByNBrick.class, R.string.brick_change_y_by);
- checkIfBrickShowsText(ChangeYByNBrick.class, "10 ");
-
- //Go to
- checkIfBrickShowsText(GoToBrick.class, R.string.brick_go_to);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(GoToBrick.class,
- R.id.brick_go_to_spinner,
- R.string.brick_go_to_touch_position);
-
- //If on edge, bounce
- checkIfBrickShowsText(IfOnEdgeBounceBrick.class, R.string.brick_if_on_edge_bounce);
-
- //Move steps
- checkIfBrickShowsText(MoveNStepsBrick.class, R.string.brick_move);
- checkIfBrickShowsText(MoveNStepsBrick.class, "10 ");
-
- //Turn left degrees
- checkIfBrickShowsText(TurnLeftBrick.class, R.string.brick_turn_left);
- checkIfBrickShowsText(TurnLeftBrick.class, R.string.degrees);
- checkIfBrickShowsText(TurnLeftBrick.class, "15 ");
-
- //Turn right degrees
- checkIfBrickShowsText(TurnRightBrick.class, R.string.brick_turn_right);
- checkIfBrickShowsText(TurnRightBrick.class, R.string.degrees);
- checkIfBrickShowsText(TurnRightBrick.class, "15 ");
-
- //Point in direction degrees
- checkIfBrickShowsText(PointInDirectionBrick.class, R.string.brick_point_in_direction);
- checkIfBrickShowsText(PointInDirectionBrick.class, R.string.degrees);
- checkIfBrickShowsText(PointInDirectionBrick.class, "90 ");
-
- //Point towards
- checkIfBrickShowsText(PointToBrick.class, R.string.brick_point_to);
- checkIfBrickShowsSpinnerWithText(PointToBrick.class,
- R.id.brick_point_to_spinner,
- nameSpriteOne);
-
- //Set rotation style
- checkIfBrickShowsText(SetRotationStyleBrick.class, R.string.brick_set_rotation_style);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(SetRotationStyleBrick.class,
- R.id.brick_set_rotation_style_spinner,
- R.string.brick_set_rotation_style_lr);
-
- //Glide second
- checkIfBrickShowsText(GlideToBrick.class, R.string.brick_glide);
- checkIfBrickShowsText(GlideToBrick.class, R.string.brick_glide_to_x);
- checkIfBrickShowsText(GlideToBrick.class, R.string.y_label);
- checkIfBrickShowsText(GlideToBrick.class, "1 ");
- checkIfBrickShowsText(GlideToBrick.class, "100 ");
- checkIfBrickShowsText(GlideToBrick.class, "200 ");
-
- //Go back
- checkIfBrickShowsText(GoNStepsBackBrick.class, R.string.brick_go_back);
- checkIfBrickShowsText(GoNStepsBackBrick.class, "1 ");
-
- //Go to front
- checkIfBrickShowsText(ComeToFrontBrick.class, R.string.brick_come_to_front);
-
- //Vibrate for second
- checkIfBrickShowsText(VibrationBrick.class, R.string.brick_vibration);
- checkIfBrickShowsText(VibrationBrick.class, "1 ");
-
- //Set motion type to
- checkIfBrickShowsText(SetPhysicsObjectTypeBrick.class, R.string.brick_set_physics_object_type);
- checkIfBrickShowsSpinnerWithText(SetPhysicsObjectTypeBrick.class,
- R.id.brick_set_physics_object_type_spinner,
- R.string.brick_set_physics_object_type_dynamic);
-
- //Set velocity
- checkIfBrickShowsText(SetVelocityBrick.class, R.string.brick_set_velocity_to);
- checkIfBrickShowsText(SetVelocityBrick.class, R.string.x_label);
- checkIfBrickShowsText(SetVelocityBrick.class, R.string.y_label);
- checkIfBrickShowsText(SetVelocityBrick.class, R.string.brick_set_velocity_unit);
-
- //Rotate left
- checkIfBrickShowsText(TurnLeftBrick.class, R.string.brick_turn_left);
- checkIfBrickShowsText(TurnLeftBrick.class, R.string.degrees);
- checkIfBrickShowsText(TurnLeftBrick.class, "15 ");
-
- //Rotate right
- checkIfBrickShowsText(TurnRightBrick.class, R.string.brick_turn_right);
- checkIfBrickShowsText(TurnRightBrick.class, R.string.degrees);
- checkIfBrickShowsText(TurnRightBrick.class, "15 ");
-
- //Set gravity
- checkIfBrickShowsText(SetGravityBrick.class, R.string.brick_set_gravity_to);
- checkIfBrickShowsText(SetGravityBrick.class, R.string.x_label);
- checkIfBrickShowsText(SetGravityBrick.class, R.string.y_label);
- checkIfBrickShowsText(SetGravityBrick.class, R.string.brick_set_gravity_unit);
- checkIfBrickShowsText(SetGravityBrick.class, "0 ");
- checkIfBrickShowsText(SetGravityBrick.class, "- 10 ");
-
- //Set mass
- checkIfBrickShowsText(SetMassBrick.class, R.string.brick_set_mass);
- checkIfBrickShowsText(SetMassBrick.class, "1 ");
- checkIfBrickShowsText(SetMassBrick.class, R.string.brick_set_mass_unit);
-
- //Set bounce
- checkIfBrickShowsText(SetBounceBrick.class, R.string.brick_set_bounce_factor);
- checkIfBrickShowsText(SetBounceBrick.class, "80 ");
- checkIfBrickShowsText(SetBounceBrick.class, R.string.percent_symbol);
-
- //Set friction
- checkIfBrickShowsText(SetFrictionBrick.class, R.string.brick_set_friction);
- checkIfBrickShowsText(SetFrictionBrick.class, "20 ");
- checkIfBrickShowsText(SetFrictionBrick.class, R.string.percent_symbol);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testSoundBricksDefaultValues() {
- openCategory(R.string.category_sound);
-
- checkIfBrickAtPositionShowsText(PlaySoundBrick.class, 0, R.string.brick_play_sound);
- checkIfBrickAtPositionShowsSpinnerWithEditTextOverlayWithText(PlaySoundBrick.class, 0,
- R.id.brick_play_sound_spinner, R.string.new_option);
-
- checkIfBrickShowsText(PlaySoundAndWaitBrick.class, R.string.brick_play_sound_and_wait);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(PlaySoundAndWaitBrick.class, R.id.brick_play_sound_spinner,
- R.string.new_option);
-
- checkIfBrickShowsText(StopAllSoundsBrick.class, R.string.brick_stop_all_sounds);
-
- checkIfBrickShowsText(SetVolumeToBrick.class, R.string.brick_set_volume_to);
- checkIfBrickShowsText(SetVolumeToBrick.class, R.string.percent_symbol);
- checkIfBrickShowsEditTextWithText(SetVolumeToBrick.class, R.id.brick_set_volume_to_edit_text, "60 ");
-
- checkIfBrickShowsText(ChangeVolumeByNBrick.class, R.string.brick_change_volume_by);
- checkIfBrickShowsEditTextWithText(ChangeVolumeByNBrick.class, R.id.brick_change_volume_by_edit_text, "- 10 ");
-
- checkIfBrickShowsText(SpeakBrick.class, R.string.brick_speak);
- checkIfBrickShowsEditTextWithText(SpeakBrick.class, R.id.brick_speak_edit_text,
- "'" + getResourcesString(R.string.brick_speak_default_value) + "' ");
-
- checkIfBrickShowsText(SpeakAndWaitBrick.class, R.string.brick_speak_and_wait);
- checkIfBrickShowsEditTextWithText(SpeakAndWaitBrick.class, R.id.brick_speak_and_wait_edit_text,
- "'" + getResourcesString(R.string.brick_speak_default_value) + "' ");
-
- checkIfBrickShowsText(AskSpeechBrick.class, R.string.brick_ask_speech_label);
- checkIfBrickShowsEditTextWithText(AskSpeechBrick.class, R.id.brick_ask_speech_question_edit_text,
- "'" + getResourcesString(R.string.brick_ask_speech_default_question) + "' ");
- checkIfBrickShowsText(AskSpeechBrick.class, R.string.brick_ask_speech_store);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(AskSpeechBrick.class, R.id.brick_ask_speech_spinner,
- R.string.new_option);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testLooksBricksDefaultValues() {
- openCategory(R.string.category_looks);
-
- checkIfBrickAtPositionShowsText(SetLookBrick.class, 0, R.string.brick_set_look);
-
- checkIfBrickAtPositionShowsSpinnerWithEditTextOverlayWithText(SetLookBrick.class, 0,
- R.id.brick_set_look_spinner,
- R.string.new_option);
-
- checkIfBrickShowsText(NextLookBrick.class, R.string.brick_next_look);
-
- checkIfBrickShowsText(PreviousLookBrick.class, R.string.brick_previous_look);
-
- checkIfBrickShowsText(SetSizeToBrick.class, R.string.brick_set_size_to);
- checkIfBrickShowsText(SetSizeToBrick.class, R.string.percent_symbol);
- checkIfBrickShowsText(SetSizeToBrick.class, "60 ");
-
- checkIfBrickShowsText(ChangeSizeByNBrick.class, R.string.brick_change_size_by);
- checkIfBrickShowsText(ChangeSizeByNBrick.class, "10 ");
-
- checkIfBrickShowsText(HideBrick.class, R.string.brick_hide);
-
- checkIfBrickShowsText(ShowBrick.class, R.string.brick_show);
-
- checkIfBrickShowsText(AskBrick.class, R.string.brick_ask_label);
- checkIfBrickShowsText(AskBrick.class, "'" + getResourcesString(R.string.brick_ask_default_question) + "' ");
- checkIfBrickShowsText(AskBrick.class, R.string.brick_ask_store);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(AskBrick.class, R.id.brick_ask_spinner,
- R.string.new_option);
-
- checkIfBrickShowsText(SayBubbleBrick.class, R.string.brick_say_bubble);
- checkIfBrickShowsText(SayBubbleBrick.class,
- "'" + getResourcesString(R.string.brick_say_bubble_default_value) + "' ");
-
- checkIfBrickShowsText(SayForBubbleBrick.class, R.string.brick_say_bubble);
- checkIfBrickShowsText(SayForBubbleBrick.class,
- "'" + getResourcesString(R.string.brick_say_bubble_default_value) + "' ");
- checkIfBrickShowsText(SayForBubbleBrick.class, R.string.brick_think_say_for_text);
- checkIfBrickShowsText(SayForBubbleBrick.class, getResources()
- .getQuantityString(R.plurals.second_plural, Utils.convertDoubleToPluralInteger(BrickValues.DURATION)));
-
- checkIfBrickAtPositionShowsText(ThinkBubbleBrick.class, 1, R.string.brick_think_bubble);
- checkIfBrickAtPositionShowsText(ThinkBubbleBrick.class, 1,
- "'" + getResourcesString(R.string.brick_think_bubble_default_value) + "' ");
-
- checkIfBrickAtPositionShowsText(ThinkForBubbleBrick.class, 1, R.string.brick_think_bubble);
- checkIfBrickAtPositionShowsText(ThinkForBubbleBrick.class, 1,
- "'" + getResourcesString(R.string.brick_think_bubble_default_value) + "' ");
- checkIfBrickAtPositionShowsText(ThinkForBubbleBrick.class, 1, R.string.brick_think_say_for_text);
- checkIfBrickAtPositionShowsText(ThinkForBubbleBrick.class, 1, getResources()
- .getQuantityString(R.plurals.second_plural, Utils.convertDoubleToPluralInteger(BrickValues.DURATION)));
-
- checkIfBrickShowsText(SetTransparencyBrick.class, R.string.brick_set_transparency);
- checkIfBrickShowsText(SetTransparencyBrick.class, R.string.percent_symbol);
- checkIfBrickShowsText(SetTransparencyBrick.class, "50 ");
-
- checkIfBrickShowsText(ChangeTransparencyByNBrick.class, R.string.brick_change_ghost_effect);
- checkIfBrickShowsText(ChangeTransparencyByNBrick.class, "25 ");
-
- checkIfBrickShowsText(SetBrightnessBrick.class, R.string.brick_set_brightness);
- checkIfBrickShowsText(SetBrightnessBrick.class, "50 ");
- checkIfBrickShowsText(SetBrightnessBrick.class, R.string.percent_symbol);
-
- checkIfBrickShowsText(ChangeBrightnessByNBrick.class, R.string.brick_change_brightness);
- checkIfBrickShowsText(ChangeBrightnessByNBrick.class, "25 ");
-
- checkIfBrickShowsText(SetColorBrick.class, R.string.brick_set_color);
- checkIfBrickShowsText(SetColorBrick.class, "0 ");
-
- checkIfBrickShowsText(ChangeColorByNBrick.class, R.string.brick_change_color);
- checkIfBrickShowsText(ChangeColorByNBrick.class, "25 ");
-
- checkIfBrickShowsText(ClearGraphicEffectBrick.class, R.string.brick_clear_graphic_effect);
-
- checkIfBrickShowsText(WhenBackgroundChangesBrick.class, R.string.brick_when_background);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(WhenBackgroundChangesBrick.class,
- R.id.brick_when_background_spinner,
- R.string.new_option);
-
- checkIfBrickAtPositionShowsText(SetBackgroundBrick.class, 0, R.string.brick_set_background);
- checkIfBrickAtPositionShowsSpinnerWithEditTextOverlayWithText(SetBackgroundBrick.class, 0,
- R.id.brick_set_look_spinner,
- R.string.new_option);
-
- checkIfBrickAtPositionShowsText(SetBackgroundAndWaitBrick.class, 0, R.string.brick_set_background_and_wait);
- checkIfBrickAtPositionShowsSpinnerWithEditTextOverlayWithText(SetBackgroundAndWaitBrick.class, 0,
- R.id.brick_set_look_spinner,
- R.string.new_option);
-
- checkIfBrickShowsText(CameraBrick.class, R.string.brick_video);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(CameraBrick.class,
- R.id.brick_video_spinner,
- R.string.video_brick_camera_on);
-
- checkIfBrickShowsText(ChooseCameraBrick.class, R.string.brick_choose_camera);
- checkIfBrickShowsSpinnerWithText(ChooseCameraBrick.class,
- R.id.brick_choose_camera_spinner,
- R.string.choose_camera_front);
-
- checkIfBrickShowsText(FlashBrick.class, R.string.brick_flash);
- checkIfBrickShowsSpinnerWithText(FlashBrick.class,
- R.id.brick_flash_spinner,
- R.string.brick_flash_on);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testPenBricksDefaultValues() {
- openCategory(R.string.category_pen);
-
- checkIfBrickShowsText(PenDownBrick.class, R.string.brick_pen_down);
-
- checkIfBrickShowsText(PenUpBrick.class, R.string.brick_pen_up);
-
- checkIfBrickShowsText(SetPenSizeBrick.class, R.string.brick_pen_size);
- checkIfBrickShowsEditTextWithText(SetPenSizeBrick.class, R.id.brick_set_pen_size_edit_text, "3.15 ");
-
- checkIfBrickShowsText(ClearBackgroundBrick.class, R.string.brick_clear_background);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testDataBricksDefaultValues() {
- openCategory(R.string.category_data);
-
- checkIfBrickShowsText(SetVariableBrick.class, R.string.brick_set_variable);
- checkIfBrickShowsText(SetVariableBrick.class, R.string.to_label);
- checkIfBrickShowsText(SetVariableBrick.class, "1 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(SetVariableBrick.class,
- R.id.set_variable_spinner,
- R.string.new_option);
-
- checkIfBrickShowsText(ChangeVariableBrick.class, R.string.brick_change_variable);
- checkIfBrickShowsText(ChangeVariableBrick.class, R.string.by_label);
- checkIfBrickShowsText(ChangeVariableBrick.class, "1 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(ChangeVariableBrick.class,
- R.id.change_variable_spinner,
- R.string.new_option);
-
- checkIfBrickShowsText(ShowTextBrick.class, R.string.brick_show_variable);
- checkIfBrickShowsText(ShowTextBrick.class, R.string.brick_show_variable_position);
- checkIfBrickShowsText(ShowTextBrick.class, R.string.x_label);
- checkIfBrickShowsText(ShowTextBrick.class, R.string.y_label);
- checkIfBrickShowsText(ShowTextBrick.class, "100 ");
- checkIfBrickShowsText(ShowTextBrick.class, "200 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(ShowTextBrick.class,
- R.id.show_variable_spinner,
- R.string.new_option);
-
- checkIfBrickShowsText(HideTextBrick.class, R.string.brick_hide_variable);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(HideTextBrick.class,
- R.id.hide_variable_spinner,
- R.string.new_option);
-
- checkIfBrickShowsText(AddItemToUserListBrick.class, R.string.brick_add_item_to_userlist_add);
- checkIfBrickShowsText(AddItemToUserListBrick.class, R.string.brick_add_item_to_userlist);
- checkIfBrickShowsText(AddItemToUserListBrick.class, "1 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(AddItemToUserListBrick.class,
- R.id.add_item_to_userlist_spinner,
- R.string.new_option);
-
- checkIfBrickShowsText(DeleteItemOfUserListBrick.class, R.string.brick_delete_item_from_userlist_delete);
- checkIfBrickShowsText(DeleteItemOfUserListBrick.class, R.string.brick_delete_item_from_userlist);
- checkIfBrickShowsText(DeleteItemOfUserListBrick.class, "1 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(DeleteItemOfUserListBrick.class,
- R.id.delete_item_of_userlist_spinner,
- R.string.new_option);
-
- checkIfBrickShowsText(InsertItemIntoUserListBrick.class, R.string.brick_insert_item_into_userlist_insert_into);
- checkIfBrickShowsText(InsertItemIntoUserListBrick.class, R.string.brick_insert_item_into_userlist_into_list);
- checkIfBrickShowsText(InsertItemIntoUserListBrick.class, R.string.brick_insert_item_into_userlist_at_position);
- checkIfBrickShowsEditTextWithText(InsertItemIntoUserListBrick.class,
- R.id.brick_insert_item_into_userlist_value_edit_text, "1 ");
- checkIfBrickShowsEditTextWithText(InsertItemIntoUserListBrick.class,
- R.id.brick_insert_item_into_userlist_at_index_edit_text, "1 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(InsertItemIntoUserListBrick.class,
- R.id.insert_item_into_userlist_spinner,
- R.string.new_option);
-
- checkIfBrickShowsText(ReplaceItemInUserListBrick.class, R.string.brick_replace_item_in_userlist_replace_in_list);
- checkIfBrickShowsText(ReplaceItemInUserListBrick.class, R.string.brick_replace_item_in_userlist_item_at_index);
- checkIfBrickShowsText(ReplaceItemInUserListBrick.class, R.string.brick_replace_item_in_userlist_with_value);
- checkIfBrickShowsEditTextWithText(ReplaceItemInUserListBrick.class,
- R.id.brick_replace_item_in_userlist_at_index_edit_text, "1 ");
- checkIfBrickShowsEditTextWithText(ReplaceItemInUserListBrick.class,
- R.id.brick_replace_item_in_userlist_value_edit_text, "1 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(ReplaceItemInUserListBrick.class,
- R.id.replace_item_in_userlist_spinner,
- R.string.new_option);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testLegoNXTBricksDefaultValues() {
- openCategory(R.string.category_lego_nxt);
-
- checkIfBrickShowsText(LegoNxtMotorTurnAngleBrick.class, R.string.nxt_brick_motor_turn_angle);
- checkIfBrickShowsText(LegoNxtMotorTurnAngleBrick.class, R.string.nxt_motor_move_by);
- checkIfBrickShowsText(LegoNxtMotorTurnAngleBrick.class, R.string.degree_symbol);
- checkIfBrickShowsText(LegoNxtMotorTurnAngleBrick.class, "180 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(LegoNxtMotorTurnAngleBrick.class,
- R.id.lego_motor_turn_angle_spinner,
- R.string.nxt_motor_a);
-
- checkIfBrickShowsText(LegoNxtMotorStopBrick.class, R.string.nxt_motor_stop);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(LegoNxtMotorStopBrick.class,
- R.id.stop_motor_spinner,
- R.string.nxt_motor_a);
-
- checkIfBrickShowsText(LegoNxtMotorMoveBrick.class, R.string.nxt_brick_motor_move);
- checkIfBrickShowsText(LegoNxtMotorMoveBrick.class, R.string.nxt_motor_speed_to);
- checkIfBrickShowsText(LegoNxtMotorMoveBrick.class, R.string.percent_symbol);
- checkIfBrickShowsText(LegoNxtMotorMoveBrick.class, R.string.nxt_motor_speed);
- checkIfBrickShowsText(LegoNxtMotorMoveBrick.class, "100 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(LegoNxtMotorMoveBrick.class,
- R.id.lego_motor_action_spinner,
- R.string.nxt_motor_a);
-
- checkIfBrickShowsText(LegoNxtPlayToneBrick.class, R.string.nxt_play_tone);
- checkIfBrickShowsText(LegoNxtPlayToneBrick.class, R.string.nxt_tone_duration);
- checkIfBrickShowsText(LegoNxtPlayToneBrick.class, getResources().getQuantityString(R.plurals.second_plural,
- Utils.convertDoubleToPluralInteger(BrickValues.LEGO_DURATION)));
- checkIfBrickShowsText(LegoNxtPlayToneBrick.class, R.string.nxt_tone_frequency);
- checkIfBrickShowsText(LegoNxtPlayToneBrick.class, R.string.nxt_tone_hundred_hz);
- checkIfBrickShowsText(LegoNxtPlayToneBrick.class, "1 ");
- checkIfBrickShowsText(LegoNxtPlayToneBrick.class, "2 ");
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testLegoEV3BricksDefaultValues() {
- openCategory(R.string.category_lego_ev3);
-
- checkIfBrickShowsText(LegoEv3MotorTurnAngleBrick.class, R.string.ev3_brick_motor_turn_angle);
- checkIfBrickShowsText(LegoEv3MotorTurnAngleBrick.class, R.string.ev3_motor_move_by);
- checkIfBrickShowsText(LegoEv3MotorTurnAngleBrick.class, R.string.degree_symbol);
- checkIfBrickShowsText(LegoEv3MotorTurnAngleBrick.class, "180 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(LegoEv3MotorTurnAngleBrick.class,
- R.id.lego_ev3_motor_turn_angle_spinner,
- R.string.ev3_motor_a);
-
- checkIfBrickShowsText(LegoEv3MotorMoveBrick.class, R.string.ev3_motor_move);
- checkIfBrickShowsText(LegoEv3MotorMoveBrick.class, R.string.nxt_motor_speed_to);
- checkIfBrickShowsText(LegoEv3MotorMoveBrick.class, R.string.percent_symbol);
- checkIfBrickShowsText(LegoEv3MotorMoveBrick.class, R.string.nxt_motor_speed);
- checkIfBrickShowsText(LegoEv3MotorMoveBrick.class, "100 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(LegoEv3MotorMoveBrick.class,
- R.id.brick_ev3_motor_move_spinner,
- R.string.ev3_motor_a);
-
- checkIfBrickShowsText(LegoEv3MotorStopBrick.class, R.string.ev3_motor_stop);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(LegoEv3MotorStopBrick.class,
- R.id.ev3_stop_motor_spinner,
- R.string.ev3_motor_a);
-
- checkIfBrickShowsText(LegoEv3PlayToneBrick.class, R.string.ev3_play_tone);
- checkIfBrickShowsText(LegoEv3PlayToneBrick.class, R.string.ev3_tone_duration_for);
- checkIfBrickShowsText(LegoEv3PlayToneBrick.class, getResources().getQuantityString(R.plurals.second_plural,
- Utils.convertDoubleToPluralInteger(BrickValues.LEGO_DURATION)));
- checkIfBrickShowsText(LegoEv3PlayToneBrick.class, R.string.nxt_tone_frequency);
- checkIfBrickShowsText(LegoEv3PlayToneBrick.class, R.string.nxt_tone_hundred_hz);
- checkIfBrickShowsText(LegoEv3PlayToneBrick.class, R.string.ev3_tone_volume);
- checkIfBrickShowsText(LegoEv3PlayToneBrick.class, R.string.ev3_tone_percent);
- checkIfBrickShowsText(LegoEv3PlayToneBrick.class, "1 ");
- checkIfBrickShowsText(LegoEv3PlayToneBrick.class, "2 ");
- checkIfBrickShowsText(LegoEv3PlayToneBrick.class, "100 ");
-
- checkIfBrickShowsText(LegoEv3SetLedBrick.class, R.string.ev3_set_led_status);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(LegoEv3SetLedBrick.class,
- R.id.brick_ev3_set_led_spinner,
- R.string.ev3_led_status_green);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testDroneBricksDefaultValues() {
- openCategory(R.string.category_drone);
-
- checkIfBrickShowsText(DroneTakeOffLandBrick.class, R.string.brick_drone_takeoff_land);
-
- checkIfBrickShowsText(DroneEmergencyBrick.class, R.string.brick_drone_emergency);
-
- checkIfBrickShowsText(DroneMoveUpBrick.class, R.string.brick_drone_move_up);
- checkIfBrickShowsText(DroneMoveUpBrick.class, getResources().getQuantityString(R.plurals.second_plural,
- Utils.convertDoubleToPluralInteger(BrickValues.DRONE_MOVE_BRICK_DEFAULT_TIME_MILLISECONDS / 1000)));
- checkIfBrickShowsText(DroneMoveUpBrick.class, R.string.brick_drone_with_);
- checkIfBrickShowsText(DroneMoveUpBrick.class, UiTestUtils.getResourcesString(R.string.percent_symbol));
- checkIfBrickShowsText(DroneMoveUpBrick.class, UiTestUtils.getResourcesString(R.string.formula_editor_function_power));
- checkIfBrickShowsText(DroneMoveUpBrick.class, "1 ");
- checkIfBrickShowsText(DroneMoveUpBrick.class, "20 ");
-
- checkIfBrickShowsText(DroneMoveDownBrick.class, R.string.brick_drone_move_down);
- checkIfBrickShowsText(DroneMoveDownBrick.class, getResources().getQuantityString(R.plurals.second_plural,
- Utils.convertDoubleToPluralInteger(BrickValues.DRONE_MOVE_BRICK_DEFAULT_TIME_MILLISECONDS / 1000)));
- checkIfBrickShowsText(DroneMoveDownBrick.class, R.string.brick_drone_with_);
- checkIfBrickShowsText(DroneMoveDownBrick.class, UiTestUtils.getResourcesString(R.string.percent_symbol));
- checkIfBrickShowsText(DroneMoveDownBrick.class, UiTestUtils.getResourcesString(R.string
- .formula_editor_function_power));
- checkIfBrickShowsText(DroneMoveDownBrick.class, "1 ");
- checkIfBrickShowsText(DroneMoveDownBrick.class, "20 ");
-
- checkIfBrickShowsText(DroneMoveLeftBrick.class, R.string.brick_drone_move_left);
- checkIfBrickShowsText(DroneMoveLeftBrick.class, getResources().getQuantityString(R.plurals.second_plural,
- Utils.convertDoubleToPluralInteger(BrickValues.DRONE_MOVE_BRICK_DEFAULT_TIME_MILLISECONDS / 1000)));
- checkIfBrickShowsText(DroneMoveLeftBrick.class, R.string.brick_drone_with_);
- checkIfBrickShowsText(DroneMoveLeftBrick.class, UiTestUtils.getResourcesString(R.string.percent_symbol));
- checkIfBrickShowsText(DroneMoveLeftBrick.class, UiTestUtils.getResourcesString(R.string
- .formula_editor_function_power));
- checkIfBrickShowsText(DroneMoveLeftBrick.class, "1 ");
- checkIfBrickShowsText(DroneMoveLeftBrick.class, "20 ");
-
- checkIfBrickShowsText(DroneMoveRightBrick.class, R.string.brick_drone_move_right);
- checkIfBrickShowsText(DroneMoveRightBrick.class, getResources().getQuantityString(R.plurals.second_plural,
- Utils.convertDoubleToPluralInteger(BrickValues.DRONE_MOVE_BRICK_DEFAULT_TIME_MILLISECONDS / 1000)));
- checkIfBrickShowsText(DroneMoveRightBrick.class, R.string.brick_drone_with_);
- checkIfBrickShowsText(DroneMoveRightBrick.class, UiTestUtils.getResourcesString(R.string.percent_symbol));
- checkIfBrickShowsText(DroneMoveRightBrick.class, UiTestUtils.getResourcesString(R.string
- .formula_editor_function_power));
- checkIfBrickShowsText(DroneMoveRightBrick.class, "1 ");
- checkIfBrickShowsText(DroneMoveRightBrick.class, "20 ");
-
- checkIfBrickShowsText(DroneMoveForwardBrick.class, R.string.brick_drone_move_forward);
- checkIfBrickShowsText(DroneMoveForwardBrick.class, getResources().getQuantityString(R.plurals.second_plural,
- Utils.convertDoubleToPluralInteger(BrickValues.DRONE_MOVE_BRICK_DEFAULT_TIME_MILLISECONDS / 1000)));
- checkIfBrickShowsText(DroneMoveForwardBrick.class, R.string.brick_drone_with_);
- checkIfBrickShowsText(DroneMoveForwardBrick.class, UiTestUtils.getResourcesString(R.string.percent_symbol));
- checkIfBrickShowsText(DroneMoveForwardBrick.class, UiTestUtils.getResourcesString(R.string
- .formula_editor_function_power));
- checkIfBrickShowsText(DroneMoveForwardBrick.class, "1 ");
- checkIfBrickShowsText(DroneMoveForwardBrick.class, "20 ");
-
- checkIfBrickShowsText(DroneMoveBackwardBrick.class, R.string.brick_drone_move_backward);
- checkIfBrickShowsText(DroneMoveBackwardBrick.class, getResources().getQuantityString(R.plurals.second_plural,
- Utils.convertDoubleToPluralInteger(BrickValues.DRONE_MOVE_BRICK_DEFAULT_TIME_MILLISECONDS / 1000)));
- checkIfBrickShowsText(DroneMoveBackwardBrick.class, R.string.brick_drone_with_);
- checkIfBrickShowsText(DroneMoveBackwardBrick.class, UiTestUtils.getResourcesString(R.string.percent_symbol));
- checkIfBrickShowsText(DroneMoveBackwardBrick.class, UiTestUtils.getResourcesString(R.string
- .formula_editor_function_power));
- checkIfBrickShowsText(DroneMoveBackwardBrick.class, "1 ");
- checkIfBrickShowsText(DroneMoveBackwardBrick.class, "20 ");
-
- checkIfBrickShowsText(DroneTurnLeftBrick.class, R.string.brick_drone_turn_left);
- checkIfBrickShowsText(DroneTurnLeftBrick.class, getResources().getQuantityString(R.plurals.second_plural,
- Utils.convertDoubleToPluralInteger(BrickValues.DRONE_MOVE_BRICK_DEFAULT_TIME_MILLISECONDS / 1000)));
- checkIfBrickShowsText(DroneTurnLeftBrick.class, R.string.brick_drone_with_);
- checkIfBrickShowsText(DroneTurnLeftBrick.class, UiTestUtils.getResourcesString(R.string.percent_symbol));
- checkIfBrickShowsText(DroneTurnLeftBrick.class, UiTestUtils.getResourcesString(R.string.formula_editor_function_power));
- checkIfBrickShowsText(DroneTurnLeftBrick.class, "1 ");
- checkIfBrickShowsText(DroneTurnLeftBrick.class, "20 ");
-
- checkIfBrickShowsText(DroneTurnRightBrick.class, R.string.brick_drone_turn_right);
- checkIfBrickShowsText(DroneTurnRightBrick.class, getResources().getQuantityString(R.plurals.second_plural,
- Utils.convertDoubleToPluralInteger(BrickValues.DRONE_MOVE_BRICK_DEFAULT_TIME_MILLISECONDS / 1000)));
- checkIfBrickShowsText(DroneTurnRightBrick.class, R.string.brick_drone_with_);
- checkIfBrickShowsText(DroneTurnRightBrick.class, UiTestUtils.getResourcesString(R.string.percent_symbol));
- checkIfBrickShowsText(DroneTurnRightBrick.class, UiTestUtils.getResourcesString(R.string
- .formula_editor_function_power));
- checkIfBrickShowsText(DroneTurnRightBrick.class, "1 ");
- checkIfBrickShowsText(DroneTurnRightBrick.class, "20 ");
-
- checkIfBrickShowsText(DroneSwitchCameraBrick.class, R.string.brick_drone_switch_camera);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testJumpingSumoBricksDefaultValues() {
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testPhiroBricksDefaultValues() {
- openCategory(R.string.category_phiro);
-
- checkIfBrickShowsText(PhiroMotorMoveForwardBrick.class, R.string.brick_phiro_motor_forward_action);
- checkIfBrickShowsText(PhiroMotorMoveForwardBrick.class, R.string.phiro_motor_speed);
- checkIfBrickShowsText(PhiroMotorMoveForwardBrick.class, R.string.percent_symbol);
- checkIfBrickShowsText(PhiroMotorMoveForwardBrick.class, "100 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(PhiroMotorMoveForwardBrick.class,
- R.id.brick_phiro_motor_forward_action_spinner,
- R.string.phiro_motor_left);
-
- checkIfBrickShowsText(PhiroMotorMoveBackwardBrick.class, R.string.brick_phiro_motor_backward_action);
- checkIfBrickShowsText(PhiroMotorMoveBackwardBrick.class, R.string.phiro_motor_speed);
- checkIfBrickShowsText(PhiroMotorMoveBackwardBrick.class, R.string.percent_symbol);
- checkIfBrickShowsText(PhiroMotorMoveBackwardBrick.class, "100 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(PhiroMotorMoveBackwardBrick.class,
- R.id.brick_phiro_motor_backward_action_spinner,
- R.string.phiro_motor_left);
-
- checkIfBrickShowsText(PhiroMotorStopBrick.class, R.string.phiro_motor_stop);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(PhiroMotorStopBrick.class,
- R.id.brick_phiro_stop_motor_spinner,
- R.string.phiro_motor_both);
-
- checkIfBrickShowsText(PhiroPlayToneBrick.class, R.string.phiro_play_tone);
- checkIfBrickShowsText(PhiroPlayToneBrick.class, R.string.phiro_tone_duration);
- checkIfBrickShowsText(PhiroPlayToneBrick.class, getResources().getQuantityString(R.plurals.second_plural,
- Utils.convertDoubleToPluralInteger(BrickValues.PHIRO_DURATION)));
- checkIfBrickShowsText(PhiroPlayToneBrick.class, "1 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(PhiroPlayToneBrick.class,
- R.id.brick_phiro_select_tone_spinner,
- R.string.phiro_tone_do);
-
- checkIfBrickShowsText(PhiroRGBLightBrick.class, R.string.brick_phiro_rgb_led_action);
- checkIfBrickShowsText(PhiroRGBLightBrick.class, R.string.phiro_rgb_led_red);
- checkIfBrickShowsText(PhiroRGBLightBrick.class, R.string.phiro_rgb_led_green);
- checkIfBrickShowsText(PhiroRGBLightBrick.class, R.string.phiro_rgb_led_blue);
- checkIfBrickShowsText(PhiroRGBLightBrick.class, "0 ");
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(PhiroRGBLightBrick.class,
- R.id.brick_phiro_rgb_light_spinner,
- R.string.phiro_motor_both);
-
- checkIfBrickShowsText(PhiroIfLogicBeginBrick.class, R.string.brick_phiro_sensor_begin);
- checkIfBrickShowsText(PhiroIfLogicBeginBrick.class, R.string.brick_phiro_sensor_second_part);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(PhiroIfLogicBeginBrick.class,
- R.id.brick_phiro_sensor_action_spinner,
- R.string.phiro_sensor_front_left);
-
- //Set variable brick (Sensor: front-left)
- checkIfBrickAtPositionShowsText(SetVariableBrick.class, 0, R.string.brick_set_variable);
- checkIfBrickAtPositionShowsText(SetVariableBrick.class, 0, R.string.to_label);
- checkIfBrickAtPositionShowsEditTextWithText(SetVariableBrick.class, 0,
- R.id.brick_set_variable_edit_text,
- getResourcesString(R.string.formula_editor_phiro_sensor_front_left) + " ");
- checkIfBrickAtPositionShowsSpinnerWithEditTextOverlayWithText(SetVariableBrick.class, 0, R.id
- .set_variable_spinner, R.string.new_option);
-
- //Set variable brick (Sensor: front-right)
- checkIfBrickAtPositionShowsText(SetVariableBrick.class, 1, R.string.brick_set_variable);
- checkIfBrickAtPositionShowsText(SetVariableBrick.class, 1, R.string.to_label);
- checkIfBrickAtPositionShowsEditTextWithText(SetVariableBrick.class, 1,
- R.id.brick_set_variable_edit_text,
- getResourcesString(R.string.formula_editor_phiro_sensor_front_right) + " ");
- checkIfBrickAtPositionShowsSpinnerWithEditTextOverlayWithText(SetVariableBrick.class, 1, R.id
- .set_variable_spinner, R.string.new_option);
-
- //Set variable brick (Sensor: side-left)
- checkIfBrickAtPositionShowsText(SetVariableBrick.class, 2, R.string.brick_set_variable);
- checkIfBrickAtPositionShowsText(SetVariableBrick.class, 2, R.string.to_label);
- checkIfBrickAtPositionShowsEditTextWithText(SetVariableBrick.class, 2,
- R.id.brick_set_variable_edit_text,
- getResourcesString(R.string.formula_editor_phiro_sensor_side_left) + " ");
- checkIfBrickAtPositionShowsSpinnerWithEditTextOverlayWithText(SetVariableBrick.class, 2, R.id
- .set_variable_spinner, R.string.new_option);
-
- //Set variable brick (Sensor: side-right)
- checkIfBrickAtPositionShowsText(SetVariableBrick.class, 3, R.string.brick_set_variable);
- checkIfBrickAtPositionShowsText(SetVariableBrick.class, 3, R.string.to_label);
- checkIfBrickAtPositionShowsEditTextWithText(SetVariableBrick.class, 3,
- R.id.brick_set_variable_edit_text,
- getResourcesString(R.string.formula_editor_phiro_sensor_side_right) + " ");
- checkIfBrickAtPositionShowsSpinnerWithEditTextOverlayWithText(SetVariableBrick.class, 3, R.id
- .set_variable_spinner, R.string.new_option);
-
- //Set variable brick (Sensor: bottom-left)
- checkIfBrickAtPositionShowsText(SetVariableBrick.class, 4, R.string.brick_set_variable);
- checkIfBrickAtPositionShowsText(SetVariableBrick.class, 4, R.string.to_label);
- checkIfBrickAtPositionShowsEditTextWithText(SetVariableBrick.class, 4,
- R.id.brick_set_variable_edit_text,
- getResourcesString(R.string.formula_editor_phiro_sensor_bottom_left) + " ");
- checkIfBrickAtPositionShowsSpinnerWithEditTextOverlayWithText(SetVariableBrick.class, 4, R.id
- .set_variable_spinner, R.string.new_option);
-
- //Set variable brick (Sensor: bottom-right)
- checkIfBrickAtPositionShowsText(SetVariableBrick.class, 5, R.string.brick_set_variable);
- checkIfBrickAtPositionShowsText(SetVariableBrick.class, 5, R.string.to_label);
- checkIfBrickAtPositionShowsEditTextWithText(SetVariableBrick.class, 5,
- R.id.brick_set_variable_edit_text,
- getResourcesString(R.string.formula_editor_phiro_sensor_bottom_right) + " ");
- checkIfBrickAtPositionShowsSpinnerWithEditTextOverlayWithText(SetVariableBrick.class, 5, R.id
- .set_variable_spinner, R.string.new_option);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testArduinoBricksDefaultValues() {
- openCategory(R.string.category_arduino);
-
- checkIfBrickShowsText(ArduinoSendDigitalValueBrick.class, R.string.brick_arduino_select_digital_value);
- checkIfBrickShowsText(ArduinoSendDigitalValueBrick.class, R.string.brick_arduino_set_pin_value_to);
- checkIfBrickShowsText(ArduinoSendDigitalValueBrick.class, "1 ");
- checkIfBrickShowsText(ArduinoSendDigitalValueBrick.class, "13 ");
-
- checkIfBrickShowsText(ArduinoSendPWMValueBrick.class, R.string.brick_arduino_select_analog_value);
- checkIfBrickShowsText(ArduinoSendPWMValueBrick.class, R.string.brick_arduino_set_pin_value_to);
- checkIfBrickShowsText(ArduinoSendPWMValueBrick.class, "3 ");
- checkIfBrickShowsText(ArduinoSendPWMValueBrick.class, "255 ");
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testRaspiBricksDefaultValues() {
- openCategory(R.string.category_raspi);
-
- checkIfBrickShowsText(WhenRaspiPinChangedBrick.class, R.string.brick_raspi_when_begin);
- checkIfBrickShowsText(WhenRaspiPinChangedBrick.class, R.string.brick_raspi_when_equals);
- checkIfBrickShowsSpinnerWithText(WhenRaspiPinChangedBrick.class, R.id.brick_raspi_when_pinspinner,
- R.string.number_3);
- checkIfBrickShowsSpinnerWithText(WhenRaspiPinChangedBrick.class, R.id.brick_raspi_when_valuespinner,
- R.string.brick_raspi_pressed_text);
-
- checkIfBrickShowsText(RaspiIfLogicBeginBrick.class, R.string.brick_raspi_if_begin);
- checkIfBrickShowsText(RaspiIfLogicBeginBrick.class, R.string.brick_raspi_if_begin_second_part);
- checkIfBrickShowsText(RaspiIfLogicBeginBrick.class, "3 ");
-
- checkIfBrickShowsText(RaspiSendDigitalValueBrick.class, R.string.brick_raspi_select_digital_value);
- checkIfBrickShowsText(RaspiSendDigitalValueBrick.class, R.string.brick_raspi_set_pin_value_to);
- checkIfBrickShowsText(RaspiSendDigitalValueBrick.class, "3 ");
- checkIfBrickShowsText(RaspiSendDigitalValueBrick.class, "1 ");
-
- checkIfBrickShowsText(RaspiPwmBrick.class, R.string.brick_raspi_set_pwm);
- checkIfBrickShowsText(RaspiPwmBrick.class, R.string.brick_arduino_set_pin_value_to);
- checkIfBrickShowsText(RaspiPwmBrick.class, R.string.percent_symbol);
- checkIfBrickShowsText(RaspiPwmBrick.class, R.string.hertz_symbol);
- checkIfBrickShowsText(RaspiPwmBrick.class, "3 ");
- checkIfBrickShowsText(RaspiPwmBrick.class, "50 ");
- checkIfBrickShowsText(RaspiPwmBrick.class, "100 ");
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testEmbroideryBricksDefaultValues() {
- openCategory(R.string.category_embroidery);
-
- checkIfBrickShowsText(StitchBrick.class, R.string.brick_stitch);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testControlBricksDefaultValues() {
- openCategory(R.string.category_control);
-
- checkIfBrickShowsText(WaitBrick.class, R.string.brick_wait);
- checkIfBrickShowsEditTextWithText(WaitBrick.class, R.id.brick_wait_edit_text, "1 ");
- checkIfBrickShowsText(WaitBrick.class, getResources().getQuantityString(R.plurals.second_plural,
- Utils.convertDoubleToPluralInteger(1)));
-
- checkIfBrickShowsText(NoteBrick.class, R.string.brick_note);
- checkIfBrickShowsEditTextWithText(NoteBrick.class, R.id.brick_note_edit_text,
- "'" + getResourcesString(R.string.brick_note_default_value) + "' ");
-
- checkIfBrickShowsText(ForeverBrick.class, R.string.brick_forever);
-
- int ifBrickPosition = 0;
- checkIfBrickAtPositionShowsText(IfLogicBeginBrick.class, ifBrickPosition, R.string.brick_if_begin);
- checkIfBrickAtPositionShowsEditTextWithText(IfLogicBeginBrick.class, ifBrickPosition,
- R.id.brick_if_begin_edit_text, "1 < 2 ");
- checkIfBrickAtPositionShowsText(IfLogicBeginBrick.class, ifBrickPosition, R.string.brick_if_begin_second_part);
- checkIfBrickAtPositionShowsText(IfLogicBeginBrick.class, ifBrickPosition, R.string.brick_if_else);
-
- checkIfBrickShowsText(IfThenLogicBeginBrick.class, R.string.brick_if_begin);
- checkIfBrickShowsEditTextWithText(IfThenLogicBeginBrick.class, R.id.brick_if_begin_edit_text, "1 < 2 ");
- checkIfBrickShowsText(IfThenLogicBeginBrick.class, R.string.brick_if_begin_second_part);
-
- checkIfBrickShowsText(WaitUntilBrick.class, R.string.brick_wait_until);
- checkIfBrickShowsEditTextWithText(WaitUntilBrick.class, R.id.brick_wait_until_edit_text, "1 < 2 ");
- checkIfBrickShowsText(WaitUntilBrick.class, R.string.brick_wait_until_second_part);
-
- checkIfBrickShowsText(RepeatBrick.class, R.string.brick_repeat);
- checkIfBrickShowsEditTextWithText(RepeatBrick.class, R.id.brick_repeat_edit_text, "10 ");
- checkIfBrickShowsText(RepeatBrick.class, getResources().getQuantityString(R.plurals.time_plural,
- Utils.convertDoubleToPluralInteger(10)));
-
- checkIfBrickShowsText(RepeatUntilBrick.class, R.string.brick_repeat_until);
- checkIfBrickShowsEditTextWithText(RepeatUntilBrick.class, R.id.brick_repeat_until_edit_text, "1 < 2 ");
- checkIfBrickShowsText(RepeatUntilBrick.class, R.string.brick_wait_until_second_part);
-
- checkIfBrickShowsText(SceneTransitionBrick.class, R.string.brick_scene_transition);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(SceneTransitionBrick.class,
- R.id.brick_scene_transition_spinner,
- R.string.new_option);
-
- checkIfBrickShowsText(SceneStartBrick.class, R.string.brick_scene_start);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(SceneStartBrick.class, R.id.brick_scene_start_spinner,
- InstrumentationRegistry.getTargetContext().getString(R.string.default_scene_name, 1));
-
- checkIfBrickShowsText(StopScriptBrick.class, R.string.brick_stop_script);
- checkIfBrickShowsSpinnerWithText(StopScriptBrick.class, R.id.brick_stop_script_spinner, R.string.brick_stop_this_script);
-
- checkIfBrickShowsText(CloneBrick.class, R.string.brick_clone);
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(CloneBrick.class, R.id.brick_clone_spinner,
- R.string.brick_clone_this);
-
- checkIfBrickShowsText(DeleteThisCloneBrick.class, R.string.brick_delete_this_clone);
-
- checkIfBrickShowsText(WhenClonedBrick.class, R.string.brick_when_cloned);
- }
-
- private void openCategory(int categoryNameStringResourceId) {
- onView(withId(R.id.button_add))
- .perform(click());
-
- onData(allOf(is(instanceOf(String.class)), is(UiTestUtils.getResourcesString(categoryNameStringResourceId))))
- .inAdapterView(BrickCategoryListMatchers.isBrickCategoryView())
- .perform(click());
- }
-
- private void checkIfBrickShowsText(Class brickClass, String text) {
- onData(instanceOf(brickClass)).inAdapterView(BrickPrototypeListMatchers.isBrickPrototypeView())
- .onChildView(withText(text))
- .check(matches(isDisplayed()));
- }
-
- private void checkIfBrickShowsText(Class brickClass, int stringResourceId) {
- checkIfBrickShowsText(brickClass, UiTestUtils.getResourcesString(stringResourceId));
- }
-
- private void checkIfBrickAtPositionShowsText(Class brickClass, int position, int stringResourceId) {
- onData(instanceOf(brickClass)).inAdapterView(BrickPrototypeListMatchers.isBrickPrototypeView())
- .atPosition(position)
- .onChildView(withText(stringResourceId))
- .check(matches(isDisplayed()));
- }
-
- private void checkIfBrickAtPositionShowsText(Class brickClass, int position, String text) {
- onData(instanceOf(brickClass)).inAdapterView(BrickPrototypeListMatchers.isBrickPrototypeView())
- .atPosition(position)
- .onChildView(withText(text))
- .check(matches(isDisplayed()));
- }
-
- private void checkIfBrickShowsEditTextWithText(Class brickClass, int editTextResourceId, String text) {
- onData(instanceOf(brickClass)).inAdapterView(BrickPrototypeListMatchers.isBrickPrototypeView())
- .onChildView(withId(editTextResourceId))
- .check(matches(withText(text)));
- }
-
- private void checkIfBrickShowsEditTextWithText(Class brickClass, int editTextResourceId, int stringResourceId) {
- checkIfBrickShowsEditTextWithText(brickClass, editTextResourceId, UiTestUtils.getResourcesString(stringResourceId));
- }
-
- private void checkIfBrickAtPositionShowsEditTextWithText(Class brickClass, int position, int editTextResourceId,
- String text) {
- onData(instanceOf(brickClass)).inAdapterView(BrickPrototypeListMatchers.isBrickPrototypeView())
- .atPosition(position)
- .onChildView(withId(editTextResourceId))
- .check(matches(withText(text)));
- }
-
- private void checkIfBrickShowsSpinnerWithText(Class brickClass, int spinnerResourceId, int stringResourceId) {
- checkIfBrickShowsSpinnerWithText(brickClass, spinnerResourceId,
- UiTestUtils.getResourcesString(stringResourceId));
- }
-
- private void checkIfBrickShowsSpinnerWithText(Class brickClass, int spinnerResourceId, String text) {
- onData(instanceOf(brickClass)).inAdapterView(BrickPrototypeListMatchers.isBrickPrototypeView())
- .onChildView(withId(spinnerResourceId))
- .check(matches(withSpinnerText(text)));
- }
-
- //Spinners in Android sometimes contain a text directly (if they are generic ArrayAdapters of type ) and
- //sometimes the values are contained in an TextView within the Spinner. In the first case the methods above work,
- //and in the second the ones below.
- private void checkIfBrickShowsSpinnerWithEditTextOverlayWithText(Class brickClass, int spinnerResourceId,
- int stringResourceId) {
- checkIfBrickShowsSpinnerWithEditTextOverlayWithText(brickClass, spinnerResourceId,
- getResourcesString(stringResourceId));
- }
-
- private void checkIfBrickShowsSpinnerWithEditTextOverlayWithText(Class brickClass, int spinnerResourceId,
- String text) {
- onData(instanceOf(brickClass)).inAdapterView(BrickPrototypeListMatchers.isBrickPrototypeView())
- .onChildView(withId(spinnerResourceId))
- .onChildView(withId(android.R.id.text1)) //could be omitted, but just to make clear whats going on
- .check(matches(withText(text)));
- }
-
- private void checkIfBrickAtPositionShowsSpinnerWithEditTextOverlayWithText(Class brickClass, int position,
- int spinnerResourceId, int stringResourceId) {
- onData(instanceOf(brickClass)).inAdapterView(BrickPrototypeListMatchers.isBrickPrototypeView())
- .atPosition(position)
- .onChildView(withId(spinnerResourceId))
- .onChildView(withId(android.R.id.text1)) //could be omitted, but just to make clear whats going on
- .check(matches(withText(stringResourceId)));
- }
-
- private void createProject(String projectName) {
- String nameSpriteTwo = "testSpriteTwo";
-
- Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
- Sprite spriteOne = new Sprite(nameSpriteOne);
- project.getDefaultScene().addSprite(spriteOne);
-
- Sprite spriteTwo = new Sprite(nameSpriteTwo);
- Script script = new StartScript();
- spriteTwo.addScript(script);
-
- project.getDefaultScene().addSprite(spriteTwo);
- ProjectManager.getInstance().setCurrentProject(project);
- ProjectManager.getInstance().setCurrentSprite(spriteTwo);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BricksWithMultipleBrickFieldsEditFormulaTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BricksWithMultipleBrickFieldsEditFormulaTest.java
deleted file mode 100644
index c35dad24985..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BricksWithMultipleBrickFieldsEditFormulaTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-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.ArduinoSendDigitalValueBrick;
-import org.catrobat.catroid.content.bricks.ArduinoSendPWMValueBrick;
-import org.catrobat.catroid.content.bricks.DroneMoveBackwardBrick;
-import org.catrobat.catroid.content.bricks.DroneMoveDownBrick;
-import org.catrobat.catroid.content.bricks.DroneMoveForwardBrick;
-import org.catrobat.catroid.content.bricks.DroneMoveLeftBrick;
-import org.catrobat.catroid.content.bricks.DroneMoveRightBrick;
-import org.catrobat.catroid.content.bricks.DroneMoveUpBrick;
-import org.catrobat.catroid.content.bricks.DroneTurnLeftBrick;
-import org.catrobat.catroid.content.bricks.DroneTurnRightBrick;
-import org.catrobat.catroid.content.bricks.GlideToBrick;
-import org.catrobat.catroid.content.bricks.InsertItemIntoUserListBrick;
-import org.catrobat.catroid.content.bricks.JumpingSumoMoveBackwardBrick;
-import org.catrobat.catroid.content.bricks.JumpingSumoMoveForwardBrick;
-import org.catrobat.catroid.content.bricks.LegoEv3PlayToneBrick;
-import org.catrobat.catroid.content.bricks.LegoNxtPlayToneBrick;
-import org.catrobat.catroid.content.bricks.PhiroRGBLightBrick;
-import org.catrobat.catroid.content.bricks.PlaceAtBrick;
-import org.catrobat.catroid.content.bricks.RaspiPwmBrick;
-import org.catrobat.catroid.content.bricks.RaspiSendDigitalValueBrick;
-import org.catrobat.catroid.content.bricks.ReplaceItemInUserListBrick;
-import org.catrobat.catroid.content.bricks.SayForBubbleBrick;
-import org.catrobat.catroid.content.bricks.SetPenColorBrick;
-import org.catrobat.catroid.content.bricks.ShowTextBrick;
-import org.catrobat.catroid.content.bricks.ShowTextColorSizeAlignmentBrick;
-import org.catrobat.catroid.content.bricks.ThinkForBubbleBrick;
-import org.catrobat.catroid.formulaeditor.Formula;
-import org.catrobat.catroid.physics.content.bricks.SetGravityBrick;
-import org.catrobat.catroid.physics.content.bricks.SetVelocityBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor;
-
-@RunWith(AndroidJUnit4.class)
-public class BricksWithMultipleBrickFieldsEditFormulaTest {
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
- private int arduinoDigitalPinNumber = 13;
- private int arduinoDigitalPinValue = 1;
- private int arduinoPwdPinNumber = 3;
- private int arduinoPwdPinValue = 255;
- private float raspiPwmFrequency = 50;
- private float raspiPwmPercentage = 100;
- private int raspiPwmPinNumber = 3;
- private int raspiPinValue = 1;
- private double legoDuration = 1.01;
- private double legoFrequency = 2.02;
- private double legoVolume = 100;
- private int droneDuration = 1;
- private int dronePower = 20;
- private int xCoordinate = 100;
- private int yCoordinate = 200;
- private double relativeTextSize = 100;
- private double droneDurationFormulaEditor = droneDuration / 1000.0;
-
- @Before
- public void setUp() throws Exception {
- createProject("editFormulaTest");
- baseActivityTestRule.launchActivity();
- }
-
- @Test
- public void testEditFormula() {
- checkFormulaEditorStartWithFirstBrickField(1, arduinoDigitalPinNumber + " ");
- checkFormulaEditorStartWithFirstBrickField(2, arduinoPwdPinNumber + " ");
-
- checkFormulaEditorStartWithFirstBrickField(3, raspiPwmPinNumber + " ");
- checkFormulaEditorStartWithFirstBrickField(4, raspiPwmPinNumber + " ");
-
- checkFormulaEditorStartWithFirstBrickField(5, legoDuration + " ");
- checkFormulaEditorStartWithFirstBrickField(6, legoDuration + " ");
-
- checkFormulaEditorStartWithFirstBrickField(7, droneDurationFormulaEditor + " ");
- checkFormulaEditorStartWithFirstBrickField(8, droneDurationFormulaEditor + " ");
- checkFormulaEditorStartWithFirstBrickField(9, droneDurationFormulaEditor + " ");
- checkFormulaEditorStartWithFirstBrickField(10, droneDurationFormulaEditor + " ");
- checkFormulaEditorStartWithFirstBrickField(11, droneDurationFormulaEditor + " ");
- checkFormulaEditorStartWithFirstBrickField(12, droneDurationFormulaEditor + " ");
- checkFormulaEditorStartWithFirstBrickField(13, droneDurationFormulaEditor + " ");
- checkFormulaEditorStartWithFirstBrickField(14, droneDurationFormulaEditor + " ");
- checkFormulaEditorStartWithFirstBrickField(15, droneDurationFormulaEditor + " ");
- checkFormulaEditorStartWithFirstBrickField(16, droneDurationFormulaEditor + " ");
-
- checkFormulaEditorStartWithFirstBrickField(17, xCoordinate + " ");
- checkFormulaEditorStartWithFirstBrickField(18, xCoordinate + " ");
- checkFormulaEditorStartWithFirstBrickField(19, 1 + " ");
- checkFormulaEditorStartWithFirstBrickField(20, 1 + " ");
-
- checkFormulaEditorStartWithFirstBrickField(21, "'Servus' ");
- checkFormulaEditorStartWithFirstBrickField(22, "'Serwaas' ");
- checkFormulaEditorStartWithFirstBrickField(23, "'red' ");
- checkFormulaEditorStartWithFirstBrickField(24, "'r' ");
-
- checkFormulaEditorStartWithFirstBrickField(25, xCoordinate + " ");
- checkFormulaEditorStartWithFirstBrickField(26, droneDurationFormulaEditor + " ");
- checkFormulaEditorStartWithFirstBrickField(27, 1 + " ");
- checkFormulaEditorStartWithFirstBrickField(28, 5 + " ");
- }
-
- private void checkFormulaEditorStartWithFirstBrickField(int brickPosition, String shownText) {
- onBrickAtPosition(brickPosition)
- .performEditFormula();
- onFormulaEditor()
- .checkShows(shownText);
- onFormulaEditor()
- .performCloseAndSave();
- }
-
- private void createProject(String projectName) {
- Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
- Sprite sprite1 = new Sprite("testSprite");
- Script sprite1StartScript = new StartScript();
- sprite1.addScript(sprite1StartScript);
-
- project.getDefaultScene().addSprite(sprite1);
- ProjectManager.getInstance().setCurrentProject(project);
- ProjectManager.getInstance().setCurrentSprite(sprite1);
-
- sprite1StartScript.addBrick(new ArduinoSendDigitalValueBrick(arduinoDigitalPinNumber, arduinoDigitalPinValue));
- sprite1StartScript.addBrick(new ArduinoSendPWMValueBrick(arduinoPwdPinNumber, arduinoPwdPinValue));
-
- sprite1StartScript.addBrick(new RaspiPwmBrick(raspiPwmPinNumber, raspiPwmFrequency, raspiPwmPercentage));
- sprite1StartScript.addBrick(new RaspiSendDigitalValueBrick(raspiPwmPinNumber, raspiPinValue));
-
- sprite1StartScript.addBrick(new LegoEv3PlayToneBrick(legoFrequency, legoDuration, legoVolume));
- sprite1StartScript.addBrick(new LegoNxtPlayToneBrick(legoFrequency, legoDuration));
-
- sprite1StartScript.addBrick(new DroneMoveUpBrick(droneDuration, dronePower));
- sprite1StartScript.addBrick(new DroneMoveDownBrick(droneDuration, dronePower));
- sprite1StartScript.addBrick(new DroneMoveLeftBrick(droneDuration, dronePower));
- sprite1StartScript.addBrick(new DroneMoveRightBrick(droneDuration, dronePower));
- sprite1StartScript.addBrick(new DroneMoveForwardBrick(droneDuration, dronePower));
- sprite1StartScript.addBrick(new DroneMoveBackwardBrick(droneDuration, dronePower));
- sprite1StartScript.addBrick(new DroneTurnLeftBrick(droneDuration, dronePower));
- sprite1StartScript.addBrick(new DroneTurnRightBrick(droneDuration, dronePower));
-
- sprite1StartScript.addBrick(new JumpingSumoMoveBackwardBrick(droneDuration, dronePower));
- sprite1StartScript.addBrick(new JumpingSumoMoveForwardBrick(droneDuration, dronePower));
-
- sprite1StartScript.addBrick(new ShowTextBrick(xCoordinate, yCoordinate));
- sprite1StartScript.addBrick(new ShowTextColorSizeAlignmentBrick(xCoordinate, yCoordinate, relativeTextSize,
- "#FF00FF"));
- sprite1StartScript.addBrick(new InsertItemIntoUserListBrick(new Formula(1), new Formula(1)));
- sprite1StartScript.addBrick(new ReplaceItemInUserListBrick(new Formula(1), new Formula(1)));
-
- sprite1StartScript.addBrick(new SayForBubbleBrick("Servus", droneDuration));
- sprite1StartScript.addBrick(new ThinkForBubbleBrick("Serwaas", droneDuration));
- sprite1StartScript.addBrick(new PhiroRGBLightBrick(PhiroRGBLightBrick.Eye.RIGHT, new Formula("red"), new Formula(0), new Formula(255)));
- sprite1StartScript.addBrick(new SetPenColorBrick(new Formula("r"), new Formula(0), new Formula(255)));
-
- sprite1StartScript.addBrick(new PlaceAtBrick(xCoordinate, yCoordinate));
- sprite1StartScript.addBrick(new GlideToBrick(xCoordinate, yCoordinate, droneDuration));
- sprite1StartScript.addBrick(new SetVelocityBrick(new Formula(1), new Formula(3)));
- sprite1StartScript.addBrick(new SetGravityBrick(new Formula(5), new Formula(8)));
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastAndWaitBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastAndWaitBrickTest.java
deleted file mode 100644
index 9e00ab2ade8..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastAndWaitBrickTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import android.widget.EditText;
-
-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.BroadcastWaitBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
-import static android.support.test.espresso.action.ViewActions.typeText;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.instanceOf;
-
-@RunWith(AndroidJUnit4.class)
-public class BroadcastAndWaitBrickTest {
- private String defaultMessage = "defaultMessage";
-
- private int broadcastAndWaitPosition = 1;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- createProject("BroadcastAndWaitBrickTest");
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Functional.class})
- @Test
- @Flaky
- public void testBroadcastAndWaitBrick() {
- String uselessMessage = "useless";
- createNewMessageOnSpinner(R.id.brick_broadcast_spinner, broadcastAndWaitPosition, uselessMessage);
-
- onBrickAtPosition(broadcastAndWaitPosition).onSpinner(R.id.brick_broadcast_spinner)
- .checkShowsText(uselessMessage);
- onBrickAtPosition(broadcastAndWaitPosition).onSpinner(R.id.brick_broadcast_spinner)
- .perform(click());
- onView(withText(defaultMessage))
- .perform(click());
- onBrickAtPosition(broadcastAndWaitPosition).onSpinner(R.id.brick_broadcast_spinner)
- .checkShowsText(defaultMessage);
- }
-
- private void createProject(String projectName) {
- Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
- Sprite sprite = new Sprite("testSprite");
- Script script = new StartScript();
-
- sprite.addScript(script);
-
- script.addBrick(new BroadcastWaitBrick(defaultMessage));
-
- project.getDefaultScene().addSprite(sprite);
-
- ProjectManager.getInstance().setCurrentProject(project);
- ProjectManager.getInstance().setCurrentSprite(sprite);
- }
-
- public void createNewMessageOnSpinner(int spinnerResourceId, int position, String message) {
- onBrickAtPosition(position).onSpinner(spinnerResourceId)
- .perform(click());
-
- onView(withText(R.string.new_option))
- .perform(click());
-
- onView(allOf(withId(R.id.input_edit_text), isDisplayed(), instanceOf(EditText.class)))
- .perform(typeText(message));
- closeSoftKeyboard();
-
- onView(withId(android.R.id.button1))
- .perform(click());
-
- onBrickAtPosition(position).onSpinner(spinnerResourceId)
- .checkShowsText(message);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastReceiveBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastBrickMessageUpdateTest.java
similarity index 52%
rename from catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastReceiveBrickTest.java
rename to catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastBrickMessageUpdateTest.java
index 318f63dec24..0d1cfd91745 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastReceiveBrickTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastBrickMessageUpdateTest.java
@@ -25,7 +25,6 @@
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
-import android.widget.EditText;
import org.catrobat.catroid.ProjectManager;
import org.catrobat.catroid.R;
@@ -33,36 +32,28 @@
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.BroadcastReceiverBrick;
+import org.catrobat.catroid.content.bricks.BroadcastWaitBrick;
import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
+import org.catrobat.catroid.uiespresso.util.UiTestUtils;
import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
-import static android.support.test.espresso.action.ViewActions.typeText;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import java.util.Arrays;
+import java.util.List;
import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.instanceOf;
+import static org.catrobat.catroid.uiespresso.content.messagecontainer.BroadcastMessageBrickUtils.createNewBroadCastMessageOnBrick;
@RunWith(AndroidJUnit4.class)
-public class BroadcastReceiveBrickTest {
+public class BroadcastBrickMessageUpdateTest {
private String defaultMessage = "defaultMessage";
-
- private int broadcastReceivePosition = 1;
+ String message = "Oida!";
+ BroadcastReceiverBrick firstBroadcastBrick;
@Rule
public BaseActivityInstrumentationRule baseActivityTestRule = new
@@ -70,56 +61,56 @@ public class BroadcastReceiveBrickTest {
@Before
public void setUp() throws Exception {
- createProject("BroadcastBrickTest");
+ createProject(this.getClass().getSimpleName());
baseActivityTestRule.launchActivity();
}
- @Category({Cat.AppUi.class, Level.Functional.class})
@Test
- @Flaky
- public void testBroadcastReceiveBrick() {
- String uselessMessage = "useless";
- createNewMessageOnSpinner(R.id.brick_broadcast_spinner, broadcastReceivePosition, uselessMessage);
- onBrickAtPosition(broadcastReceivePosition).onSpinner(R.id.brick_broadcast_spinner)
- .checkShowsText(uselessMessage);
- onBrickAtPosition(broadcastReceivePosition).onSpinner(R.id.brick_broadcast_spinner)
- .perform(click());
- onView(withText(defaultMessage))
- .perform(click());
- onBrickAtPosition(broadcastReceivePosition).onSpinner(R.id.brick_broadcast_spinner)
- .checkShowsText(defaultMessage);
+ public void testAllBroadcastBricksSpinnersShowTheNewAddedMessage() {
+ createNewBroadCastMessageOnBrick(message, firstBroadcastBrick,
+ (SpriteActivity) baseActivityTestRule.getActivity());
+
+ List spinnerValues = Arrays.asList(
+ UiTestUtils.getResourcesString(R.string.new_option),
+ defaultMessage,
+ message);
+
+ onBrickAtPosition(1)
+ .onSpinner(R.id.brick_broadcast_spinner)
+ .checkNameableValuesAvailable(spinnerValues);
+ onBrickAtPosition(2)
+ .onSpinner(R.id.brick_broadcast_spinner)
+ .checkNameableValuesAvailable(spinnerValues);
+ onBrickAtPosition(3)
+ .onSpinner(R.id.brick_broadcast_spinner)
+ .checkNameableValuesAvailable(spinnerValues);
+ onBrickAtPosition(4)
+ .onSpinner(R.id.brick_broadcast_spinner)
+ .checkNameableValuesAvailable(spinnerValues);
+ onBrickAtPosition(5)
+ .onSpinner(R.id.brick_broadcast_spinner)
+ .checkNameableValuesAvailable(spinnerValues);
}
private void createProject(String projectName) {
Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
Sprite sprite = new Sprite("testSprite");
- Script script = new StartScript();
- sprite.addScript(script);
+ Script script1 = new BroadcastScript(defaultMessage);
+ firstBroadcastBrick = (BroadcastReceiverBrick) script1.getScriptBrick();
- script.addBrick(new BroadcastReceiverBrick(new BroadcastScript(defaultMessage)));
+ Script script2 = new BroadcastScript(defaultMessage);
- project.getDefaultScene().addSprite(sprite);
+ script1.addBrick(new BroadcastBrick(defaultMessage));
+ script1.addBrick(new BroadcastWaitBrick(defaultMessage));
+ script2.addBrick(new BroadcastBrick(defaultMessage));
+ script2.addBrick(new BroadcastWaitBrick(defaultMessage));
+
+ sprite.addScript(script1);
+ sprite.addScript(script2);
+ project.getDefaultScene().addSprite(sprite);
ProjectManager.getInstance().setCurrentProject(project);
ProjectManager.getInstance().setCurrentSprite(sprite);
}
-
- public void createNewMessageOnSpinner(int spinnerResourceId, int position, String message) {
- onBrickAtPosition(position).onSpinner(spinnerResourceId)
- .perform(click());
-
- onView(withText(R.string.new_option))
- .perform(click());
-
- onView(allOf(withId(R.id.input_edit_text), isDisplayed(), instanceOf(EditText.class)))
- .perform(typeText(message));
- closeSoftKeyboard();
-
- onView(withId(android.R.id.button1))
- .perform(click());
-
- onBrickAtPosition(position).onSpinner(spinnerResourceId)
- .checkShowsText(message);
- }
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/CameraBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/CameraBrickTest.java
deleted file mode 100644
index 8dc7e5d2195..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/CameraBrickTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.Script;
-import org.catrobat.catroid.content.bricks.CameraBrick;
-import org.catrobat.catroid.content.bricks.ChooseCameraBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript;
-
-@RunWith(AndroidJUnit4.class)
-public class CameraBrickTest {
- private int cameraBrickPosition;
- private int chooseCameraBrickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- cameraBrickPosition = 1;
- chooseCameraBrickPosition = 2;
- Script script = createProjectAndGetStartScript("cameraBrickTest");
- script.addBrick(new CameraBrick());
- script.addBrick(new ChooseCameraBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testCameraBrick() {
- onBrickAtPosition(cameraBrickPosition).checkShowsText(R.string.brick_video);
- onBrickAtPosition(cameraBrickPosition).onSpinner(R.id.brick_video_spinner)
- .checkShowsText(R.string.video_brick_camera_on);
-
- List spinnerValues = new ArrayList<>();
- spinnerValues.add(R.string.video_brick_camera_on);
- spinnerValues.add(R.string.video_brick_camera_off);
- onBrickAtPosition(cameraBrickPosition).onSpinner(R.id.brick_video_spinner)
- .checkStringIdValuesAvailable(spinnerValues);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testChooseCameraBrick() {
- onBrickAtPosition(chooseCameraBrickPosition).checkShowsText(R.string.brick_choose_camera);
- onBrickAtPosition(chooseCameraBrickPosition).onSpinner(R.id.brick_choose_camera_spinner)
- .checkShowsText(R.string.choose_camera_front);
-
- List spinnerValues = new ArrayList<>();
- spinnerValues.add(R.string.choose_camera_front);
- spinnerValues.add(R.string.choose_camera_back);
- onBrickAtPosition(chooseCameraBrickPosition).onSpinner(R.id.brick_choose_camera_spinner)
- .checkStringIdValuesAvailable(spinnerValues);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeBrightnessByNBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeBrightnessByNBrickTest.java
deleted file mode 100644
index fb1dbb9e154..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeBrightnessByNBrickTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.ChangeBrightnessByNBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ChangeBrightnessByNBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("changeBrightnessByNBrickTest1")
- .addBrick(new ChangeBrightnessByNBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testChangeBrightnessByNBrick() {
- int brightnessValue = 15;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_change_brightness);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_change_brightness_edit_text)
- .performEnterNumber(brightnessValue)
- .checkShowsNumber(brightnessValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeColorByNBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeColorByNBrickTest.java
deleted file mode 100644
index 4d70dc9f4b0..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeColorByNBrickTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.ChangeColorByNBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ChangeColorByNBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("changeColorByNBricktest1")
- .addBrick(new ChangeColorByNBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testChangeColorByNBrick() {
- int valToChange = 20;
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_change_color);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_change_color_by_edit_text)
- .performEnterNumber(valToChange)
- .checkShowsNumber(valToChange);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeSizeByNBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeSizeByNBrickTest.java
deleted file mode 100644
index 24b02cebcc7..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeSizeByNBrickTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-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.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ChangeSizeByNBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("changeSizeByNBricktest1")
- .addBrick(new ChangeSizeByNBrick(10));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testChangeSizeByNBrick() {
- int sizeChangeValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_change_size_by);
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_change_size_by_edit_text)
- .performEnterNumber(sizeChangeValue).checkShowsNumber(sizeChangeValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeTransparencyByNBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeTransparencyByNBrickTest.java
deleted file mode 100644
index 2fa2491c60d..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeTransparencyByNBrickTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.ChangeTransparencyByNBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-public class ChangeTransparencyByNBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("changeTransparencyByNBricktest1")
- .addBrick(new ChangeTransparencyByNBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testChangeTransparencyByNBrick() {
- float valToChange = 30.5f;
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_change_ghost_effect);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_change_transparency_edit_text)
- .performEnterNumber(valToChange)
- .checkShowsNumber(valToChange);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeVolumeByNBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeVolumeByNBrickTest.java
deleted file mode 100644
index da7c7716bd9..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeVolumeByNBrickTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.ChangeVolumeByNBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ChangeVolumeByNBrickTest {
- private int brickPosition;
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("ChangeVolumeByNBrickTest")
- .addBrick(new ChangeVolumeByNBrick(10));
- baseActivityTestRule.launchActivity();
- }
-
- @Test
- public void changeVolumeByNBrick() {
- int changeValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_change_volume_by);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_change_volume_by_edit_text)
- .performEnterNumber(changeValue)
- .checkShowsNumber(changeValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeXByNBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeXByNBrickTest.java
deleted file mode 100644
index d903a60a9e1..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeXByNBrickTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.ChangeXByNBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ChangeXByNBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("changeXByNBrickTest1")
- .addBrick(new ChangeXByNBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testChangeXByNBrick() {
- int xChangeValue = 17;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_change_x_by);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_change_x_edit_text)
- .performEnterNumber(xChangeValue)
- .checkShowsNumber(xChangeValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeYByNBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeYByNBrickTest.java
deleted file mode 100644
index 8531c2a2213..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ChangeYByNBrickTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.ChangeYByNBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ChangeYByNBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("changeYByNBrickTest1")
- .addBrick(new ChangeYByNBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testChangeYByNBrick() {
- int yChangeValue = 17;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_change_y_by);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_change_y_edit_text)
- .performEnterNumber(yChangeValue)
- .checkShowsNumber(yChangeValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ClearGraphicEffectBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ClearGraphicEffectBrickTest.java
deleted file mode 100644
index 2e70ab06794..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ClearGraphicEffectBrickTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.ClearGraphicEffectBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ClearGraphicEffectBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("clearGraphicEffectBrickTest1")
- .addBrick(new ClearGraphicEffectBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testClearGraphicEffectBrick() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_clear_graphic_effect);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ComeToFrontBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ComeToFrontBrickTest.java
deleted file mode 100644
index 4aa60040375..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ComeToFrontBrickTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.ComeToFrontBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ComeToFrontBrickTest {
- private static int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("comeToFrontTest1")
- .addBrick(new ComeToFrontBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testComeToFrontBrick() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_come_to_front);
- }
-}
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 e729f0bdc80..0866901a8e4 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
@@ -74,28 +74,6 @@ public void setUp() throws Exception {
baseActivityTestRule.launchActivity();
}
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- @Flaky
- public void testDeleteItemOfUserListBrickBasicLayout() {
- int newPosition = 3;
- String userListName = "test1";
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_delete_item_from_userlist);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.delete_item_of_userlist_spinner)
- .checkShowsText(R.string.new_option);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_delete_item_of_userlist_edit_text)
- .performEnterNumber(newPosition)
- .checkShowsNumber(newPosition);
-
- onBrickAtPosition(brickPosition).onVariableSpinner(R.id.delete_item_of_userlist_spinner)
- .performNewVariable(userListName)
- .checkShowsText(userListName);
- }
-
@Category({Cat.AppUi.class, Level.Detailed.class})
@Test
@Flaky
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DragNDropBricksTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DragNDropBricksTest.java
deleted file mode 100644
index 644704f7897..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/DragNDropBricksTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.content.Script;
-import org.catrobat.catroid.content.bricks.ChangeXByNBrick;
-import org.catrobat.catroid.content.bricks.ChangeYByNBrick;
-import org.catrobat.catroid.content.bricks.LoopEndBrick;
-import org.catrobat.catroid.content.bricks.RepeatBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickCoordinatesProvider;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class DragNDropBricksTest {
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- int arbitraryNumber = 3;
-
- LoopEndBrick endBrick = new LoopEndBrick();
- RepeatBrick repeatBrick = new RepeatBrick(arbitraryNumber);
- repeatBrick.setLoopEndBrick(endBrick);
-
- Script script = BrickTestUtils.createProjectAndGetStartScript("LoopBrickTest1");
- script.addBrick(repeatBrick);
- script.addBrick(new ChangeYByNBrick());
- script.addBrick(new ChangeXByNBrick());
- script.addBrick(endBrick);
-
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void dragTest() {
- onBrickAtPosition(2).performDragNDrop(BrickCoordinatesProvider.DOWN_ONE_POSITION);
-
- onBrickAtPosition(2).performDragNDrop(BrickCoordinatesProvider.DOWN_ONE_POSITION);
-
- onBrickAtPosition(2).performDragNDrop(BrickCoordinatesProvider.UP_ONE_POSITION);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/FlashBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/FlashBrickTest.java
deleted file mode 100644
index df8403721a7..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/FlashBrickTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.FlashBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils.createProjectAndGetStartScript;
-
-@RunWith(AndroidJUnit4.class)
-public class FlashBrickTest {
- private int flashBrickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- flashBrickPosition = 1;
- createProjectAndGetStartScript("flashBrickTest").addBrick(new FlashBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.CatrobatLanguage.class, Level.Smoke.class})
- @Test
- public void testFlashBrick() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(flashBrickPosition).checkShowsText(R.string.brick_flash);
-
- onBrickAtPosition(flashBrickPosition).onSpinner(R.id.brick_flash_spinner)
- .checkShowsText(R.string.brick_flash_on);
-
- List spinnerValues = new ArrayList<>();
- spinnerValues.add(R.string.brick_flash_on);
- spinnerValues.add(R.string.brick_flash_off);
- onBrickAtPosition(flashBrickPosition).onSpinner(R.id.brick_flash_spinner)
- .checkStringIdValuesAvailable(spinnerValues);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/GlideToBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/GlideToBrickTest.java
deleted file mode 100644
index 7f0b9b8c4ce..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/GlideToBrickTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.ProjectManager;
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.Sprite;
-import org.catrobat.catroid.content.bricks.Brick;
-import org.catrobat.catroid.content.bricks.GlideToBrick;
-import org.catrobat.catroid.formulaeditor.Formula;
-import org.catrobat.catroid.formulaeditor.InterpretationException;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.UiTestUtils;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static junit.framework.Assert.assertEquals;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class GlideToBrickTest {
- private int brickPosition;
- private GlideToBrick glideToBrick;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- glideToBrick = new GlideToBrick(0, 0, 0);
- BrickTestUtils.createProjectAndGetStartScript("glideToBrickTest1")
- .addBrick(glideToBrick);
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void glideToBrickTest() throws InterpretationException {
- int duration = 2;
- int xPosition = 123;
- int yPosition = 567;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_glide_to_x);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_glide_to_edit_text_duration)
- .performEnterNumber(duration)
- .checkShowsNumber(duration);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_glide_to_edit_text_x)
- .performEnterNumber(xPosition)
- .checkShowsNumber(xPosition);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_glide_to_edit_text_y)
- .performEnterNumber(yPosition)
- .checkShowsNumber(yPosition);
-
- Sprite sprite = ProjectManager.getInstance().getCurrentSprite();
-
- Formula formula = glideToBrick.getFormulaWithBrickField(Brick.BrickField.DURATION_IN_SECONDS);
- assertEquals(Math.round(duration * 1000), Math.round(formula.interpretFloat(sprite) * 1000));
-
- formula = glideToBrick.getFormulaWithBrickField(Brick.BrickField.X_DESTINATION);
- assertEquals(xPosition, (int) formula.interpretInteger(sprite));
-
- formula = glideToBrick.getFormulaWithBrickField(Brick.BrickField.Y_DESTINATION);
- assertEquals(yPosition, (int) formula.interpretInteger(sprite));
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void glideToBrickTestPluralSeconds() {
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_glide_to_edit_text_duration)
- .performEnterNumber(1).checkShowsNumber(1);
-
- onBrickAtPosition(brickPosition).checkShowsText(UiTestUtils.getResources().getQuantityString(R.plurals.second_plural, 1));
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_glide_to_edit_text_duration)
- .performEnterNumber(5)
- .checkShowsNumber(5);
-
- onBrickAtPosition(brickPosition).checkShowsText(UiTestUtils.getResources().getQuantityString(R.plurals.second_plural, 5));
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/GoNStepsBackTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/GoNStepsBackTest.java
deleted file mode 100644
index b9d1eba8d24..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/GoNStepsBackTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.GoNStepsBackBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class GoNStepsBackTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("goNStepsBackTest")
- .addBrick(new GoNStepsBackBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void goNStepsBackTest() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_go_back);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_go_back_edit_text)
- .performEnterNumber(10)
- .checkShowsNumber(10);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/GoToBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/GoToBrickTest.java
deleted file mode 100644
index a9f3990b8ba..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/GoToBrickTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.GoToBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class GoToBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("goToBrickTest1")
- .addBrick(new GoToBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void goToBrickTest() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_go_to);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_go_to_spinner)
- .checkShowsText(R.string.brick_go_to_touch_position);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_go_to_spinner)
- .performSelectNameable(R.string.brick_go_to_random_position);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/HideBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/HideBrickTest.java
deleted file mode 100644
index 032f6e888eb..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/HideBrickTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.HideBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class HideBrickTest {
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- BrickTestUtils.createProjectAndGetStartScript("hideBrickTest1")
- .addBrick(new HideBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void hideBrickTest() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(1).checkShowsText(R.string.brick_hide);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/IfThenBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/IfThenBrickTest.java
index 6eec63cebaf..fbf53e33181 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/IfThenBrickTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/IfThenBrickTest.java
@@ -56,7 +56,6 @@
@RunWith(AndroidJUnit4.class)
public class IfThenBrickTest {
private int ifThenBeginBrickPosition;
- private int ifEndBrickPosition;
private int condition = 42;
@@ -71,22 +70,6 @@ public void setUp() throws Exception {
baseActivityTestRule.launchActivity();
}
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void ifThenBrickTest() {
- checkSetUpBrickArrangement();
-
- onBrickAtPosition(ifThenBeginBrickPosition)
- .checkShowsText(R.string.brick_if_begin)
- .checkShowsText(R.string.brick_if_begin_second_part);
-
- onBrickAtPosition(ifThenBeginBrickPosition).onFormulaTextField(R.id.brick_if_begin_edit_text)
- .checkShowsNumber(condition);
-
- onBrickAtPosition(ifEndBrickPosition)
- .checkShowsText(R.string.brick_if_end);
- }
-
@Category({Cat.AppUi.class, Level.Smoke.class})
@Test
public void ifThenBrickDeleteTest() {
@@ -133,7 +116,6 @@ public void checkSetUpBrickArrangement() {
public void createProject() {
ifThenBeginBrickPosition = 1;
- ifEndBrickPosition = 3;
IfThenLogicBeginBrick ifThenLogicBeginBrick = new IfThenLogicBeginBrick(condition);
IfThenLogicEndBrick ifThenLogicEndBrick = new IfThenLogicEndBrick(ifThenLogicBeginBrick);
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 8a91e9ff95f..cca6c7608d7 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
@@ -116,7 +116,7 @@ public void testInsertItemToUserListBrick() {
.onFormulaTextField(R.id.brick_insert_item_into_userlist_at_index_edit_text)
.performEnterNumber(indexToInsert + 1)
.checkShowsNumber(indexToInsert + 1);
- UserList userList = ProjectManager.getInstance().getCurrentlyEditedScene().getDataContainer().getUserList(null, userListName);
+ UserList userList = ProjectManager.getInstance().getCurrentProject().getUserList(userListName);
assertEquals(0, userList.getList().size());
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoAnimationBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoAnimationBrickTest.java
deleted file mode 100644
index 9a29fa72cd9..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoAnimationBrickTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.JumpingSumoAnimationsBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class JumpingSumoAnimationBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
-
- BrickTestUtils.createProjectAndGetStartScript("JumpingSumoAnimationBrickTest")
- .addBrick(new JumpingSumoAnimationsBrick(JumpingSumoAnimationsBrick.Animation.SPIN));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testJumpingSumoAnimationBrick() {
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_jumping_sumo_animation);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_jumping_sumo_animation_spinner)
- .checkShowsText(R.string.animation_spin);
-
- List spinnerValuesResourceIds = Arrays.asList(
- R.string.animation_spin,
- R.string.animation_tab,
- R.string.animation_slowshake,
- R.string.animation_metronome,
- R.string.animation_ondulation,
- R.string.animation_spinjump,
- R.string.animation_spiral,
- R.string.animation_slalom);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_jumping_sumo_animation_spinner)
- .checkStringIdValuesAvailable(spinnerValuesResourceIds);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoMoveBackwardBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoMoveBackwardBrickTest.java
deleted file mode 100644
index 00233656679..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoMoveBackwardBrickTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.JumpingSumoMoveBackwardBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class JumpingSumoMoveBackwardBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialSeconds = 1000;
- int initialPower = 80;
- BrickTestUtils.createProjectAndGetStartScript("JumpingSumoMoveBackwardBrickTest").addBrick(new
- JumpingSumoMoveBackwardBrick(initialSeconds, initialPower));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testJumpingSumoMoveBackwardBrick() {
- int secondsValue = 3;
- int powerValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_jumping_sumo_move_backward);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_jumping_sumo_move_backward_edit_text_second)
- .performEnterNumber(secondsValue)
- .checkShowsNumber(secondsValue);
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_jumping_sumo_move_backward_edit_text_power)
- .performEnterNumber(powerValue)
- .checkShowsNumber(powerValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoMoveForwardBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoMoveForwardBrickTest.java
deleted file mode 100644
index 203bd94aa4d..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoMoveForwardBrickTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.JumpingSumoMoveForwardBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class JumpingSumoMoveForwardBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialSeconds = 1000;
- int initialPower = 80;
- BrickTestUtils.createProjectAndGetStartScript("JumpingSumoMoveForwardBrickTest").addBrick(new
- JumpingSumoMoveForwardBrick(initialSeconds, initialPower));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testJumpingSumoMoveForwardBrick() {
- int secondsValue = 3;
- int powerValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_jumping_sumo_move_forward);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_jumping_sumo_move_forward_edit_text_second)
- .performEnterNumber(secondsValue)
- .checkShowsNumber(secondsValue);
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_jumping_sumo_move_forward_edit_text_power)
- .performEnterNumber(powerValue)
- .checkShowsNumber(powerValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoRotateLeftBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoRotateLeftBrickTest.java
deleted file mode 100644
index 58a590f4681..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoRotateLeftBrickTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.JumpingSumoRotateLeftBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class JumpingSumoRotateLeftBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialAngle = 90;
- BrickTestUtils.createProjectAndGetStartScript("JumpingSumoRotateLeftBrickTest").addBrick(new
- JumpingSumoRotateLeftBrick(initialAngle));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void jumpingSumoRotateLeftTest() {
- int turnAngleValue = 360;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_jumping_sumo_rotate_left);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_jumping_sumo_change_left_variable_edit_text)
- .performEnterNumber(turnAngleValue)
- .checkShowsNumber(turnAngleValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoRotateRightBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoRotateRightBrickTest.java
deleted file mode 100644
index 17fc7c6d1cb..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoRotateRightBrickTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.JumpingSumoRotateRightBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class JumpingSumoRotateRightBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialAngle = 90;
- BrickTestUtils.createProjectAndGetStartScript("JumpingSumoRotateRightBrickTest").addBrick(new
- JumpingSumoRotateRightBrick(initialAngle));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void jumpingSumoRotateRightTest() {
- int turnAngleValue = 360;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_jumping_sumo_rotate_right);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_jumping_sumo_change_right_variable_edit_text)
- .performEnterNumber(turnAngleValue)
- .checkShowsNumber(turnAngleValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoSoundBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoSoundBrickTest.java
deleted file mode 100644
index c4299b3c178..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/JumpingSumoSoundBrickTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.JumpingSumoSoundBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class JumpingSumoSoundBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialVolume = 50;
- BrickTestUtils.createProjectAndGetStartScript("JumpingSumoSoundsBrickTest").addBrick(new
- JumpingSumoSoundBrick(JumpingSumoSoundBrick.Sounds.DEFAULT, initialVolume));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testJumpingSumoSoundBrick() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_jumping_sumo_sound);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_jumping_sumo_sound_spinner)
- .checkShowsText(R.string.sound_default);
-
- List spinnerValuesResourceIds = Arrays.asList(
- R.string.sound_default,
- R.string.sound_robot,
- R.string.sound_insect,
- R.string.sound_monster);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_jumping_sumo_sound_spinner)
- .checkStringIdValuesAvailable(spinnerValuesResourceIds);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEV3SetLedBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEV3SetLedBrickTest.java
deleted file mode 100644
index 83f03085cea..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEV3SetLedBrickTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.LegoEv3SetLedBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class LegoEV3SetLedBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("legoEV3SetLedBrickTest")
- .addBrick(new LegoEv3SetLedBrick(LegoEv3SetLedBrick.LedStatus.LED_GREEN));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testLegoEV3SetLedBrick() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.ev3_set_led_status);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_ev3_set_led_spinner)
- .performSelectString(R.string.ev3_led_status_orange)
- .checkShowsText(R.string.ev3_led_status_orange);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEv3MotorMoveBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEv3MotorMoveBrickTest.java
deleted file mode 100644
index 464f40e44a8..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEv3MotorMoveBrickTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.LegoEv3MotorMoveBrick;
-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.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class LegoEv3MotorMoveBrickTest {
-
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int initialSpeed = 5;
- BrickTestUtils.createProjectAndGetStartScript("legoMoveBrickTest1")
- .addBrick(new LegoEv3MotorMoveBrick(LegoEv3MotorMoveBrick.Motor.MOTOR_A, new Formula(initialSpeed)));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testLegoEv3MotorMove() {
- int testMoveSpeedValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.ev3_motor_move);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.ev3_motor_move_speed_edit_text)
- .performEnterNumber(testMoveSpeedValue)
- .checkShowsNumber(testMoveSpeedValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEv3MotorStopBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEv3MotorStopBrickTest.java
deleted file mode 100644
index 0a40cacc8e2..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEv3MotorStopBrickTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.LegoEv3MotorStopBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class LegoEv3MotorStopBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("LegoEv3MotorStopBrickTest")
- .addBrick(new LegoEv3MotorStopBrick(LegoEv3MotorStopBrick.Motor.MOTOR_A));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void legoEv3MotorStopBrickTest() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.ev3_motor_stop);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.ev3_stop_motor_spinner)
- .checkShowsText(R.string.ev3_motor_a);
-
- List spinnerValuesResourceIds = Arrays.asList(
- R.string.ev3_motor_a,
- R.string.ev3_motor_b,
- R.string.ev3_motor_c,
- R.string.ev3_motor_d,
- R.string.ev3_motor_b_and_c,
- R.string.ev3_motor_all);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.ev3_stop_motor_spinner)
- .checkStringIdValuesAvailable(spinnerValuesResourceIds);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEv3MotorTurnAngleBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEv3MotorTurnAngleBrickTest.java
deleted file mode 100644
index eebfd90cd1f..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEv3MotorTurnAngleBrickTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.LegoEv3MotorTurnAngleBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class LegoEv3MotorTurnAngleBrickTest {
-
- private static int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int startAngle = 180;
- BrickTestUtils.createProjectAndGetStartScript("LegoEv3MotorTurnAngleBrickTest")
- .addBrick(new LegoEv3MotorTurnAngleBrick(LegoEv3MotorTurnAngleBrick.Motor.MOTOR_A, startAngle));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void legoEv3MotorTurnAngleBrickTest() {
- int testAngle = 100;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.ev3_brick_motor_turn_angle);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.lego_ev3_motor_turn_angle_spinner)
- .checkShowsText(R.string.ev3_motor_a);
-
- List spinnerValuesResourceIds = Arrays.asList(
- R.string.ev3_motor_a,
- R.string.ev3_motor_b,
- R.string.ev3_motor_c,
- R.string.ev3_motor_d,
- R.string.ev3_motor_b_and_c);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.lego_ev3_motor_turn_angle_spinner)
- .checkStringIdValuesAvailable(spinnerValuesResourceIds);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.ev3_motor_turn_angle_edit_text)
- .performEnterNumber(testAngle)
- .checkShowsNumber(testAngle);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEv3PlayToneBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEv3PlayToneBrickTest.java
deleted file mode 100644
index f97dfdcffc8..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoEv3PlayToneBrickTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.LegoEv3PlayToneBrick;
-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.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class LegoEv3PlayToneBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int startFrequency = 1;
- float startDuration = 1;
- int startVolume = 100;
-
- BrickTestUtils.createProjectAndGetStartScript("LegoEv3PlayToneBrickTest")
- .addBrick(new LegoEv3PlayToneBrick(new Formula(startFrequency),
- new Formula(startDuration), new Formula(startVolume)));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void legoEv3PlayToneBrickTest() {
- int testFrequency = 2;
- double testDuration = 2.3;
- int testVolume = 50;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.ev3_play_tone);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_ev3_tone_duration_edit_text)
- .performEnterNumber(testDuration)
- .checkShowsNumber(testDuration);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_ev3_tone_freq_edit_text)
- .performEnterNumber(testFrequency)
- .checkShowsNumber(testFrequency);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_ev3_tone_volume_edit_text)
- .performEnterNumber(testVolume)
- .checkShowsNumber(testVolume);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoNXTMotorMoveBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoNXTMotorMoveBrickTest.java
deleted file mode 100644
index 4ada7dcfdb4..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoNXTMotorMoveBrickTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.LegoNxtMotorMoveBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class LegoNXTMotorMoveBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- int startVelocity = 10;
- BrickTestUtils.createProjectAndGetStartScript("legoNXTMotorMoveBrickTest")
- .addBrick(new LegoNxtMotorMoveBrick(LegoNxtMotorMoveBrick.Motor.MOTOR_A, startVelocity));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testLegoNXTMoveMotorBrick() {
- int velocityToChange = 20;
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.nxt_brick_motor_move);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.lego_motor_action_spinner)
- .checkShowsText(R.string.nxt_motor_a);
-
- List spinnerValuesResourceIds = Arrays.asList(
- R.string.nxt_motor_a,
- R.string.nxt_motor_b,
- R.string.nxt_motor_c,
- R.string.nxt_motor_b_and_c);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.lego_motor_action_spinner)
- .checkStringIdValuesAvailable(spinnerValuesResourceIds);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.motor_action_speed_edit_text)
- .performEnterNumber(velocityToChange)
- .checkShowsNumber(velocityToChange);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoNXTMotorStopBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoNXTMotorStopBrickTest.java
deleted file mode 100644
index c4f8118cf0d..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoNXTMotorStopBrickTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.LegoNxtMotorStopBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class LegoNXTMotorStopBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("legoNXTMotorStopBrickTest")
- .addBrick(new LegoNxtMotorStopBrick(LegoNxtMotorStopBrick.Motor.MOTOR_A));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void testLegoNXTMotorStopBrick() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.nxt_motor_stop);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.stop_motor_spinner)
- .checkShowsText(R.string.nxt_motor_a);
-
- List spinnerValuesResourceIds = Arrays.asList(
- R.string.nxt_motor_a,
- R.string.nxt_motor_b,
- R.string.nxt_motor_c,
- R.string.nxt_motor_b_and_c,
- R.string.nxt_motor_all);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.stop_motor_spinner)
- .checkStringIdValuesAvailable(spinnerValuesResourceIds);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoNxtMotorTurnAngleBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoNxtMotorTurnAngleBrickTest.java
deleted file mode 100644
index 33626b99240..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoNxtMotorTurnAngleBrickTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.LegoNxtMotorTurnAngleBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class LegoNxtMotorTurnAngleBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- final int initialAngle = 90;
- BrickTestUtils.createProjectAndGetStartScript("legoNxtMotorTurnAngleBrickTest1").addBrick(new
- LegoNxtMotorTurnAngleBrick(LegoNxtMotorTurnAngleBrick.Motor.MOTOR_A, initialAngle));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- @Flaky
- public void nxtMotorTurnAngleTest() {
- int turnAngleValue = 40;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.nxt_brick_motor_turn_angle);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.motor_turn_angle_edit_text)
- .performEnterNumber(turnAngleValue)
- .checkShowsNumber(turnAngleValue);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.lego_motor_turn_angle_spinner)
- .checkShowsText(R.string.nxt_motor_a);
-
- List spinnerValuesResourceIds = Arrays.asList(
- R.string.nxt_motor_a,
- R.string.nxt_motor_b,
- R.string.nxt_motor_c,
- R.string.nxt_motor_b_and_c);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.lego_motor_turn_angle_spinner)
- .checkStringIdValuesAvailable(spinnerValuesResourceIds);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoNxtPlayToneBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoNxtPlayToneBrickTest.java
deleted file mode 100644
index 88cb2e55686..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/LegoNxtPlayToneBrickTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.LegoNxtPlayToneBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class LegoNxtPlayToneBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("legoNxtPlayToneBrickTest1").addBrick(new
- LegoNxtPlayToneBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void nxtPlayToneTest() {
- int testFrequency = 40;
- int testDuration = 3;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.nxt_play_tone);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.nxt_tone_freq_edit_text)
- .performEnterNumber(testFrequency)
- .checkShowsNumber(testFrequency);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.nxt_tone_duration_edit_text)
- .performEnterNumber(testDuration)
- .checkShowsNumber(testDuration);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/MoveNStepsBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/MoveNStepsBrickTest.java
deleted file mode 100644
index 3873423c3a4..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/MoveNStepsBrickTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.MoveNStepsBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class MoveNStepsBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("moveNStepsBrickTest")
- .addBrick(new MoveNStepsBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void moveNStepsBrickTest() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_move);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_move_n_steps_edit_text)
- .performEnterNumber(10)
- .checkShowsNumber(10);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/NextLookBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/NextLookBrickTest.java
deleted file mode 100644
index 7c8bfb9254a..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/NextLookBrickTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.NextLookBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class NextLookBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- BrickTestUtils.createProjectAndGetStartScript("nextLookTest1").addBrick(new NextLookBrick());
- brickPosition = 1;
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testNextLookBrick() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_next_look);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/NoteBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/NoteBrickTest.java
deleted file mode 100644
index 752bc40d11f..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/NoteBrickTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.NoteBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class NoteBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("noteBrickTest1")
- .addBrick(new NoteBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void noteBrickTest() {
- final String testNodeText = "Hello world!";
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_note);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_note_edit_text)
- .performEnterString(testNodeText)
- .checkShowsText(testNodeText);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PenBricksTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PenBricksTest.java
index ee064b36b96..9588fcfa25b 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PenBricksTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PenBricksTest.java
@@ -81,44 +81,6 @@ public void setUp() throws Exception {
baseActivityTestRule.launchActivity();
}
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testPenDownBrick() {
- int positionStartedBrick = 0;
- int positionPenDownBrick = 1;
-
- onBrickAtPosition(positionStartedBrick)
- .checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(positionPenDownBrick)
- .checkShowsText(R.string.brick_pen_down);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testPenUpBrick() {
- int positionPenUpBrick = 2;
-
- onBrickAtPosition(positionPenUpBrick)
- .checkShowsText(R.string.brick_pen_up);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testPenSizeBrick() {
- int positionPenSizeBrick = 3;
-
- onBrickAtPosition(positionPenSizeBrick)
- .checkShowsText(R.string.brick_pen_size);
- onBrickAtPosition(positionPenSizeBrick).onFormulaTextField(R.id.brick_set_pen_size_edit_text)
- .perform(click());
- onFormulaEditor()
- .performEnterNumber(100);
- onFormulaEditor()
- .performCloseAndSave();
- onBrickAtPosition(positionPenSizeBrick).onFormulaTextField(R.id.brick_set_pen_size_edit_text)
- .checkShowsNumber(100);
- }
-
@Category({Cat.AppUi.class, Level.Smoke.class})
@Test
public void testPenColorBrick() {
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroIfBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroIfBrickTest.java
deleted file mode 100644
index 0e62f90b567..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroIfBrickTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.Script;
-import org.catrobat.catroid.content.bricks.IfLogicElseBrick;
-import org.catrobat.catroid.content.bricks.IfLogicEndBrick;
-import org.catrobat.catroid.content.bricks.PhiroIfLogicBeginBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class PhiroIfBrickTest {
- private PhiroIfLogicBeginBrick ifBrick;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- createProject();
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testPhiroIfBrick() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(1).checkShowsText(R.string.brick_phiro_sensor_begin);
- onBrickAtPosition(2).checkShowsText(R.string.brick_if_else);
- onBrickAtPosition(3).checkShowsText(R.string.brick_if_end);
-
- List spinnerValuesResourceIds = Arrays.asList(
- R.string.phiro_sensor_front_left,
- R.string.phiro_sensor_front_right,
- R.string.phiro_sensor_side_left,
- R.string.phiro_sensor_side_right,
- R.string.phiro_sensor_bottom_left,
- R.string.phiro_sensor_bottom_right);
-
- onBrickAtPosition(1).onSpinner(R.id.brick_phiro_sensor_action_spinner)
- .checkStringIdValuesAvailable(spinnerValuesResourceIds);
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testPhiroIfBrickDelete() {
- onBrickAtPosition(1).onChildView(withText(R.string.brick_phiro_sensor_begin))
- .perform(click());
- onView(withText(R.string.brick_context_dialog_delete_brick))
- .perform(click());
- onView(withText(R.string.yes))
- .perform(click());
-
- onView(withText(R.string.brick_phiro_sensor_begin))
- .check(doesNotExist());
- onView(withText(R.string.brick_if_else))
- .check(doesNotExist());
- onView(withText(R.string.brick_if_end))
- .check(doesNotExist());
- }
-
- private void createProject() {
- ifBrick = new PhiroIfLogicBeginBrick();
- IfLogicElseBrick ifLogicElseBrick = new IfLogicElseBrick(ifBrick);
- IfLogicEndBrick ifLogicEndBrick = new IfLogicEndBrick(ifBrick, ifLogicElseBrick);
- ifBrick.setIfElseBrick(ifLogicElseBrick);
- ifBrick.setIfEndBrick(ifLogicEndBrick);
- Script script = BrickTestUtils.createProjectAndGetStartScript("PhiroIfBrickTest");
- script.addBrick(ifBrick);
- script.addBrick(ifLogicElseBrick);
- script.addBrick(ifLogicEndBrick);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroMoveMotorBackwardBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroMoveMotorBackwardBrickTest.java
deleted file mode 100644
index 0f684d6a6be..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroMoveMotorBackwardBrickTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.PhiroMotorMoveBackwardBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor;
-import static org.hamcrest.Matchers.allOf;
-
-@RunWith(AndroidJUnit4.class)
-public class PhiroMoveMotorBackwardBrickTest {
- private int brickPosition;
- private int initialSpeed = -70;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() {
-
- PhiroMotorMoveBackwardBrick phiroMotorMoveBackwardBrick =
- new PhiroMotorMoveBackwardBrick(PhiroMotorMoveBackwardBrick.Motor.MOTOR_RIGHT, initialSpeed);
-
- BrickTestUtils.createProjectAndGetStartScript("PhiroMoveMotorBackwardBrickTest")
- .addBrick(phiroMotorMoveBackwardBrick);
-
- brickPosition = 1;
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testPhiroMoveMotorBackwardBrick() {
- int setSpeed = 30;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_phiro_motor_backward_action);
-
- List spinnerValuesResourceIds = Arrays.asList(
- R.string.phiro_motor_right,
- R.string.phiro_motor_left,
- R.string.phiro_motor_both);
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_phiro_motor_backward_action_spinner)
- .checkStringIdValuesAvailable(spinnerValuesResourceIds);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_phiro_motor_backward_action_speed_edit_text)
- .checkShowsNumber(initialSpeed)
- .performEnterNumber(setSpeed)
- .checkShowsNumber(setSpeed);
-
- onBrickAtPosition(brickPosition).onChildView(withId(R.id.brick_phiro_motor_backward_action_speed_edit_text))
- .perform(click());
-
- onView(allOf(withId(R.id.single_seekbar_title), withText(R.string.phiro_motor_speed)))
- .check(matches(isDisplayed()));
-
- onView(allOf(withId(R.id.single_seekbar_value), withText(Integer.toString(setSpeed))))
- .check(matches(isDisplayed()))
- .perform(click());
-
- onFormulaEditor()
- .performEnterNumber(5)
- .performCloseAndSave();
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_phiro_motor_backward_action_speed_edit_text)
- .checkShowsNumber(5);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroMoveMotorForwardBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroMoveMotorForwardBrickTest.java
deleted file mode 100644
index 008fe2bfa3a..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroMoveMotorForwardBrickTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.PhiroMotorMoveForwardBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor;
-import static org.hamcrest.Matchers.allOf;
-
-@RunWith(AndroidJUnit4.class)
-public class PhiroMoveMotorForwardBrickTest {
- private int brickPosition;
- private int initialSpeed = -70;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() {
- PhiroMotorMoveForwardBrick phiroMotorMoveForwardBrick =
- new PhiroMotorMoveForwardBrick(PhiroMotorMoveForwardBrick.Motor.MOTOR_RIGHT, initialSpeed);
- BrickTestUtils.createProjectAndGetStartScript("PhiroMoveMotorForwardBrickTest")
- .addBrick(phiroMotorMoveForwardBrick);
- brickPosition = 1;
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testPhiroMoveMotorForwardBrick() {
- int setSpeed = 30;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_phiro_motor_forward_action);
-
- List spinnerValuesResourceIds = Arrays.asList(
- R.string.phiro_motor_right,
- R.string.phiro_motor_left,
- R.string.phiro_motor_both);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_phiro_motor_forward_action_spinner)
- .checkStringIdValuesAvailable(spinnerValuesResourceIds);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_phiro_motor_forward_action_speed_edit_text)
- .checkShowsNumber(initialSpeed)
- .performEnterNumber(setSpeed)
- .checkShowsNumber(setSpeed);
-
- onBrickAtPosition(brickPosition).onChildView(withId(R.id.brick_phiro_motor_forward_action_speed_edit_text))
- .perform(click());
-
- onView(allOf(withId(R.id.single_seekbar_title), withText(R.string.phiro_motor_speed)))
- .check(matches(isDisplayed()));
-
- onView(allOf(withId(R.id.single_seekbar_value), withText(Integer.toString(setSpeed))))
- .check(matches(isDisplayed()))
- .perform(click());
-
- onFormulaEditor()
- .performEnterNumber(5)
- .performCloseAndSave();
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_phiro_motor_forward_action_speed_edit_text)
- .checkShowsNumber(5);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroPlayToneBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroPlayToneBrickTest.java
deleted file mode 100644
index 01bec4dfea5..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroPlayToneBrickTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.PhiroPlayToneBrick;
-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.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class PhiroPlayToneBrickTest {
- private int brickPosition;
- private int toneDurationInitially = 70;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
-
- BrickTestUtils.createProjectAndGetStartScript("PhiroPlayToneBrickTest")
- .addBrick(new PhiroPlayToneBrick(PhiroPlayToneBrick.Tone.DO, new Formula(toneDurationInitially)));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testPhiroPlayToneBrick() {
- int toneDuration = 30;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.phiro_play_tone);
-
- List spinnerValuesResourceIds = Arrays.asList(
- R.string.phiro_tone_do,
- R.string.phiro_tone_re,
- R.string.phiro_tone_mi,
- R.string.phiro_tone_fa,
- R.string.phiro_tone_so,
- R.string.phiro_tone_la);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_phiro_select_tone_spinner)
- .checkStringIdValuesAvailable(spinnerValuesResourceIds);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_phiro_play_tone_duration_edit_text)
- .checkShowsNumber(toneDurationInitially)
- .performEnterNumber(toneDuration)
- .checkShowsNumber(toneDuration);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroStopMotorBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroStopMotorBrickTest.java
deleted file mode 100644
index 1317ef08eb7..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PhiroStopMotorBrickTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.PhiroMotorStopBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class PhiroStopMotorBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
-
- BrickTestUtils.createProjectAndGetStartScript("PhiroStopMotorBrickTest")
- .addBrick(new PhiroMotorStopBrick(PhiroMotorStopBrick.Motor.MOTOR_BOTH));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class, Cat.Gadgets.class})
- @Test
- public void testPhiroStopMotorBrick() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.phiro_motor_stop);
-
- List spinnerValuesResourceIds = Arrays.asList(
- R.string.phiro_motor_right,
- R.string.phiro_motor_left,
- R.string.phiro_motor_both);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_phiro_stop_motor_spinner)
- .checkStringIdValuesAvailable(spinnerValuesResourceIds);
- }
-}
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 6dc252798b9..4678def4f20 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
@@ -76,7 +76,6 @@
import static org.catrobat.catroid.common.Constants.SOUND_DIRECTORY_NAME;
import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
import static org.catrobat.catroid.uiespresso.ui.fragment.rvutils.RecyclerViewInteractionWrapper.onRecyclerView;
-import static org.catrobat.catroid.utils.PathBuilder.buildScenePath;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.instanceOf;
@@ -115,17 +114,6 @@ public void tearDown() {
}
}
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testBasicLayout() {
- onView(withText(R.string.scripts))
- .perform(click());
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(playSoundAndWaitBrickPosition).checkShowsText(R.string.brick_play_sound_and_wait);
- onBrickAtPosition(playSoundBrickPosition).checkShowsText(R.string.brick_play_sound);
- }
-
@Category({Cat.AppUi.class, Level.Functional.class})
@Test
public void testPlaySoundUpdateDelete() {
@@ -286,7 +274,7 @@ private void createProject() throws IOException {
soundFile = ResourceImporter.createSoundFileFromResourcesInDirectory(
InstrumentationRegistry.getContext().getResources(),
org.catrobat.catroid.test.R.raw.longsound,
- new File(buildScenePath(project.getName(), project.getDefaultScene().getName()), SOUND_DIRECTORY_NAME),
+ new File(project.getDefaultScene().getDirectory(), SOUND_DIRECTORY_NAME),
"longsound.mp3");
SoundInfo soundInfo = new SoundInfo();
@@ -296,7 +284,7 @@ private void createProject() throws IOException {
soundFile2 = ResourceImporter.createSoundFileFromResourcesInDirectory(
InstrumentationRegistry.getContext().getResources(),
org.catrobat.catroid.test.R.raw.testsoundui,
- new File(buildScenePath(project.getName(), project.getDefaultScene().getName()), SOUND_DIRECTORY_NAME),
+ new File(project.getDefaultScene().getDirectory(), SOUND_DIRECTORY_NAME),
"testsoundui.mp3");
SoundInfo soundInfo2 = new SoundInfo();
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 6e460e53d65..19d9a87f06c 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
@@ -69,7 +69,6 @@
import static org.catrobat.catroid.common.Constants.SOUND_DIRECTORY_NAME;
import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
import static org.catrobat.catroid.uiespresso.ui.fragment.rvutils.RecyclerViewInteractionWrapper.onRecyclerView;
-import static org.catrobat.catroid.utils.PathBuilder.buildScenePath;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.instanceOf;
@@ -218,7 +217,7 @@ private void createProject() throws IOException {
soundFile = ResourceImporter.createSoundFileFromResourcesInDirectory(
InstrumentationRegistry.getContext().getResources(),
org.catrobat.catroid.test.R.raw.longsound,
- new File(buildScenePath(project.getName(), project.getDefaultScene().getName()), SOUND_DIRECTORY_NAME),
+ new File(project.getDefaultScene().getDirectory(), SOUND_DIRECTORY_NAME),
"longsound.mp3");
SoundInfo soundInfo = new SoundInfo();
@@ -228,7 +227,7 @@ private void createProject() throws IOException {
soundFile2 = ResourceImporter.createSoundFileFromResourcesInDirectory(
InstrumentationRegistry.getContext().getResources(),
org.catrobat.catroid.test.R.raw.testsoundui,
- new File(buildScenePath(project.getName(), project.getDefaultScene().getName()), SOUND_DIRECTORY_NAME),
+ new File(project.getDefaultScene().getDirectory(), SOUND_DIRECTORY_NAME),
"testsoundui.mp3");
SoundInfo soundInfo2 = new SoundInfo();
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PointInDirectionBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PointInDirectionBrickTest.java
deleted file mode 100644
index df56f0eb95c..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PointInDirectionBrickTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.PointInDirectionBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class PointInDirectionBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("PointInDirectionBrick")
- .addBrick(new PointInDirectionBrick(90));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testPointInDirectionBrick() {
- double directionValueDegrees = 270.1;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_point_in_direction);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_point_in_direction_edit_text)
- .performEnterNumber(directionValueDegrees)
- .checkShowsNumber(directionValueDegrees);
- }
-}
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
new file mode 100644
index 00000000000..73224675096
--- /dev/null
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PointToBrickAdditionalTest.java
@@ -0,0 +1,184 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2018 The Catrobat Team
+ * ()
+ *
+ * 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 .
+ */
+
+package org.catrobat.catroid.uiespresso.content.brick.app;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Environment;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.espresso.intent.Intents;
+import android.support.test.rule.GrantPermissionRule;
+import android.support.test.runner.AndroidJUnit4;
+
+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;
+import org.catrobat.catroid.io.StorageOperations;
+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.BaseActivityInstrumentationRule;
+import org.hamcrest.Matcher;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.intent.Intents.intended;
+import static android.support.test.espresso.intent.Intents.intending;
+import static android.support.test.espresso.intent.matcher.IntentMatchers.hasAction;
+import static android.support.test.espresso.intent.matcher.IntentMatchers.hasExtras;
+import static android.support.test.espresso.intent.matcher.IntentMatchers.hasType;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
+import static org.catrobat.catroid.uiespresso.util.matchers.BundleMatchers.bundleHasExtraIntent;
+import static org.catrobat.catroid.uiespresso.util.matchers.BundleMatchers.bundleHasMatchingString;
+import static org.hamcrest.core.AllOf.allOf;
+
+@RunWith(AndroidJUnit4.class)
+public class PointToBrickAdditionalTest {
+ private Matcher expectedChooserIntent;
+ private Matcher expectedGetContentIntent;
+ private final String lookFileName = "catroid_sunglasses.png";
+ private final File tmpPath = new File(
+ Environment.getExternalStorageDirectory().getAbsolutePath(), "Pocket Code Test Temp");
+ @Rule
+ public BaseActivityInstrumentationRule baseActivityTestRule = new
+ BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
+ @Rule
+ public GrantPermissionRule runtimePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE);
+
+ @Before
+ public void setUp() throws Exception {
+ createProject(this.getClass().getSimpleName());
+ baseActivityTestRule.launchActivity();
+ Intents.init();
+
+ expectedGetContentIntent = allOf(
+ hasAction("android.intent.action.GET_CONTENT"),
+ hasType("image/*"));
+
+ String chooserTitle = UiTestUtils.getResourcesString(R.string.select_look_from_gallery);
+ expectedChooserIntent = allOf(
+ hasAction("android.intent.action.CHOOSER"),
+ hasExtras(bundleHasMatchingString("android.intent.extra.TITLE", chooserTitle)),
+ hasExtras(bundleHasExtraIntent(expectedGetContentIntent)));
+
+ if (!tmpPath.exists()) {
+ tmpPath.mkdirs();
+ }
+
+ File imageFile = ResourceImporter.createImageFileFromResourcesInDirectory(
+ InstrumentationRegistry.getContext().getResources(),
+ org.catrobat.catroid.test.R.drawable.catroid_banzai,
+ tmpPath,
+ lookFileName,
+ 1);
+
+ Intent resultData = new Intent();
+ resultData.setData(Uri.fromFile(imageFile));
+
+ Instrumentation.ActivityResult result =
+ new Instrumentation.ActivityResult(Activity.RESULT_OK, resultData);
+
+ intending(expectedChooserIntent).respondWith(result);
+ }
+
+ @Test
+ public void testBothOfPointTowardsBrickAndCloneBrickSpinnersShowTheNewAddedObject() {
+ onBrickAtPosition(1)
+ .onSpinner(R.id.brick_point_to_spinner)
+ .performSelectNameable(R.string.new_option);
+
+ onView(withId(R.id.dialog_new_look_gallery))
+ .perform(click());
+
+ intended(expectedChooserIntent);
+
+ onView(withText(R.string.new_sprite_dialog_title))
+ .check(matches(isDisplayed()));
+ onView(withText(R.string.ok))
+ .perform(click());
+
+ String newObjectName = lookFileName.replace(".png", "");
+ List pointToBrickSpinnerValues = new ArrayList<>();
+ pointToBrickSpinnerValues.add(InstrumentationRegistry.getTargetContext().getString(R.string.new_option));
+ pointToBrickSpinnerValues.add(newObjectName);
+
+ List cloneBrickSpinnerValues = new ArrayList<>();
+ cloneBrickSpinnerValues.add(InstrumentationRegistry.getTargetContext().getString(R.string.brick_clone_this));
+ cloneBrickSpinnerValues.add(newObjectName);
+
+ onBrickAtPosition(2)
+ .onSpinner(R.id.brick_point_to_spinner)
+ .checkNameableValuesAvailable(pointToBrickSpinnerValues);
+
+ onBrickAtPosition(3)
+ .onSpinner(R.id.brick_clone_spinner)
+ .checkNameableValuesAvailable(cloneBrickSpinnerValues);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ Intents.release();
+ baseActivityTestRule.finishActivity();
+ StorageOperations.deleteDir(tmpPath);
+ TestUtils.deleteProjects(this.getClass().getSimpleName());
+ }
+
+ private void createProject(String projectName) {
+ Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
+ Sprite sprite = new Sprite("testSprite");
+ Script script = new StartScript();
+
+ 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/PointToBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PointToBrickTest.java
deleted file mode 100644
index 2c2a67ae951..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/PointToBrickTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.ProjectManager;
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.Sprite;
-import org.catrobat.catroid.content.bricks.PointToBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class PointToBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void pointToBrickOneSpriteTest() {
- BrickTestUtils.createProjectAndGetStartScript("PointToBrickTest")
- .addBrick(new PointToBrick());
- baseActivityTestRule.launchActivity();
-
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_point_to);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_point_to_spinner)
- .checkShowsText(R.string.new_option)
- .performSelectNameable(R.string.new_option);
-
- onView(withText(R.string.new_sprite_dialog_title))
- .check(matches(isDisplayed()));
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void pointToBrickTwoSpritesTest() {
- BrickTestUtils.createProjectAndGetStartScript("PointToBrickTest")
- .addBrick(new PointToBrick());
- String secondSpriteName = "secondTestSprite";
- Sprite sprite = new Sprite(secondSpriteName);
- ProjectManager.getInstance().getCurrentProject().getDefaultScene().addSprite(sprite);
- baseActivityTestRule.launchActivity();
-
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_point_to);
-
- onBrickAtPosition(brickPosition).onVariableSpinner(R.id.brick_point_to_spinner)
- .checkShowsText(secondSpriteName);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/RepeatBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/RepeatBrickTest.java
index fb29d98f5b3..51bfdc51237 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/RepeatBrickTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/RepeatBrickTest.java
@@ -120,20 +120,6 @@ public void testAddBrick() {
assertEquals(endBrick, repeatBrick.getLoopEndBrick());
}
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testChangeFormula() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(1).checkShowsText(R.string.brick_repeat);
- onBrickAtPosition(2).checkShowsText(R.string.brick_set_x);
- onBrickAtPosition(3).checkShowsText(R.string.brick_loop_end);
- onBrickAtPosition(4).checkShowsText(R.string.brick_set_y);
-
- onBrickAtPosition(1).onFormulaTextField(R.id.brick_repeat_edit_text)
- .performEnterNumber(42)
- .checkShowsNumber(42);
- }
-
@Category({Cat.AppUi.class, Level.Functional.class})
@Test
public void testCopyBrick() {
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/RepeatUntilBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/RepeatUntilBrickTest.java
index d62b1598679..052b97bd854 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/RepeatUntilBrickTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/RepeatUntilBrickTest.java
@@ -120,20 +120,6 @@ public void testAddBrick() {
assertEquals(endBrick, repeatBrick.getLoopEndBrick());
}
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testChangeFormula() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(1).checkShowsText(R.string.brick_repeat_until);
- onBrickAtPosition(2).checkShowsText(R.string.brick_set_x);
- onBrickAtPosition(3).checkShowsText(R.string.brick_loop_end);
- onBrickAtPosition(4).checkShowsText(R.string.brick_set_y);
-
- onBrickAtPosition(1).onFormulaTextField(R.id.brick_repeat_until_edit_text)
- .performEnterNumber(42)
- .checkShowsNumber(42);
- }
-
@Category({Cat.AppUi.class, Level.Functional.class})
@Test
public void testCopyBrick() {
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 18beef69acf..0647d549e32 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
@@ -67,22 +67,6 @@ public void setUp() throws Exception {
baseActivityTestRule.launchActivity();
}
- @Category({Cat.AppUi.class, Level.Functional.class})
- @Test
- public void testReplaceItemInUserListBrick() {
- int someArbitraryNumber = 2;
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_replace_item_in_userlist_replace_in_list);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_replace_item_in_userlist_at_index_edit_text)
- .performEnterNumber(someArbitraryNumber)
- .checkShowsNumber(someArbitraryNumber);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_replace_item_in_userlist_value_edit_text)
- .performEnterNumber(someArbitraryNumber)
- .checkShowsNumber(someArbitraryNumber);
- }
-
@Category({Cat.AppUi.class, Level.Functional.class})
@Test
public void testCreateNewUserListAndDeletion() {
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SayBubbleBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SayBubbleBrickTest.java
deleted file mode 100644
index c4fdaa5bb5f..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SayBubbleBrickTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.SayBubbleBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class SayBubbleBrickTest {
-
- private int brickPosition;
- private String sayString = "say something";
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- BrickTestUtils.createProjectAndGetStartScript("sayBubbleBrickTest").addBrick(new SayBubbleBrick(sayString));
- brickPosition = 1;
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.CatrobatLanguage.class, Level.Smoke.class})
- @Test
- public void sayBubbleBrickTest() {
-
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_say_bubble);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_bubble_edit_text)
- .checkShowsText(sayString);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SayForBubbleBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SayForBubbleBrickTest.java
deleted file mode 100644
index 6fddb9b98b7..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SayForBubbleBrickTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.Script;
-import org.catrobat.catroid.content.bricks.SayForBubbleBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.UiTestUtils;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class SayForBubbleBrickTest {
-
- private int brickPositionOneSecond;
- private int brickPositionTwoSeconds;
-
- private String sayString = "say something";
- private float durationOne = 1;
- private float durationTwo = 2;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- Script script = BrickTestUtils.createProjectAndGetStartScript("sayBubbleBrickTest");
- script.addBrick(new SayForBubbleBrick(sayString, durationOne));
- script.addBrick(new SayForBubbleBrick(sayString, durationTwo));
- brickPositionOneSecond = 1;
- brickPositionTwoSeconds = 2;
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.CatrobatLanguage.class, Level.Smoke.class})
- @Test
- public void sayForBubbleBrickTest() {
- onBrickAtPosition(brickPositionOneSecond)
- .checkShowsText(R.string.brick_say_bubble);
-
- onBrickAtPosition(brickPositionOneSecond).onFormulaTextField(R.id.brick_for_bubble_edit_text_text)
- .checkShowsText(sayString);
-
- onBrickAtPosition(brickPositionOneSecond)
- .checkShowsText(R.string.brick_think_say_for_text);
-
- onBrickAtPosition(brickPositionOneSecond).onFormulaTextField(R.id.brick_for_bubble_edit_text_duration)
- .check(matches(withText("1 ")));
-
- String second = UiTestUtils.getResources().getQuantityString(R.plurals.second_plural, (int) durationOne);
-
- onBrickAtPosition(brickPositionOneSecond)
- .checkShowsText(second);
-
- onBrickAtPosition(brickPositionTwoSeconds).onFormulaTextField(R.id.brick_for_bubble_edit_text_duration)
- .check(matches(withText("2 ")));
-
- String seconds = UiTestUtils.getResources().getQuantityString(R.plurals.second_plural, (int) durationTwo);
-
- onBrickAtPosition(brickPositionTwoSeconds)
- .checkShowsText(seconds);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastSendBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SceneBricksTest.java
similarity index 58%
rename from catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastSendBrickTest.java
rename to catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SceneBricksTest.java
index 74717de582e..a5c702b200d 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/BroadcastSendBrickTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SceneBricksTest.java
@@ -25,7 +25,6 @@
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
-import android.widget.EditText;
import org.catrobat.catroid.ProjectManager;
import org.catrobat.catroid.R;
@@ -33,93 +32,91 @@
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.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.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
+import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
+import java.util.ArrayList;
+import java.util.List;
+
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
-import static android.support.test.espresso.action.ViewActions.typeText;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.instanceOf;
@RunWith(AndroidJUnit4.class)
-public class BroadcastSendBrickTest {
- private String defaultMessage = "defaultMessage";
-
- private int broadcastSendPosition = 1;
-
+public class SceneBricksTest {
@Rule
public BaseActivityInstrumentationRule baseActivityTestRule = new
BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
@Before
public void setUp() throws Exception {
- createProject("BroadcastBrickTest");
+ createProject(this.getClass().getSimpleName());
baseActivityTestRule.launchActivity();
}
- @Category({Cat.AppUi.class, Level.Functional.class})
@Test
- @Flaky
- public void testBroadcastSendBrick() {
- String uselessMessage = "useless";
- createNewMessageOnSpinner(R.id.brick_broadcast_spinner, broadcastSendPosition, uselessMessage);
-
- onBrickAtPosition(broadcastSendPosition).onSpinner(R.id.brick_broadcast_spinner)
- .checkShowsText(uselessMessage);
- onBrickAtPosition(broadcastSendPosition).onSpinner(R.id.brick_broadcast_spinner)
- .perform(click());
- onView(withText(defaultMessage))
+ public void testAllSceneBricksSpinnersShowTheNewAddedScene() {
+ String newSceneName = "Scene 2";
+ onBrickAtPosition(1)
+ .onSpinner(R.id.brick_scene_start_spinner)
+ .performSelectNameable(R.string.new_option);
+ onView(withId(android.R.id.button1))
.perform(click());
- onBrickAtPosition(broadcastSendPosition).onSpinner(R.id.brick_broadcast_spinner)
- .checkShowsText(defaultMessage);
+
+ onBrickAtPosition(1)
+ .onSpinner(R.id.brick_scene_start_spinner)
+ .checkShowsText(newSceneName);
+
+ List sceneStartBrickSpinnerValues = new ArrayList<>();
+ sceneStartBrickSpinnerValues.add(InstrumentationRegistry.getTargetContext().getString(R.string.new_option));
+ sceneStartBrickSpinnerValues.add(InstrumentationRegistry.getTargetContext().getString(R.string.default_scene_name, 1));
+ sceneStartBrickSpinnerValues.add(newSceneName);
+
+ List sceneTransitionBrickSpinnerValues = new ArrayList<>();
+ sceneTransitionBrickSpinnerValues.add(InstrumentationRegistry.getTargetContext().getString(R.string.new_option));
+ sceneTransitionBrickSpinnerValues.add(newSceneName);
+
+ onBrickAtPosition(2)
+ .onSpinner(R.id.brick_scene_start_spinner)
+ .checkNameableValuesAvailable(sceneStartBrickSpinnerValues);
+
+ onBrickAtPosition(3)
+ .onSpinner(R.id.brick_scene_transition_spinner)
+ .checkNameableValuesAvailable(sceneTransitionBrickSpinnerValues);
+ onBrickAtPosition(4)
+ .onSpinner(R.id.brick_scene_transition_spinner)
+ .checkNameableValuesAvailable(sceneTransitionBrickSpinnerValues);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ TestUtils.deleteProjects(this.getClass().getSimpleName());
}
private void createProject(String projectName) {
+ String sceneName = "New Scene";
Project project = new Project(InstrumentationRegistry.getTargetContext(), projectName);
Sprite sprite = new Sprite("testSprite");
Script script = new StartScript();
- sprite.addScript(script);
-
- script.addBrick(new BroadcastBrick(defaultMessage));
+ 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);
}
-
- public void createNewMessageOnSpinner(int spinnerResourceId, int position, String message) {
- onBrickAtPosition(position).onSpinner(spinnerResourceId)
- .perform(click());
-
- onView(withText(R.string.new_option))
- .perform(click());
-
- onView(allOf(withId(R.id.input_edit_text), isDisplayed(), instanceOf(EditText.class)))
- .perform(typeText(message));
- closeSoftKeyboard();
-
- onView(withId(android.R.id.button1))
- .perform(click());
-
- onBrickAtPosition(position).onSpinner(spinnerResourceId)
- .checkShowsText(message);
- }
}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SceneTransmitionBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SceneTransmitionBrickTest.java
deleted file mode 100644
index b4d9e5fae8f..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SceneTransmitionBrickTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.SceneTransitionBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class SceneTransmitionBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- String myscene = "testScene";
- BrickTestUtils.createProjectAndGetStartScript("sceneTransmitionBrickTest")
- .addBrick(new SceneTransitionBrick(myscene));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void sceneTransmitionBrickTest() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_scene_transition);
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_scene_transition_spinner)
- .checkShowsText(R.string.new_option);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetBrightnessBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetBrightnessBrickTest.java
deleted file mode 100644
index 45c314af0d3..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetBrightnessBrickTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.SetBrightnessBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class SetBrightnessBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("SetBrightnessBrick")
- .addBrick(new SetBrightnessBrick(30.5));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testSetBrightnessBrick() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_set_brightness);
- double newBrightness = 65.5;
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_set_brightness_edit_text)
- .performEnterNumber(newBrightness)
- .checkShowsNumber(newBrightness);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetColorBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetColorBrickTest.java
deleted file mode 100644
index 2472507ade9..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetColorBrickTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.SetColorBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class SetColorBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("setColorBrickTest1")
- .addBrick(new SetColorBrick(0f));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void setColorBrickTest() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_set_color);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_set_color_edit_text)
- .performEnterNumber(1)
- .checkShowsNumber(1);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetLookByIndexBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetLookByIndexBrickTest.java
deleted file mode 100644
index 16a6190bb79..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetLookByIndexBrickTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.common.BrickValues;
-import org.catrobat.catroid.content.bricks.SetLookByIndexBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class SetLookByIndexBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("setLookByIndexTest1")
- .addBrick(new SetLookByIndexBrick(BrickValues.SET_LOOK_BY_INDEX));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void setColorBrickTest() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_set_look_by_index);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_set_look_by_index_edit_text)
- .performEnterNumber(2)
- .checkShowsNumber(2);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetRotationStyleBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetRotationStyleBrickTest.java
deleted file mode 100644
index f492b88f38b..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetRotationStyleBrickTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.SetRotationStyleBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.annotations.Flaky;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class SetRotationStyleBrickTest {
-
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION,
- SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("rotationStyleBrickTest1")
- .addBrick(new SetRotationStyleBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- @Flaky
- public void testSetRotationStyle() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_set_rotation_style);
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_set_rotation_style_spinner)
- .checkShowsText(R.string.brick_set_rotation_style_lr);
-
- Context context = InstrumentationRegistry.getTargetContext();
- List spinnerValues = Arrays.asList(
- context.getString(R.string.brick_set_rotation_style_normal),
- context.getString(R.string.brick_set_rotation_style_no));
-
- onBrickAtPosition(brickPosition).onSpinner(R.id.brick_set_rotation_style_spinner)
- .checkNameableValuesAvailable(spinnerValues);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetSizeToBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetSizeToBrickTest.java
deleted file mode 100644
index 20fa3b6931a..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetSizeToBrickTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.SetSizeToBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-public class SetSizeToBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- final double newSize = 200;
- BrickTestUtils.createProjectAndGetStartScript("setSizeBrickBasicTest")
- .addBrick(new SetSizeToBrick(newSize));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void setSizeToBrickTest() {
- int sizeValue = 20;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_set_size_to);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_set_size_to_edit_text)
- .performEnterNumber(sizeValue)
- .checkShowsNumber(sizeValue);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetTransparencyBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetTransparencyBrickTest.java
deleted file mode 100644
index 660ab01167f..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetTransparencyBrickTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.SetTransparencyBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class SetTransparencyBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("setTransparencyBrickTest1").addBrick(new SetTransparencyBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testStopAllSoundsBrick() {
- int transparencyValue = 40;
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_set_transparency);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_set_transparency_to_edit_text)
- .performEnterNumber(transparencyValue)
- .checkShowsNumber(transparencyValue);
- }
-}
-
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetVariableTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetVariableTest.java
index 3b416cce4f3..bb63b83bd22 100644
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetVariableTest.java
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetVariableTest.java
@@ -31,6 +31,7 @@
import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
import org.catrobat.catroid.uiespresso.testsuites.Cat;
import org.catrobat.catroid.uiespresso.testsuites.Level;
+import org.catrobat.catroid.uiespresso.util.UiTestUtils;
import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
import org.junit.Before;
import org.junit.Rule;
@@ -121,7 +122,10 @@ public void testIfSetVariableSpinnerCanHoldMultipleVariables() {
.performNewVariable(userVariableNameTwo);
onBrickAtPosition(2).onVariableSpinner(R.id.set_variable_spinner)
- .checkNameableValuesAvailable(Arrays.asList(userVariableName, userVariableNameTwo));
+ .checkNameableValuesAvailable(Arrays.asList(
+ UiTestUtils.getResourcesString(R.string.new_option),
+ userVariableName,
+ userVariableNameTwo));
}
private void addNewVariableViaFormulaEditor(int brickPosition, String userVariableName) {
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetVolumeToBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetVolumeToBrickTest.java
deleted file mode 100644
index ad14017460a..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetVolumeToBrickTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.SetVolumeToBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class SetVolumeToBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("setVolumeToBrickTest1").addBrick(new SetVolumeToBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testSetVolumeToBrickFloatValue() {
- float volumeToChange = 12.4f;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_set_volume_to);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_set_volume_to_edit_text)
- .performEnterNumber(volumeToChange)
- .checkShowsNumber(volumeToChange);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetXBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetXBrickTest.java
deleted file mode 100644
index a68d86a609a..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetXBrickTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.common.BrickValues;
-import org.catrobat.catroid.content.bricks.SetXBrick;
-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.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class SetXBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("setXBrickTest1")
- .addBrick(new SetXBrick(new Formula(BrickValues.X_POSITION)));
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testSetXBrick() {
- int xToSet = 12;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_set_x);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_set_x_edit_text)
- .performEnterNumber(xToSet)
- .checkShowsNumber(xToSet);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetYBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetYBrickTest.java
deleted file mode 100644
index 64be04e2dcb..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetYBrickTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.SetYBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.testsuites.Cat;
-import org.catrobat.catroid.uiespresso.testsuites.Level;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class SetYBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("setYBrickTest1").addBrick(new SetYBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Category({Cat.AppUi.class, Level.Smoke.class})
- @Test
- public void testSetYBrick() {
- int yToSet = 12;
-
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_set_y);
-
- onBrickAtPosition(brickPosition).onFormulaTextField(R.id.brick_set_y_edit_text)
- .performEnterNumber(yToSet)
- .checkShowsNumber(yToSet);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ShowBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ShowBrickTest.java
deleted file mode 100644
index e7a51586fb3..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ShowBrickTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * ()
- *
- * 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 .
- */
-
-package org.catrobat.catroid.uiespresso.content.brick.app;
-
-import android.support.test.runner.AndroidJUnit4;
-
-import org.catrobat.catroid.R;
-import org.catrobat.catroid.content.bricks.ShowBrick;
-import org.catrobat.catroid.ui.SpriteActivity;
-import org.catrobat.catroid.uiespresso.content.brick.utils.BrickTestUtils;
-import org.catrobat.catroid.uiespresso.util.rules.BaseActivityInstrumentationRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
-
-@RunWith(AndroidJUnit4.class)
-public class ShowBrickTest {
- private int brickPosition;
-
- @Rule
- public BaseActivityInstrumentationRule baseActivityTestRule = new
- BaseActivityInstrumentationRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS);
-
- @Before
- public void setUp() throws Exception {
- brickPosition = 1;
- BrickTestUtils.createProjectAndGetStartScript("showBrickTest1").addBrick(new ShowBrick());
- baseActivityTestRule.launchActivity();
- }
-
- @Test
- public void testShowBrick() {
- onBrickAtPosition(0).checkShowsText(R.string.brick_when_started);
- onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_show);
- }
-}
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ShowTextBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ShowTextBrickTest.java
deleted file mode 100644
index 8a057c55e8c..00000000000
--- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/ShowTextBrickTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2018 The Catrobat Team
- * (