From d05ce11736c93e533618e9d3b9dfdee3f2d3576e Mon Sep 17 00:00:00 2001
From: Beka Westberg <bekawestberg@gmail.com>
Date: Mon, 10 Jun 2019 15:59:27 -0700
Subject: [PATCH 1/4] Added trashcan tests.

---
 tests/mocha/index.html       |   1 +
 tests/mocha/trashcan_test.js | 561 +++++++++++++++++++++++++++++++++++
 2 files changed, 562 insertions(+)
 create mode 100644 tests/mocha/trashcan_test.js

diff --git a/tests/mocha/index.html b/tests/mocha/index.html
index 48c0c2e51..735eaa0bc 100644
--- a/tests/mocha/index.html
+++ b/tests/mocha/index.html
@@ -37,6 +37,7 @@
     <script src="field_number_test.js"></script>
     <script src="field_textinput_test.js"></script>
     <script src="field_variable_test.js"></script>
+    <script src="trashcan_test.js"></script>
     <script src="xml_test.js"></script>
     <script src="utils_test.js"></script>
 
diff --git a/tests/mocha/trashcan_test.js b/tests/mocha/trashcan_test.js
new file mode 100644
index 000000000..e1dc82256
--- /dev/null
+++ b/tests/mocha/trashcan_test.js
@@ -0,0 +1,561 @@
+/**
+ * @license
+ * Visual Blocks Editor
+ *
+ * Copyright 2019 Google Inc.
+ * https://developers.google.com/blockly/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+suite("Trashcan", function() {
+  var workspace = {
+    addChangeListener: function(func) {
+      this.listener = func;
+    },
+    triggerListener: function(event) {
+      this.listener(event);
+    },
+    options: {
+      maxTrashcanContents: Infinity
+    }
+  };
+  function sendDeleteEvent(xmlString) {
+    var xml = Blockly.Xml.textToDom(xmlString);
+    xml = xml.children[0];
+    var event = {
+      type: Blockly.Events.BLOCK_DELETE,
+      oldXml: xml
+    };
+    workspace.triggerListener(event);
+  }
+
+  setup(function() {
+    this.trashcan = new Blockly.Trashcan(workspace);
+    this.setLidStub = sinon.stub(this.trashcan, 'setLidAngle_');
+  });
+  teardown(function() {
+    this.setLidStub.restore();
+    this.trashcan = null;
+  });
+
+  suite("Events", function() {
+    test("Delete", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 1);
+    });
+    test("Non-Delete", function() {
+      var event = {
+        type: 'dummy_type'
+      };
+      workspace.triggerListener(event);
+      chai.assert.equal(this.trashcan.contents_.length, 0);
+    });
+    test("Non-Delete w/ oldXml", function() {
+      var xml = Blockly.Xml.textToDom(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      xml = xml.children[0];
+      var event = {
+        type: 'dummy_type',
+        oldXml: xml
+      };
+      workspace.triggerListener(event);
+      chai.assert.equal(this.trashcan.contents_.length, 0);
+    });
+    test("Shadow Delete", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <shadow type="dummy_type"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 0);
+    });
+  });
+  suite("Unique Contents", function() {
+    test("Simple", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 1);
+    });
+    test("No Coords - Coords", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" x="10" y="10"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 1);
+    });
+    test("Different Coords", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" x="10" y="10"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" x="20" y="20"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 1);
+    });
+    test("No ID - ID", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" id="id"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 1);
+    });
+    test("Different IDs", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" id="id1"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" id="id2"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 1);
+    });
+    test("No Disabled - Disabled True", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" disabled="true"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("No Disabled - Disabled False", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" disabled="false"/>' +
+          '</xml>'
+      );
+      // TODO: Is this how we want this to work? To the user they appear to
+      //  be the same.
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("Different Disabled", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" disabled="false"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" disabled="true"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("No Editable - Editable True", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" editable="true"/>' +
+          '</xml>'
+      );
+      // TODO: Is this how we want this to work? To the user they appear to
+      //  be the same.
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("No Editable - Editable False", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" editable="false"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("Different Editable", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" editable="true"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" editable="false"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("No Movable - Movable True", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" movable="true"/>' +
+          '</xml>'
+      );
+      // TODO: Is this how we want this to work? To the user they appear to
+      //  be the same.
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("No Movable - Movable False", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" movable="false"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("Different Movable", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" movable="true"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type" movable="false"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("No Fields - Fields", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <field name="dummy_name">dummy_value</field>' +
+          '  </block>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("Different Field Values", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <field name="dummy_name">dummy_value1</field>' +
+          '  </block>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <field name="dummy_name">dummy_value2</field>' +
+          '  </block>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("No Values - Values", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <value name="dummy_input">' +
+          '      <block type="dummy_type"/>' +
+          '    </value>' +
+          '  </block>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("Different Value Blocks", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <value name="dummy_input">' +
+          '      <block type="dummy_type1"/>' +
+          '    </value>' +
+          '  </block>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <value name="dummy_input">' +
+          '      <block type="dummy_type2"/>' +
+          '    </value>' +
+          '  </block>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("No Statements - Statements", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <statement name="dummy_input">' +
+          '      <block type="dummy_type"/>' +
+          '    </statement>' +
+          '  </block>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("Different Statement Blocks", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <statement name="dummy_input">' +
+          '      <block type="dummy_type1"/>' +
+          '    </statement>' +
+          '  </block>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <statement name="dummy_input">' +
+          '      <block type="dummy_type2"/>' +
+          '    </statement>' +
+          '  </block>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("No Next - Next", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <next name="dummy_input">' +
+          '      <block type="dummy_type"/>' +
+          '    </next>' +
+          '  </block>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("Different Next Blocks", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <statement name="dummy_input">' +
+          '      <block type="dummy_type1"/>' +
+          '    </statement>' +
+          '  </block>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <statement name="dummy_input">' +
+          '      <block type="dummy_type2"/>' +
+          '    </statement>' +
+          '  </block>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("No Comment - Comment", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <comment>comment_text</comment>' +
+          '  </block>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("Different Comment Text", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <comment>comment_text1</comment>' +
+          '  </block>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <comment>comment_text2</comment>' +
+          '  </block>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("Different Comment Size", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <comment h="10" w="10">comment_text</comment>' +
+          '  </block>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <comment h="20" w="20">comment_text</comment>' +
+          '  </block>' +
+          '</xml>'
+      );
+      // TODO: Is this how we want this to work? The difference is not
+      //  related to the content.
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("Different Comment Pinned", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <comment pinned="false">comment_text</comment>' +
+          '  </block>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <comment pinned="true">comment_text</comment>' +
+          '  </block>' +
+          '</xml>'
+      );
+      // TODO: Is this how we want this to work? The difference is not
+      //  related to the content.
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("No Mutator - Mutator", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <mutation dummy_attribute="dummy_value"></mutation>' +
+          '  </block>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+    test("Different Mutator", function() {
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <mutation dummy_attribute="dummy_value1"></mutation>' +
+          '  </block>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type">' +
+          '    <mutation dummy_attribute="dummy_value2"></mutation>' +
+          '  </block>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 2);
+    });
+  });
+  suite("Max Contents", function() {
+    test("Max 0", function() {
+      workspace.options.maxTrashcanContents = 0;
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 0);
+      workspace.options.maxTrashcanContents = Infinity;
+    });
+    test("Last In First Out", function() {
+      workspace.options.maxTrashcanContents = 1;
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type1"/>' +
+          '</xml>'
+      );
+      sendDeleteEvent(
+          '<xml>' +
+          '  <block type="dummy_type2"/>' +
+          '</xml>'
+      );
+      chai.assert.equal(this.trashcan.contents_.length, 1);
+      chai.assert.equal(
+          Blockly.Xml.textToDom(this.trashcan.contents_[0])
+              .children[0].getAttribute('type'),
+          'dummy_type2'
+      );
+      workspace.options.maxTrashcanContents = Infinity;
+    });
+  });
+});

From 6665e46cd130605bb6c9fdf63832dcd62a80c6f4 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bekawestberg@gmail.com>
Date: Wed, 12 Jun 2019 18:12:19 -0700
Subject: [PATCH 2/4] Removed test cases that never actually occure.

---
 tests/mocha/trashcan_test.js | 125 -----------------------------------
 1 file changed, 125 deletions(-)

diff --git a/tests/mocha/trashcan_test.js b/tests/mocha/trashcan_test.js
index e1dc82256..7b763ef9f 100644
--- a/tests/mocha/trashcan_test.js
+++ b/tests/mocha/trashcan_test.js
@@ -102,19 +102,6 @@ suite("Trashcan", function() {
       );
       chai.assert.equal(this.trashcan.contents_.length, 1);
     });
-    test("No Coords - Coords", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" x="10" y="10"/>' +
-          '</xml>'
-      );
-      chai.assert.equal(this.trashcan.contents_.length, 1);
-    });
     test("Different Coords", function() {
       sendDeleteEvent(
           '<xml>' +
@@ -128,19 +115,6 @@ suite("Trashcan", function() {
       );
       chai.assert.equal(this.trashcan.contents_.length, 1);
     });
-    test("No ID - ID", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" id="id"/>' +
-          '</xml>'
-      );
-      chai.assert.equal(this.trashcan.contents_.length, 1);
-    });
     test("Different IDs", function() {
       sendDeleteEvent(
           '<xml>' +
@@ -167,49 +141,6 @@ suite("Trashcan", function() {
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
-    test("No Disabled - Disabled False", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" disabled="false"/>' +
-          '</xml>'
-      );
-      // TODO: Is this how we want this to work? To the user they appear to
-      //  be the same.
-      chai.assert.equal(this.trashcan.contents_.length, 2);
-    });
-    test("Different Disabled", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" disabled="false"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" disabled="true"/>' +
-          '</xml>'
-      );
-      chai.assert.equal(this.trashcan.contents_.length, 2);
-    });
-    test("No Editable - Editable True", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" editable="true"/>' +
-          '</xml>'
-      );
-      // TODO: Is this how we want this to work? To the user they appear to
-      //  be the same.
-      chai.assert.equal(this.trashcan.contents_.length, 2);
-    });
     test("No Editable - Editable False", function() {
       sendDeleteEvent(
           '<xml>' +
@@ -223,34 +154,6 @@ suite("Trashcan", function() {
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
-    test("Different Editable", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" editable="true"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" editable="false"/>' +
-          '</xml>'
-      );
-      chai.assert.equal(this.trashcan.contents_.length, 2);
-    });
-    test("No Movable - Movable True", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" movable="true"/>' +
-          '</xml>'
-      );
-      // TODO: Is this how we want this to work? To the user they appear to
-      //  be the same.
-      chai.assert.equal(this.trashcan.contents_.length, 2);
-    });
     test("No Movable - Movable False", function() {
       sendDeleteEvent(
           '<xml>' +
@@ -264,34 +167,6 @@ suite("Trashcan", function() {
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
-    test("Different Movable", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" movable="true"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" movable="false"/>' +
-          '</xml>'
-      );
-      chai.assert.equal(this.trashcan.contents_.length, 2);
-    });
-    test("No Fields - Fields", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <field name="dummy_name">dummy_value</field>' +
-          '  </block>' +
-          '</xml>'
-      );
-      chai.assert.equal(this.trashcan.contents_.length, 2);
-    });
     test("Different Field Values", function() {
       sendDeleteEvent(
           '<xml>' +

From 406c6aca76c7498b620cb210dff84488c3ad02d4 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bekawestberg@gmail.com>
Date: Wed, 12 Jun 2019 18:25:44 -0700
Subject: [PATCH 3/4] Changed sendDeleteEvent to append <xml> tags. Fixed bad
 <next> tests.

---
 tests/mocha/trashcan_test.js | 332 +++++++++++------------------------
 1 file changed, 103 insertions(+), 229 deletions(-)

diff --git a/tests/mocha/trashcan_test.js b/tests/mocha/trashcan_test.js
index 7b763ef9f..51702faf6 100644
--- a/tests/mocha/trashcan_test.js
+++ b/tests/mocha/trashcan_test.js
@@ -31,7 +31,7 @@ suite("Trashcan", function() {
     }
   };
   function sendDeleteEvent(xmlString) {
-    var xml = Blockly.Xml.textToDom(xmlString);
+    var xml = Blockly.Xml.textToDom('<xml>' + xmlString + '</xml>');
     xml = xml.children[0];
     var event = {
       type: Blockly.Events.BLOCK_DELETE,
@@ -51,11 +51,7 @@ suite("Trashcan", function() {
 
   suite("Events", function() {
     test("Delete", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
+      sendDeleteEvent('<block type="dummy_type"/>');
       chai.assert.equal(this.trashcan.contents_.length, 1);
     });
     test("Non-Delete", function() {
@@ -80,270 +76,170 @@ suite("Trashcan", function() {
       chai.assert.equal(this.trashcan.contents_.length, 0);
     });
     test("Shadow Delete", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <shadow type="dummy_type"/>' +
-          '</xml>'
-      );
+      sendDeleteEvent('<shadow type="dummy_type"/>');
       chai.assert.equal(this.trashcan.contents_.length, 0);
     });
   });
   suite("Unique Contents", function() {
     test("Simple", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
+      sendDeleteEvent('<block type="dummy_type"/>');
+      sendDeleteEvent('<block type="dummy_type"/>');
       chai.assert.equal(this.trashcan.contents_.length, 1);
     });
     test("Different Coords", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" x="10" y="10"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" x="20" y="20"/>' +
-          '</xml>'
-      );
+      sendDeleteEvent('<block type="dummy_type" x="10" y="10"/>');
+      sendDeleteEvent('<block type="dummy_type" x="20" y="20"/>');
       chai.assert.equal(this.trashcan.contents_.length, 1);
     });
     test("Different IDs", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" id="id1"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" id="id2"/>' +
-          '</xml>'
-      );
+      sendDeleteEvent('<block type="dummy_type" id="id1"/>');
+      sendDeleteEvent('<block type="dummy_type" id="id2"/>');
       chai.assert.equal(this.trashcan.contents_.length, 1);
     });
     test("No Disabled - Disabled True", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" disabled="true"/>' +
-          '</xml>'
-      );
+      sendDeleteEvent('<block type="dummy_type"/>');
+      sendDeleteEvent('<block type="dummy_type" disabled="true"/>');
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("No Editable - Editable False", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" editable="false"/>' +
-          '</xml>'
-      );
+      sendDeleteEvent('<block type="dummy_type"/>');
+      sendDeleteEvent('<block type="dummy_type" editable="false"/>');
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("No Movable - Movable False", function() {
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type" movable="false"/>' +
-          '</xml>'
-      );
+      sendDeleteEvent('<block type="dummy_type"/>');
+      sendDeleteEvent('<block type="dummy_type" movable="false"/>');
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("Different Field Values", function() {
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <field name="dummy_name">dummy_value1</field>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <field name="dummy_name">dummy_value1</field>' +
+          '</block>'
       );
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <field name="dummy_name">dummy_value2</field>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <field name="dummy_name">dummy_value2</field>' +
+          '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("No Values - Values", function() {
+      sendDeleteEvent('<block type="dummy_type"/>');
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <value name="dummy_input">' +
-          '      <block type="dummy_type"/>' +
-          '    </value>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <value name="dummy_input">' +
+          '    <block type="dummy_type"/>' +
+          '  </value>' +
+          '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("Different Value Blocks", function() {
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <value name="dummy_input">' +
-          '      <block type="dummy_type1"/>' +
-          '    </value>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <value name="dummy_input">' +
+          '    <block type="dummy_type1"/>' +
+          '  </value>' +
+          '</block>'
       );
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <value name="dummy_input">' +
-          '      <block type="dummy_type2"/>' +
-          '    </value>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <value name="dummy_input">' +
+          '    <block type="dummy_type2"/>' +
+          '  </value>' +
+          '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("No Statements - Statements", function() {
+      sendDeleteEvent('<block type="dummy_type"/>');
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <statement name="dummy_input">' +
-          '      <block type="dummy_type"/>' +
-          '    </statement>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <statement name="dummy_input">' +
+          '    <block type="dummy_type"/>' +
+          '  </statement>' +
+          '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("Different Statement Blocks", function() {
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <statement name="dummy_input">' +
-          '      <block type="dummy_type1"/>' +
-          '    </statement>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <statement name="dummy_input">' +
+          '    <block type="dummy_type1"/>' +
+          '  </statement>' +
+          '</block>'
       );
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <statement name="dummy_input">' +
-          '      <block type="dummy_type2"/>' +
-          '    </statement>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <statement name="dummy_input">' +
+          '    <block type="dummy_type2"/>' +
+          '  </statement>' +
+          '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("No Next - Next", function() {
+      sendDeleteEvent('<block type="dummy_type"/>');
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <next name="dummy_input">' +
-          '      <block type="dummy_type"/>' +
-          '    </next>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <next>' +
+          '    <block type="dummy_type"/>' +
+          '  </next>' +
+          '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("Different Next Blocks", function() {
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <statement name="dummy_input">' +
-          '      <block type="dummy_type1"/>' +
-          '    </statement>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <next>' +
+          '    <block type="dummy_type1"/>' +
+          '  </next>' +
+          '</block>'
       );
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <statement name="dummy_input">' +
-          '      <block type="dummy_type2"/>' +
-          '    </statement>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <next>' +
+          '    <block type="dummy_type2"/>' +
+          '  </next>' +
+          '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("No Comment - Comment", function() {
+      sendDeleteEvent('<block type="dummy_type"/>');
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <comment>comment_text</comment>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <comment>comment_text</comment>' +
+          '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("Different Comment Text", function() {
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <comment>comment_text1</comment>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <comment>comment_text1</comment>' +
+          '</block>'
       );
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <comment>comment_text2</comment>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <comment>comment_text2</comment>' +
+          '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("Different Comment Size", function() {
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <comment h="10" w="10">comment_text</comment>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <comment h="10" w="10">comment_text</comment>' +
+          '</block>'
       );
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <comment h="20" w="20">comment_text</comment>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <comment h="20" w="20">comment_text</comment>' +
+          '</block>'
       );
       // TODO: Is this how we want this to work? The difference is not
       //  related to the content.
@@ -351,52 +247,38 @@ suite("Trashcan", function() {
     });
     test("Different Comment Pinned", function() {
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <comment pinned="false">comment_text</comment>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <comment pinned="false">comment_text</comment>' +
+          '</block>'
       );
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <comment pinned="true">comment_text</comment>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <comment pinned="true">comment_text</comment>' +
+          '</block>'
       );
       // TODO: Is this how we want this to work? The difference is not
       //  related to the content.
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("No Mutator - Mutator", function() {
+      sendDeleteEvent('<block type="dummy_type"/>');
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <mutation dummy_attribute="dummy_value"></mutation>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <mutation dummy_attribute="dummy_value"></mutation>' +
+          '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("Different Mutator", function() {
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <mutation dummy_attribute="dummy_value1"></mutation>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <mutation dummy_attribute="dummy_value1"></mutation>' +
+          '</block>'
       );
       sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type">' +
-          '    <mutation dummy_attribute="dummy_value2"></mutation>' +
-          '  </block>' +
-          '</xml>'
+          '<block type="dummy_type">' +
+          '  <mutation dummy_attribute="dummy_value2"></mutation>' +
+          '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
@@ -414,16 +296,8 @@ suite("Trashcan", function() {
     });
     test("Last In First Out", function() {
       workspace.options.maxTrashcanContents = 1;
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type1"/>' +
-          '</xml>'
-      );
-      sendDeleteEvent(
-          '<xml>' +
-          '  <block type="dummy_type2"/>' +
-          '</xml>'
-      );
+      sendDeleteEvent('<block type="dummy_type1"/>');
+      sendDeleteEvent('<block type="dummy_type2"/>');
       chai.assert.equal(this.trashcan.contents_.length, 1);
       chai.assert.equal(
           Blockly.Xml.textToDom(this.trashcan.contents_[0])

From 2463a754db6509358e51c8bf17692e3d53387e79 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bekawestberg@gmail.com>
Date: Wed, 12 Jun 2019 18:36:50 -0700
Subject: [PATCH 4/4] Updated TODO's.

---
 tests/mocha/trashcan_test.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/mocha/trashcan_test.js b/tests/mocha/trashcan_test.js
index 51702faf6..d1ce4c36b 100644
--- a/tests/mocha/trashcan_test.js
+++ b/tests/mocha/trashcan_test.js
@@ -241,8 +241,8 @@ suite("Trashcan", function() {
           '  <comment h="20" w="20">comment_text</comment>' +
           '</block>'
       );
-      // TODO: Is this how we want this to work? The difference is not
-      //  related to the content.
+      // TODO (#2574): These blocks are treated as different, but appear
+      //  identical when the trashcan is opened.
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("Different Comment Pinned", function() {
@@ -256,8 +256,8 @@ suite("Trashcan", function() {
           '  <comment pinned="true">comment_text</comment>' +
           '</block>'
       );
-      // TODO: Is this how we want this to work? The difference is not
-      //  related to the content.
+      // TODO (#2574): These blocks are treated as different, but appear
+      //  identical when the trashcan is opened.
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("No Mutator - Mutator", function() {