Prepared Cucumber Test for merge into master

* remove unused code
* add catroidCucumberTest to catroidSourceTest
* fix checkstyle warnings
* add missing license texts
* adapt versionCode/versionName
* lowered actionbarsherlock target api due to warnings
* squashed commits

Author: mfellner

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "catroidCucumberTest/calabash-android/calabash-android"]
-	path = catroidCucumberTest/calabash-android/calabash-android
-	url = [email protected]:calabash/calabash-android.git

catroid/ant.properties

@@ -68,7 +68,7 @@
     <module name="PackageDeclaration"/>
     <module name="ImportOrder">
       <property name="option" value="top"/>
-      <property name="groups" value="android,com,edu,junit,net,org,java,javax"/>
+      <property name="groups" value="android,com,cucumber,edu,junit,net,org,java,javax"/>
       <property name="ordered" value="true"/>
       <property name="separated" value="true"/>
     </module>

catroid/build.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="Catroid Checkstyle" location="/catroid/checkstyle.xml" type="project" description="">
+    <additional-data name="protect-config-file" value="true"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="Catroid Checkstyle" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="gen"/>
+  </filter>
+</fileset-config>

catroid/checkstyle.xml

@@ -1,8 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+*  Catroid: An on-device visual programming system for Android devices
+*  Copyright (C) 2010-2013 The Catrobat Team
+*  (<http://developer.catrobat.org/credits>)
+*
+*  This program is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU Affero General Public License as
+*  published by the Free Software Foundation, either version 3 of the
+*  License, or (at your option) any later version.
+*
+*  An additional term exception under section 7 of the GNU Affero
+*  General Public License, version 3, is available at
+*  http://developer.catrobat.org/license_additional_term
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+*  GNU Affero General Public License for more details.
+*
+*  You should have received a copy of the GNU Affero General Public License
+*  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.catrobat.catroid.test.cucumber"
-          android:versionCode="1"
-          android:versionName="1.0">
+          android:versionCode="11"
+          android:versionName="0.9.4">
 
     <application>
         <uses-library android:name="android.test.runner"/>

catroidCucumberTest/.checkstyle

@@ -1,6 +1,5 @@
 #### Cucumber tests for Catroid
 
-* Features must be placed in `assets/features/`
+* Features must be placed inside `assets/features/`.
 * Run with CucumberInstrumentation instrumentation test runner.
-* See [cucumber-android](https://github.com/mfellner/cucumber-android) for details.
-
+* See [cucumber-jvm](https://github.com/cucumber/cucumber-jvm) for details.

catroidCucumberTest/AndroidManifest.xml

@@ -0,0 +1,64 @@
+Feature: Broadcast brick
+  A Broadcast brick should send a message and When scripts should react to it.
+
+  Background:
+    Given I have a Program
+    And this program has an Object 'Object'
+
+  Scenario: A Broadcast brick sends a message in a program with one When script
+
+    Given 'Object' has a Start script
+    And this script has a Broadcast 'hello' brick
+    And this script has a Print brick with
+    """
+    I am the Start script.
+    """
+
+    Given 'Object' has a When 'hello' script
+    And this script has a Wait 100 milliseconds brick
+    And this script has a Print brick with
+    """
+    I am the When 'hello' script.
+    """
+
+    When I start the program
+    And I wait until the program has stopped
+    Then I should see the printed output
+    """
+    I am the Start script.
+    I am the When 'hello' script.
+
+    """
+
+  Scenario: A Broadcast brick sends a message in a program with two When scripts
+
+    Given 'Object' has a Start script
+    And this script has a Broadcast 'hello' brick
+    And this script has a Wait 100 milliseconds brick
+    And this script has a Print brick with
+    """
+    I am the Start script.
+    """
+
+    Given 'Object' has a When 'hello' script
+    And this script has a Print brick with
+    """
+    I am the first When 'hello' script.
+    """
+
+    Given 'Object' has a When 'hello' script
+    And this script has a Wait 200 milliseconds brick
+    And this script has a Print brick with
+    """
+    I am the second When 'hello' script.
+    """
+
+    When I start the program
+    And I wait until the program has stopped
+    Then I should see the printed output
+    """
+    I am the first When 'hello' script.
+    I am the Start script.
+    I am the second When 'hello' script.
+
+    """

catroidCucumberTest/README.md

@@ -1,93 +1,17 @@
-# DEPRECATED
-Feature: Repeat Brick
-  A Repeat Brick repeats no brick, one brick or a sequence of bricks a given number of times.
+Feature: Repeat brick
+  A Repeat brick repeats another set of bricks a given number of times.
 
   Background:
-    Given an empty program
-    And an object 'cuke'
-    And a StartScript
-
-  Scenario: Repeat 0 bricks 0 times.
-    Given a RepeatBrick with 0 iterations
-    And a RepeatEndBrick
-    When the script is executed
-    And the script terminates
-    Then the elapsed time is at least 0 ms
-    And the elapsed time is at most 1 ms
-
-  Scenario: Repeat 0 bricks 1 time.
-    Given a RepeatBrick with 1 iteration
-    And a RepeatEndBrick
-    When the script is executed
-    And the script terminates
-    Then the elapsed time is at least 20 ms
-    And the elapsed time is at most 21 ms
-
-  Scenario: Repeat 1 bricks 1 times.
-    Given a RepeatBrick with 1 iterations
-    And a ChangeYByNBrick with 10
-    And a RepeatEndBrick
-    When the script is executed
-    And the script terminates
-    Then the elapsed time is at least 20 ms
-    And the elapsed time is at most 21 ms
-    And the object 'cuke' has a y position of 10
-
-  Scenario: Repeat 2 bricks 16 times.
-    Given a RepeatBrick with 4 iterations
-    And a ChangeXByNBrick with 10
-    And a ChangeYByNBrick with 10
-    And a RepeatEndBrick
-    When the script is executed
-    And the script terminates
-    Then the elapsed time is at least 80 ms
-    And the elapsed time is at most 81 ms
-    And the object 'cuke' has a x position of 40
-    And the object 'cuke' has a y position of 40
-
-  Scenario: Repeat 0 bricks -2 times.
-    Given a RepeatBrick with -2 iterations
-    And a RepeatEndBrick
-    When the script is executed
-    And the script terminates
-    Then the elapsed time is at least 0 ms
-    And the elapsed time is at most 1 ms
-
-  Scenario: Repeat 1 SetVariableBrick 4 times.
-    Given a SetVariableBrick with 'x' and 4
-    And a RepeatBrick with 'x' iterations
-    And a ChangeVariableBrick with 'x' and -1
-    And a RepeatEndBrick
-    When the script is executed
-    And the script terminates
-    Then the elapsed time is at least 80 ms
-    And the elapsed time is at most 81 ms
-    Then the variable 'x' is 0
-
-  Scenario: Repeat a shorter WaitBrick 4 times.
-    Given a RepeatBrick with 4 iterations
-    And a WaitBrick with 0.015 seconds
-    And a RepeatEndBrick
-    When the script is executed
-    And the script terminates
-    Then the elapsed time is at least 80 ms
-    And the elapsed time is at most 81 ms
-
-  Scenario: Repeat a longer WaitBrick 4 times.
-    Given a RepeatBrick with 4 iterations
-    And a WaitBrick with 0.5 seconds
-    And a RepeatEndBrick
-    When the script is executed
-    And the script terminates
-    Then the elapsed time is at least 2000 ms
-    And the elapsed time is at most 2001 ms
-
-  Scenario: Repeat a brick 2.99 times
-    Given a RepeatBrick with 2.99 iterations
-    And a ChangeYByNBrick with 10
-    And a RepeatEndBrick
-    When the script is executed
-    And the script terminates
-    Then the elapsed time is at least 40 ms
-    And the elapsed time is at most 41 ms
-    And the object 'cuke' has a x position of 40
+    Given I have a Program
+    And this program has an Object 'Object'
+
+  Scenario: Increment variable inside loop
+    Given 'Object' has a Start script
+    And this script has a set 'i' to 0 brick
+    And this script has a Repeat 8 times brick
+    And this script has a change 'i' by 1 brick
+    And this script has a Repeat end brick
+
+    When I start the program
+    And I wait until the program has stopped
+    Then the variable 'i' should be equal 8

catroidCucumberTest/assets/features/bricks/BroadcastBrick.feature

@@ -1,14 +1,14 @@
 Feature: Repeat brick delay
-  Eeach iteration of a Repeat brick takes at least 20 milliseconds.
+  Each iteration of a Repeat brick takes at least 20 milliseconds.
 
   Background:
     Given I have a Program
     And this program has an Object 'Object'
 
   Scenario: No more than 200 iterations in 2 seconds
     Given 'Object' has a Start script
-    And this script has a set 'i' to '0' brick
-    And this script has a set 'k' to '0' brick
+    And this script has a set 'i' to 0 brick
+    And this script has a set 'k' to 0 brick
     And this script has a Wait 2 seconds brick
     And this script has a set 'k' to 'i' brick