From 5997b705425134155196986430818a4ff3271e52 Mon Sep 17 00:00:00 2001 From: thmq Date: Sun, 14 Oct 2018 18:57:22 +0200 Subject: [PATCH] [RELEASE] Fix issues with missing strings, increased version code. - fixed issues with missing string, that was obfuscated by translation workflow -> missing strings only show up when all translations of this string are removed. - increased version code for Google Play. --- catroid/build.gradle | 2 +- .../uiespresso/content/brick/app/SetBackgroundBrickTest.java | 2 +- .../catroid/uiespresso/content/brick/app/SetLookBrickTest.java | 2 +- .../catroid/uiespresso/content/brick/app/VariableBrickTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/catroid/build.gradle b/catroid/build.gradle index d0aa7ad0724..59a3e443f76 100644 --- a/catroid/build.gradle +++ b/catroid/build.gradle @@ -111,7 +111,7 @@ android { targetSdkVersion 22 applicationId appId testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' - versionCode 49 + versionCode 50 println "VersionCode is $versionCode" versionName "0.9.42" println "VersionName is $versionName" diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetBackgroundBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetBackgroundBrickTest.java index f7e5f8945a9..cceca489327 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetBackgroundBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetBackgroundBrickTest.java @@ -76,7 +76,7 @@ public void testSetBackgroundBrickMediaLibraryUrl() { onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_set_background); onBrickAtPosition(brickPosition).onSpinner(R.id.brick_set_look_spinner) - .performSelectNameable(R.string.brick_variable_spinner_create_new_variable); + .performSelectNameable(R.string.new_option); Intents.init(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetLookBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetLookBrickTest.java index 90d25523def..ade2d3e592c 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetLookBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetLookBrickTest.java @@ -76,7 +76,7 @@ public void testSetLookBrickMediaLibraryUrl() { onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_set_look); onBrickAtPosition(brickPosition).onSpinner(R.id.brick_set_look_spinner) - .performSelectNameable(R.string.brick_variable_spinner_create_new_variable); + .performSelectNameable(R.string.new_option); Intents.init(); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VariableBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VariableBrickTest.java index 43947ceafb3..e2afd810577 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VariableBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VariableBrickTest.java @@ -109,7 +109,7 @@ public void testNewVariableCanceling() { onBrickAtPosition(setBrickPosition).onVariableSpinner(R.id.set_variable_spinner) .perform(click()); - onView(withText(R.string.brick_variable_spinner_create_new_variable)) + onView(withText(R.string.new_option)) .perform(click()); closeSoftKeyboard();