[STCC-214] Workaround for user bricks. These are now converted into note bricks instead. (Catrobat#151)

Author: gregbauer

lib/catroid_class_hierarchy.jar

@@ -443,6 +443,10 @@ def _create_catrobat_sprite_stub(name=None):
     return catformula.Formula(traverser._converted_helper_brick_or_formula_element([formula_left_child, formula_right_child], ">"))
 
 def _create_user_brick(context, scratch_function_header, param_values, declare=False):
+    # TODO: remove the next line of code as soon as user bricks are supported by Catrobat
+    # TODO: also check the other TODOs related to this issue (overall three different places in converter.py)
+    # TODO: refactor this function; maybe split the function into definition of user brick script and usage of the brick
+    return catbricks.NoteBrick("Sorry, we currently do not support user bricks in Catrobat!")
     param_labels = context.user_script_declared_labels_map[scratch_function_header]
     assert context is not None and isinstance(context, SpriteContext)
     assert not param_labels or len(param_labels) == len(param_values)
@@ -1071,6 +1075,10 @@ def _catrobat_sprite_from(self, scratch_object):
         for scratch_script in scratch_object.scripts:
             cat_instance = self._catrobat_script_from(scratch_script, sprite, self._catrobat_project,
                                                       sprite_context)
+            # TODO: remove this if and replace "elif" with "if" as soon as user bricks are supported by Catrobat
+            # TODO: also check the other TODOs related to this issue (overall three different places in converter.py)
+            if isinstance(cat_instance, catbricks.NoteBrick):
+                continue
             if not isinstance(cat_instance, catbricks.UserBrick):
                 assert isinstance(cat_instance, catbase.Script)
                 sprite.addScript(cat_instance)
@@ -1278,7 +1286,11 @@ def _catrobat_script_from(cls, scratch_script, sprite, catrobat_project, context
                 ignored_blocks += 1
                 continue
             try:
-                if not isinstance(cat_instance, catbricks.UserBrick):
+                # TODO: remove this if and replace "elif" with "if" as soon as user bricks are supported by Catrobat
+                # TODO: also check the other TODOs related to this issue (overall three different places in converter.py)
+                if isinstance(cat_instance, catbricks.NoteBrick):
+                    continue
+                elif not isinstance(cat_instance, catbricks.UserBrick):
                     assert isinstance(cat_instance, catbase.Script)
                     cat_instance.brickList.add(brick)
                 else:

src/scratchtocatrobat/converter/converter.py

@@ -2081,6 +2081,9 @@ def test_can_convert_set_variable_with_list(self):
         assert catr_bricks[0].getFormulas()[0].getFormulaTree().getElementType() == catElementType.USER_LIST
         assert catr_bricks[0].getFormulas()[0].getFormulaTree().getValue() == self._name_of_test_list
 
+    # TODO: uncomment these tests as soon as Catrobat supports user bricks again.
+    # Note: these tests might have to be refactored together with the tested function.
+    '''
     #call
     def test_can_convert_call_block_user_script_already_defined_simple(self):
         function_header = "number1 %n number1"
@@ -2304,6 +2307,7 @@ def test_can_convert_call_block_user_script_not_yet_defined_simple(self):
         param_types = sprite_context.user_script_params_map[function_header]
         assert param_types is not None
         assert expected_param_types == param_types
+    '''
 
     #gotoSpriteOrMouse:
     def test_can_convert_go_to_sprite_block_with_sprite_afterwards(self):