Skip to content

CAT-1443 Set/change variable fixed #1306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avihric merged 1 commit into from
Aug 8, 2015
Merged

CAT-1443 Set/change variable fixed #1306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion catroid/src/org/catrobat/catroid/content/bricks/ChangeVariableBrick.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public ChangeVariableBrick copyBrickForSprite(Sprite sprite) {
@Override
public ChangeVariableBrick clone() {
ChangeVariableBrick clonedBrick = new ChangeVariableBrick(getFormulaWithBrickField(
BrickField.VARIABLE_CHANGE).clone(), null, inUserBrick);
BrickField.VARIABLE_CHANGE).clone(), userVariable, inUserBrick);
return clonedBrick;
}

Expand Down
2 changes: 1 addition & 1 deletion catroid/src/org/catrobat/catroid/content/bricks/SetVariableBrick.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public SetVariableBrick copyBrickForSprite(Sprite sprite) {
@Override
public SetVariableBrick clone() {
SetVariableBrick clonedBrick = new SetVariableBrick(getFormulaWithBrickField(BrickField.VARIABLE)
.clone(), null);
.clone(), userVariable);
return clonedBrick;
}

Expand Down
53 changes: 53 additions & 0 deletions catroidTest/src/org/catrobat/catroid/uitest/content/brick/ChangeVariableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,59 @@ public void testCreateUserVariableInFormulaEditor() {
assertTrue("UserVariable Name not as expected", userVariable.getName().equals(userVariableName));
}

public void testViewInFormulaEditorAfterClone(){

String userVariableName = "testVariable1";
String userVariableNameTwo = "testVariable2";

solo.clickOnView(solo.getView(R.id.brick_change_variable_edit_text));
solo.waitForFragmentByTag(FormulaEditorFragment.FORMULA_EDITOR_FRAGMENT_TAG);
solo.clickOnView(solo.getView(R.id.formula_editor_keyboard_data));
assertTrue("Data Fragment not shown", solo.waitForFragmentByTag(FormulaEditorDataFragment.USER_DATA_TAG));

solo.clickOnView(solo.getView(R.id.button_add));
assertTrue("Add Data Dialog not shown",
solo.waitForText(solo.getString(R.string.formula_editor_data_dialog_title)));
EditText editText = (EditText) solo.getView(R.id.dialog_formula_editor_data_name_edit_text);

solo.enterText(editText, userVariableName);
finishUserVariableCreationSafeButSlow(userVariableName, true);

solo.goBack();
solo.clickOnView(solo.getView(R.id.formula_editor_keyboard_ok));

solo.clickOnText(solo.getString(R.string.brick_change_variable));
solo.clickOnText(solo.getString(R.string.brick_context_dialog_copy_brick));

solo.clickOnText(solo.getString(R.string.brick_change_variable));


solo.clickOnText(userVariableName);

solo.clickOnText(solo.getString(R.string.brick_variable_spinner_create_new_variable));


EditText editTextTwo = (EditText) solo.getView(R.id.dialog_formula_editor_data_name_edit_text);

solo.enterText(editTextTwo, userVariableNameTwo);
solo.clickOnButton(solo.getString(R.string.ok));

solo.clickOnText(solo.getString(R.string.brick_change_variable));
solo.clickOnText(solo.getString(R.string.brick_context_dialog_move_brick));

ArrayList<Integer> yPosition = UiTestUtils.getListItemYPositions(solo, 0);
int addedYPosition = UiTestUtils.getAddedListItemYPosition(solo);
solo.drag(20, 20, addedYPosition, yPosition.get(yPosition.size() - 1) + 20, 20);

solo.clickOnText(solo.getString(R.string.brick_change_variable));
solo.clickOnText(solo.getString(R.string.brick_context_dialog_formula_edit_brick));

assertTrue("Uservariable in view is not right displayed , maybe clone() is broken...",
solo.searchText(userVariableName, true));

solo.sleep(2000);
Copy link
Member

@robertpainsi robertpainsi Aug 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be unnecessary.

}

