MAGETWO-92885: Unable to delete Fixed Tax Attribute from attribute set

Author: svitja

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AttributeTest.php

@@ -73,7 +73,7 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
     private $entityMetaDataInterfaceMock;
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     protected function setUp()
     {
@@ -123,7 +123,7 @@ protected function setUp()
      *
      * @return void
      */
-    private function setObjectProperty($object, string $propertyName, $value)
+    private function setObjectProperty($object, string $propertyName, $value) : void
     {
         $reflectionClass = new \ReflectionClass($object);
         $reflectionProperty = $reflectionClass->getProperty($propertyName);
@@ -134,7 +134,7 @@ private function setObjectProperty($object, string $propertyName, $value)
     /**
      * @return void
      */
-    public function testDeleteEntity()
+    public function testDeleteEntity() : void
     {
         $entityAttributeId = 196;
         $entityTypeId = 4;

app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php

@@ -187,7 +187,7 @@ public function getTable()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getEntityIdField()
     {

app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php

@@ -275,10 +275,10 @@ public function testGetTable()
      *
      * @return void
      */
-    public function testGetEntityIdField()
+    public function testGetEntityIdField() : void
     {
         $attributeTaxMock = $this->getMockBuilder(\Magento\Weee\Model\ResourceModel\Attribute\Backend\Weee\Tax::class)
-            ->setMethods(['getEntityIdField', 'getIdFieldName'])
+            ->setMethods(['getIdFieldName'])
             ->disableOriginalConstructor()
             ->getMock();
 

dev/tests/integration/testsuite/Magento/Weee/Model/ResourceModel/AttributeTest.php

@@ -13,7 +13,8 @@
 use Magento\Framework\EntityManager\MetadataPool;
 
 /**
- * Test class for Catalog attribute resource model.
+ * Test class for Magento\Catalog\Model\ResourceModel\Attribute class
+ * with backend model Magento\Weee\Model\Attribute\Backend\Weee\Tax.
  *
  * @see Magento\Catalog\Model\ResourceModel\Attribute
  */
@@ -44,6 +45,9 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManager;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -65,7 +69,7 @@ protected function setUp()
      * @param int $attributeId
      * @return array|false
      */
-    private function getEavEntityAttributeRow($entityTypeId, $attributeSetId, $attributeId)
+    private function getEavEntityAttributeRow(int $entityTypeId, int $attributeSetId, int $attributeId)
     {
         $connection = $this->productResource->getConnection();
         $select = $connection->select()
@@ -83,16 +87,16 @@ private function getEavEntityAttributeRow($entityTypeId, $attributeSetId, $attri
      * @magentoDataFixture Magento/Weee/_files/fixed_product_attribute.php
      * @return void
      */
-    public function testDeleteEntityFixedTax()
+    public function testDeleteEntityFixedTax() : void
     {
         /* @var EavAttribute $attribute */
         $attribute = $this->objectManager->get(EavAttribute::class);
         $attribute->loadByCode(\Magento\Catalog\Model\Product::ENTITY, 'fixed_product_attribute');
 
         $entityEavAttributeRow = $this->getEavEntityAttributeRow(
-            $attribute->getEntityTypeId(),
+            (int)$attribute->getEntityTypeId(),
             4,
-            $attribute->getId()
+            (int)$attribute->getId()
         );
         $this->assertNotEmpty(
             $entityEavAttributeRow['entity_attribute_id'],
@@ -103,13 +107,13 @@ public function testDeleteEntityFixedTax()
         $this->model->deleteEntity($attribute);
 
         $entityEavAttributeRow = $this->getEavEntityAttributeRow(
-            $attribute->getEntityTypeId(),
+            (int)$attribute->getEntityTypeId(),
             4,
-            $attribute->getId()
+            (int)$attribute->getId()
         );
         $this->assertEmpty(
             $entityEavAttributeRow,
-            'The record is not remove from table `eav_entity_attribute` for `fixed_product_attribute`'
+            'The record was not removed from table `eav_entity_attribute` for `fixed_product_attribute`'
         );
     }
 }

dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute.php

@@ -28,7 +28,6 @@
 ];
 
 /** @var \Magento\Catalog\Model\Entity\Attribute $attribute */
-// $attribute = $objectManager->create(\Magento\Catalog\Model\Entity\Attribute::class);
 $attribute = $objectManager->create(\Magento\Eav\Model\Entity\Attribute::class);
 $attribute->setData($attributeData);
 $attribute->save();