Merge remote-tracking branch 'origin/MAGETWO-35060-cpd' into MAGETWO-28383-restore-whitelist

Joan He · Joan He · commit b8cdc6b2cdaa · 2015-03-14T17:04:30.000-05:00
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -204,7 +204,7 @@ public function testCopyPaste()
         $copyPasteDetector->setBlackList($blackList);
 
         $this->assertTrue(
-            $copyPasteDetector->run(self::getWhitelist(['php'])),
+            $copyPasteDetector->run([BP]),
             "PHP Copy/Paste Detector has found error(s): See detailed report in {$reportFile}"
         );
     }
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -1,3 +1,5 @@
+app/code/Magento
+lib/internal/Magento
 Magento/Adminhtml
 Magento/Authorizenet/Model
 Magento/Backend

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public function testCopyPaste()`
`204`	`204`	`$copyPasteDetector->setBlackList($blackList);`
`205`	`205`
`206`	`206`	`$this->assertTrue(`
`207`		`- $copyPasteDetector->run(self::getWhitelist(['php'])),`
	`207`	`+ $copyPasteDetector->run([BP]),`
`208`	`208`	`"PHP Copy/Paste Detector has found error(s): See detailed report in {$reportFile}"`
`209`	`209`	`);`
`210`	`210`	`}`