private void createProject() {
project = new Project(null, UiTestUtils.DEFAULT_TEST_PROJECT_NAME);
Sprite sprite = new Sprite("cat");
Expand Down
56 changes: 55 additions & 1 deletion catroidTest/src/org/catrobat/catroid/uitest/content/brick/SetVariableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,61 @@ public void testCreateUserVariableInFormulaEditor() {
assertNotNull("UserVariable is null", userVariable);
assertTrue("UserVariable Name not as expected", userVariable.getName().equals(userVariableName));
}


public void testViewInFormulaEditorAfterClone(){
String userVariableName = "testVariable1";
String userVariableNameTwo = "testVariable2";

solo.clickOnView(solo.getView(R.id.brick_set_variable_edit_text));
solo.waitForFragmentByTag(FormulaEditorFragment.FORMULA_EDITOR_FRAGMENT_TAG);
solo.clickOnView(solo.getView(R.id.formula_editor_keyboard_data));
assertTrue("Data Fragment not shown", solo.waitForFragmentByTag(FormulaEditorDataFragment.USER_DATA_TAG));

solo.clickOnView(solo.getView(R.id.button_add));
assertTrue("Add Data Dialog not shown",
solo.waitForText(solo.getString(R.string.formula_editor_data_dialog_title)));
EditText editText = (EditText) solo.getView(R.id.dialog_formula_editor_data_name_edit_text);

solo.enterText(editText, userVariableName);
finishUserVariableCreationSafeButSlow(userVariableName, true);

solo.goBack();
solo.clickOnView(solo.getView(R.id.formula_editor_keyboard_ok));

solo.clickOnView(solo.getView(R.id.button_add));
solo.clickOnText(solo.getString(R.string.category_data));

solo.clickOnText(solo.getString(R.string.brick_set_variable));

solo.clickOnText(solo.getString(R.string.brick_set_variable));


solo.clickOnText(userVariableName);

solo.clickOnText(solo.getString(R.string.brick_variable_spinner_create_new_variable));


EditText editTextTwo = (EditText) solo.getView(R.id.dialog_formula_editor_data_name_edit_text);

solo.enterText(editTextTwo, userVariableNameTwo);
solo.clickOnButton(solo.getString(R.string.ok));

solo.clickOnText(solo.getString(R.string.brick_set_variable));
solo.clickOnText(solo.getString(R.string.brick_context_dialog_move_brick));

ArrayList<Integer> yPosition = UiTestUtils.getListItemYPositions(solo, 0);
int addedYPosition = UiTestUtils.getAddedListItemYPosition(solo);
solo.drag(20, 20, addedYPosition, yPosition.get(yPosition.size() - 1) + 20, 20);

solo.clickOnText(solo.getString(R.string.brick_set_variable));
solo.clickOnText(solo.getString(R.string.brick_context_dialog_formula_edit_brick));

assertTrue("Uservariable in view is not right displayed , maybe clone() is broken...",
solo.searchText(userVariableName,true));

solo.sleep(5000);
Copy link
Member

@robertpainsi robertpainsi Aug 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove as well

Copy link

@MichaelStessl MichaelStessl Aug 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both tests are necessary because only these two new tests show the bug that was fixed with the bugfix...

Copy link
Member

@robertpainsi robertpainsi Aug 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment is only about the solo.sleep at the end of the test 😉 which shouldn't be necessary... or is it?

Copy link

@MichaelStessl MichaelStessl Aug 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for jenkins no ... for human yes ... :-)

Copy link
Contributor

@avihric avihric Aug 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Who cares about humans 🙊
I agree with @robertpainsi to remove the sleeps, the testsuite already takes a lot of time

}

private void createProject() {
project = new Project(null, UiTestUtils.DEFAULT_TEST_PROJECT_NAME);
Sprite sprite = new Sprite("cat");
Expand Down