Merge pull request Catrobat#4619 from bprattes/CATROID-1202

CATROID-1202 In Catroid in Catblocks mode, the bricks in the selection menus shall be shown with Catblocks bricks

Author: MichaelFlucher

catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/AddBrickCatblocksTest.java

@@ -0,0 +1,114 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2022 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/>.
+ */
+
+package org.catrobat.catroid.uiespresso.content.brick.app
+
+import android.view.View
+import android.webkit.WebView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.By
+import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiSelector
+import androidx.test.uiautomator.Until
+import org.catrobat.catroid.R
+import org.catrobat.catroid.UiTestCatroidApplication.Companion.projectManager
+import org.catrobat.catroid.content.Project
+import org.catrobat.catroid.content.Sprite
+import org.catrobat.catroid.content.StartScript
+import org.catrobat.catroid.ui.SpriteActivity
+import org.catrobat.catroid.ui.recyclerview.fragment.CatblocksScriptFragment
+import org.catrobat.catroid.ui.settingsfragments.SettingsFragment
+import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class AddBrickCatblocksTest {
+
+    companion object {
+        private const val TIMEOUT: Long = (5 * 1000).toLong()
+    }
+
+    @get:Rule
+    var baseActivityTestRule = FragmentActivityTestRule(
+        SpriteActivity::class.java, SpriteActivity.EXTRA_FRAGMENT_POSITION,
+        SpriteActivity.FRAGMENT_SCRIPTS
+    )
+
+    @Before
+    fun setUp() {
+        SettingsFragment.setUseCatBlocks(ApplicationProvider.getApplicationContext(), true)
+        createProject()
+        baseActivityTestRule.launchActivity()
+    }
+
+    @After
+    fun tearDown() {
+        SettingsFragment.setUseCatBlocks(ApplicationProvider.getApplicationContext(), false)
+        baseActivityTestRule.finishActivity()
+    }
+
+    @Test
+    fun addBricksFromCatblocksView() {
+        val uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        uiDevice.wait(Until.findObject(By.clazz(WebView::class.java)), TIMEOUT)
+        val catblocksView = baseActivityTestRule.activity.findViewById<View>(R.id.catblocksWebView)
+        val catblocksFragment = FragmentManager.findFragment<Fragment>(catblocksView) as CatblocksScriptFragment
+        catblocksFragment.activity?.runOnUiThread(Runnable {
+            catblocksFragment.handleAddButton()
+        })
+        val categoryEvent = uiDevice.findObject(
+            UiSelector().resourceId("categoryEVENT")
+        )
+        Assert.assertTrue(categoryEvent.waitForExists(TIMEOUT))
+        categoryEvent.click()
+        val brickStartScript = uiDevice.findObject(
+            UiSelector().resourceId("brickStartScript")
+        )
+        Assert.assertTrue(brickStartScript.waitForExists(TIMEOUT))
+        Assert.assertTrue(brickStartScript.exists())
+        Assert.assertTrue(brickStartScript.click())
+        Assert.assertTrue(brickStartScript.waitUntilGone(TIMEOUT))
+        Assert.assertEquals(projectManager.currentSprite.scriptList.count(), 1)
+        val addedScript = projectManager.currentSprite.scriptList.first()
+        Assert.assertNotNull(addedScript)
+        Assert.assertTrue(addedScript is StartScript)
+    }
+
+    private fun createProject() {
+        val projectName = javaClass.simpleName
+        val project = Project(ApplicationProvider.getApplicationContext(), projectName)
+        val sprite = Sprite("testSprite")
+        project.defaultScene.addSprite(sprite)
+        projectManager.currentProject = project
+        projectManager.currentSprite = sprite
+    }
+}

catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/AddBrickCatblocksTest.kt

@@ -1,18 +1,49 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Catblocks 2D view</title>
-  <link href="main.css" rel="stylesheet">
-</head>
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Android Release</title>
 
-<body>
-<div id="catroid-catblocks-container"></div>
-<script type="text/javascript"
-        src="https://appassets.androidplatform.net/assets/catblocks/CatBlocks.js"></script>
+    <link
+      rel="stylesheet"
+      href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
+      integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
+      crossorigin="anonymous"
+    />
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
 
-<script>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.15.0/css/mdb.min.css" rel="stylesheet" />
+  <link href="main.css?a54aa1ae5714dedd3117" rel="stylesheet"></head>
+
+  <body>
+    <div id="catroid-catblocks-container"></div>
+
+    <div id="catroid-catblocks-hidden-container" style="display:none;"></div>
+
+    <div id="catroid-catblocks-add-brick-dialog" style="display:none;">
+      <div id="catroid-catblocks-add-brick-dialog-header">
+        <div id="catroid-catblocks-add-brick-dialog-header-content-container">
+          <div id="catroid-catblocks-add-brick-back-container">
+            <img
+                src="https://appassets.androidplatform.net/assets/catblocks/media/arrow_back_ios_black_36dp.svg" />
+          </div>
+          <div id="catroid-catblocks-add-brick-text-container">
+            <h3 id="catroid-catblocks-add-brick-dialog-header-text"></h3>
+          </div>
+        </div>
+        <div id="catroid-catblocks-add-brick-dialog-close-container">
+          <img
+              src="https://appassets.androidplatform.net/assets/catblocks/media/close_black_36dp.svg" />
+        </div>
+      </div>
+      <div id="catroid-catblocks-add-brick-dialog-content">
+        <div id="catroid-catblocks-brick-category-container" class="list-group" style="display:none;"></div>
+        <div id="catroid-catblocks-bricks-container" style="display:none;"></div>
+      </div>
+    </div>
+
+    <script>
       window.onload = function () {
         CatBlocks.init({
           container: 'catroid-catblocks-container',
@@ -28,13 +59,27 @@
           readOnly: false
         }).then(() => {
           const programXML = Android.getCurrentProject();
-
           const scene = Android.getSceneNameToDisplay();
           const object = Android.getSpriteNameToDisplay();
-          const brickIDToFocus = Android.getBrickIDToFocus();
-          CatBlocks.render(programXML, scene, object, brickIDToFocus);
+          CatBlocks.render(programXML, scene, object);
         });
       };
     </script>
-</body>
-</html>
+    <script
+      src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js"
+      integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0="
+      crossorigin="anonymous"
+    ></script>
+    <script
+      src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
+      integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
+      crossorigin="anonymous"
+    ></script>
+    <script
+      src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
+      integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
+      crossorigin="anonymous"
+    ></script>
+  <script type="text/javascript"
+          src="https://appassets.androidplatform.net/assets/catblocks/CatBlocks.js?a54aa1ae5714dedd3117"></script></body>
+</html>