Merge pull request Catrobat#142 from Catrobat/issue#54

Issue#54

Author: kaufi

catroid/src/org/catrobat/catroid/ui/fragment/ScriptFragment.java

@@ -291,7 +291,7 @@ public void updateAdapterAfterAddNewBrick(Brick brickToBeAdded) {
 		} else {
 			int firstVisibleBrick = listView.getFirstVisiblePosition();
 			int lastVisibleBrick = listView.getLastVisiblePosition();
-			int position = ((lastVisibleBrick - firstVisibleBrick) / 2);
+			int position = ((1 + lastVisibleBrick - firstVisibleBrick) / 2);
 			position += firstVisibleBrick;
 			adapter.addNewBrick(position, brickToBeAdded);
 		}

catroidUiTest/src/org/catrobat/catroid/uitest/content/BrickDragAndDropTest.java

@@ -112,7 +112,7 @@ public void testPutHoveringBrickDown() {
 
 		yPositionList = UiTestUtils.getListItemYPositions(solo);
 		solo.clickOnScreen(20, yPositionList.get(0));
-		solo.clickOnScreen(20, yPositionList.get(1));
+		solo.clickOnScreen(20, yPositionList.get(2));
 		solo.clickOnText(solo.getString(R.string.brick_context_dialog_move_brick));
 
 		Display display = solo.getCurrentActivity().getWindowManager().getDefaultDisplay();
@@ -121,7 +121,7 @@ public void testPutHoveringBrickDown() {
 		int height = display.getHeight();
 
 		solo.sleep(200);
-		solo.drag(20, 20, 200, height - 20, 100);
+		solo.drag(20, 20, 300, height - 20, 100);
 		solo.sleep(200);
 
 		assertTrue("Last Brick should now be BroadcastBrick", adapter.getItem(3) instanceof BroadcastBrick);

catroidUiTest/src/org/catrobat/catroid/uitest/content/ScriptDeleteTest.java

@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 
 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;
@@ -37,7 +38,6 @@
 import org.catrobat.catroid.uitest.util.UiTestUtils;
 
 import android.test.ActivityInstrumentationTestCase2;
-import org.catrobat.catroid.R;
 
 import com.jayway.android.robotium.solo.Solo;
 
@@ -77,9 +77,7 @@ public void testAddLooksCategoryBrick() {
 		assertTrue("Set costume brick was not added", solo.searchText(brickSetCostumeText));
 
 		UiTestUtils.addNewBrick(solo, R.string.brick_set_size_to);
-		solo.clickOnText(brickSetCostumeText);
-		assertTrue("Set size to brick was not added",
-				solo.searchText(solo.getString(R.string.brick_set_size_to)));
+		assertTrue("Set size to brick was not added", solo.searchText(solo.getString(R.string.brick_set_size_to)));
 	}
 
 	public void testDeleteScript() {

catroidUiTest/src/org/catrobat/catroid/uitest/content/brick/LoopBrickTest.java

@@ -107,8 +107,6 @@ public void testRepeatBrick() {
 		yPosition = UiTestUtils.getListItemYPositions(solo);
 		int addedYPosition = UiTestUtils.getAddedListItemYPosition(solo);
 
-		solo.drag(20, 20, addedYPosition, yPosition.get(2), 20);
-
 		Sprite sprite = ProjectManager.getInstance().getCurrentSprite();
 		assertEquals("Incorrect number of Scripts.", 2, sprite.getNumberOfScripts());
 
@@ -144,7 +142,6 @@ public void testRepeatBrick() {
 
 		assertTrue("Wrong Brick instance.", (projectBrickList.get(2) instanceof SetCostumeBrick));
 		assertTrue("Wrong Brick instance.", (projectBrickList.get(3) instanceof LoopEndBrick));
-
 	}
 
 	public void testForeverBrick() {
@@ -168,7 +165,7 @@ public void testForeverBrick() {
 		yPosition = UiTestUtils.getListItemYPositions(solo);
 		addedYPosition = UiTestUtils.getAddedListItemYPosition(solo);
 
-		solo.drag(20, 20, addedYPosition, yPosition.get(3), 20);
+		solo.drag(20, 20, addedYPosition, yPosition.get(2) + 20, 20);
 		solo.sleep(200);
 
 		assertEquals("Incorrect number of bricks.", 7, projectBrickList.size());

catroidUiTest/src/org/catrobat/catroid/uitest/ui/ScriptFragmentTest.java

@@ -27,6 +27,10 @@
 
 import org.catrobat.catroid.ProjectManager;
 import org.catrobat.catroid.R;
+import org.catrobat.catroid.content.BroadcastScript;
+import org.catrobat.catroid.content.Script;
+import org.catrobat.catroid.content.Sprite;
+import org.catrobat.catroid.content.StartScript;
 import org.catrobat.catroid.content.bricks.Brick;
 import org.catrobat.catroid.ui.MainMenuActivity;
 import org.catrobat.catroid.ui.ProjectActivity;
@@ -54,9 +58,6 @@ public ScriptFragmentTest() {
 	@Override
 	public void setUp() throws Exception {
 		super.setUp();
-		brickListToCheck = UiTestUtils.createTestProject();
-		solo = new Solo(getInstrumentation(), getActivity());
-		UiTestUtils.getIntoScriptTabActivityFromMainMenu(solo);
 	}
 
 	@Override
@@ -75,7 +76,20 @@ public void tearDown() throws Exception {
 		solo = null;
 	}
 
+	private void initTestProject() {
+		brickListToCheck = UiTestUtils.createTestProject();
+		solo = new Solo(getInstrumentation(), getActivity());
+		UiTestUtils.getIntoScriptTabActivityFromMainMenu(solo);
+	}
+
+	private void initEmptyProject() {
+		UiTestUtils.createEmptyProject();
+		solo = new Solo(getInstrumentation(), getActivity());
+		UiTestUtils.getIntoScriptTabActivityFromMainMenu(solo);
+	}
+
 	public void testCreateNewBrickButton() {
+		initTestProject();
 		int brickCountInView = solo.getCurrentListViews().get(0).getCount();
 		int brickCountInList = brickListToCheck.size();
 
@@ -92,6 +106,7 @@ public void testCreateNewBrickButton() {
 	}
 
 	public void testBrickCategoryDialog() {
+		initTestProject();
 		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
 
 		// enable mindstorm bricks, if disabled
@@ -146,7 +161,30 @@ public void testBrickCategoryDialog() {
 				solo.waitForText(brickLegoStopMotor, 0, 2000));
 	}
 
+	/**
+	 * 
+	 * Tests issue#54. https://github.com/Catrobat/Catroid/issues/54
+	 */
+	public void testOnlyAddControlBricks() {
+		initEmptyProject();
+		Sprite sprite = ProjectManager.getInstance().getCurrentSprite();
+		assertEquals("Project should contain only one script.", 1, sprite.getNumberOfScripts());
+
+		Script script = sprite.getScript(0);
+		assertTrue("Single script isn't empty.", script.getBrickList().isEmpty());
+
+		List<Integer> yPositionList = UiTestUtils.getListItemYPositions(solo);
+		UiTestUtils.addNewBrick(solo, R.string.brick_broadcast_receive);
+		solo.clickOnScreen(20, yPositionList.get(1));
+		solo.sleep(200);
+
+		assertEquals("Two control bricks should be added.", 2, sprite.getNumberOfScripts());
+		assertTrue("First script isn't a start script.", sprite.getScript(0) instanceof StartScript);
+		assertTrue("Second script isn't a broadcast script.", sprite.getScript(1) instanceof BroadcastScript);
+	}
+
 	public void testSimpleDragNDrop() {
+		initTestProject();
 		ArrayList<Integer> yPositionList = UiTestUtils.getListItemYPositions(solo);
 		assertTrue("Test project brick list smaller than expected", yPositionList.size() >= 6);
 
@@ -163,6 +201,7 @@ public void testSimpleDragNDrop() {
 	}
 
 	public void testDeleteItem() {
+		initTestProject();
 		ArrayList<Integer> yPositionList = UiTestUtils.getListItemYPositions(solo);
 		assertTrue("Test project brick list smaller than expected", yPositionList.size() >= 6);
 
@@ -197,6 +236,7 @@ public void testDeleteItem() {
 	}
 
 	public void testBackgroundBricks() {
+		initTestProject();
 		String currentProject = solo.getString(R.string.main_menu_continue);
 		String background = solo.getString(R.string.background);
 		String categoryLooks = solo.getString(R.string.category_looks);

catroidUiTest/src/org/catrobat/catroid/uitest/util/UiTestUtils.java

@@ -642,10 +642,10 @@ public static ArrayList<Integer> getListItemYPositions(final Solo solo) {
 	}
 
 	public static int getAddedListItemYPosition(Solo solo) {
-		ArrayList<Integer> yPositionList = getListItemYPositions(solo);
-		int pos = (yPositionList.size() - 1) / 2;
+		ArrayList<Integer> yPositionsList = getListItemYPositions(solo);
+		int middleYPositionIndex = yPositionsList.size() / 2;
 
-		return yPositionList.get(pos);
+		return yPositionsList.get(middleYPositionIndex);
 	}
 
 	public static void longClickAndDrag(final Solo solo, final float xFrom, final float yFrom, final float xTo,