MAGETWO-99830: Redundant URL rewrites regeneration when products are added to or removed from a category

Author: dhorytskyi

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php

@@ -99,9 +99,14 @@ public function testGenerateProductUrlRewrites2()
         $category->setAffectedProductIds([$product1->getId(), $product2->getId()]);
         $category->setAnchorsAbove(false);
         $generatedUrls = $this->handler->generateProductUrlRewrites($category);
-        $actual = array_values(array_map(function (UrlRewrite $urlRewrite) {
-            return $urlRewrite->getRequestPath();
-        }, $generatedUrls));
+        $actual = array_values(
+            array_map(
+                function (UrlRewrite $urlRewrite) {
+                    return $urlRewrite->getRequestPath();
+                },
+                $generatedUrls
+            )
+        );
 
         $expected = [
             'simple-product.html',

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products_rollback.php

@@ -18,6 +18,7 @@
         $productRepository->delete($product);
     } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
         //Product already removed
+        continue;
     }
 }