MC-42170: Fixed static tests

sivaschenko · sivaschenko · commit 37652448fe4f · 2021-05-05T19:20:26.000+01:00
diff --git a/app/etc/vendor_path.php b/app/etc/vendor_path.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 /**
  * Path to Composer vendor directory
  */
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolderTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolderTest.php
@@ -113,7 +113,7 @@ public function testExecuteWithWrongPath()
         $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath . $dirPath);
         $this->model->execute();
 
-        $this->assertFileNotExists(
+        $this->assertFileDoesNotExist(
             $this->fullDirectoryPath . $dirPath . $this->dirName
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
@@ -184,7 +184,7 @@ public function testExecuteWithWrongPath()
         $this->model->getStorage()->getSession()->setCurrentPath($dirPath);
         $this->model->execute();
 
-        $this->assertFileNotExists(
+        $this->assertFileDoesNotExist(
             $this->fullDirectoryPath . $dirPath . $this->fileName
         );
     }
@@ -204,7 +204,7 @@ public function testExecuteWithWrongFileName()
         $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
         $this->model->execute();
 
-        $this->assertFileNotExists($this->fullDirectoryPath . $newFilename);
+        $this->assertFileDoesNotExist($this->fullDirectoryPath . $newFilename);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php b/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
@@ -127,7 +127,7 @@ public function testDebugInProductionMode()
 
         $this->removeDebugLog();
         $this->logger->debug($message);
-        $this->assertFileNotExists($this->getDebuggerLogPath());
+        $this->assertFileDoesNotExist($this->getDebuggerLogPath());
         $this->assertNull($this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING));
 
         $this->checkCommonFlow($message);
@@ -237,6 +237,6 @@ private function checkCommonFlow(string $message)
         $this->enableDebugging(false);
         $this->removeDebugLog();
         $this->logger->debug($message);
-        $this->assertFileNotExists($this->getDebuggerLogPath());
+        $this->assertFileDoesNotExist($this->getDebuggerLogPath());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WildcardTopicTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WildcardTopicTest.php
@@ -63,7 +63,7 @@ public function testWildCardNonMatchingTopic()
         $testObject = $this->generateTestObject();
         $this->publisher->publish('not.matching.wildcard.topic', $testObject);
         sleep(2);
-        $this->assertFileNotExists($this->logFilePath, "No log file must be created for non-matching topic.");
+        $this->assertFileDoesNotExist($this->logFilePath, "No log file must be created for non-matching topic.");
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/Directory/Command/DeleteByPathsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/Directory/Command/DeleteByPathsTest.php
@@ -54,7 +54,7 @@ public function testDeleteDirectory(): void
         $fullPath = $mediaDirectory->getAbsolutePath($this->testDirectoryName);
         $this->assertFileExists($fullPath);
         $this->deleteByPaths->execute([$this->testDirectoryName]);
-        $this->assertFileNotExists($fullPath);
+        $this->assertFileDoesNotExist($fullPath);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Pack/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Pack/GeneratorTest.php
@@ -86,7 +86,7 @@ protected function tearDown(): void
 
     public function testGeneration()
     {
-        $this->assertFileNotExists($this->_packPath);
+        $this->assertFileDoesNotExist($this->_packPath);
 
         ComponentRegistrar::register(
             ComponentRegistrar::MODULE,
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php
@@ -22,7 +22,7 @@ public function testRelocations()
              * @param string $path
              */
             function ($path) {
-                $this->assertFileNotExists(
+                $this->assertFileDoesNotExist(
                     BP . '/' . $path
                 );
             },
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/LibraryLocationTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/LibraryLocationTest.php
@@ -26,7 +26,7 @@ public static function setUpBeforeClass(): void
     public function testOldWebLibrariesLocation()
     {
         $oldLocation = self::$root . '/pub/lib';
-        $this->assertFileNotExists($oldLocation, "The web libraries have been moved from 'pub/lib' to 'lib/web'");
+        $this->assertFileDoesNotExist($oldLocation, "The web libraries have been moved from 'pub/lib' to 'lib/web'");
     }
 
     public function testOldPhpLibrariesLocation()
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php
@@ -24,7 +24,7 @@ public function testBlockVariableInsteadOfThis()
              * @param string $file
              */
             function ($file) {
-                self::assertNotRegExp(
+                self::assertDoesNotMatchRegularExpression(
                     '/this->(?!helper)\S*/iS',
                     file_get_contents($file),
                     'Access to members and methods of Block class through $this is ' .
@@ -51,7 +51,7 @@ public function testObsoleteBlockMethods()
              * @param string $file
              */
             function ($file) {
-                self::assertNotRegexp(
+                self::assertDoesNotMatchRegularExpression(
                     '/block->_[^_]+\S*\(/iS',
                     file_get_contents($file),
                     'Access to protected and private members of Block class is ' .
@@ -73,7 +73,7 @@ public function testObsoleteJavascriptAttributeType()
              * @param string $file
              */
             function ($file) {
-                self::assertNotRegexp(
+                self::assertDoesNotMatchRegularExpression(
                     '/type="text\/javascript"/',
                     file_get_contents($file),
                     'Please do not use "text/javascript" type attribute.'
@@ -97,7 +97,7 @@ function ($file) {
                 if (strpos($file, '/view/frontend/templates/') !== false
                     || strpos($file, '/view/base/templates/') !== false
                 ) {
-                    self::assertNotRegexp(
+                    self::assertDoesNotMatchRegularExpression(
                         '/(["\'])jquery\/ui\1/',
                         file_get_contents($file),
                         'Please do not use "jquery/ui" library in templates. Use needed jquery ui widget instead.'
@@ -124,7 +124,7 @@ function ($file) {
                     && (strpos($file, '/view/frontend/templates/') !== false
                     || strpos($file, '/view/base/templates/') !== false)
                 ) {
-                    self::assertNotRegExp(
+                    self::assertDoesNotMatchRegularExpression(
                         '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/',
                         file_get_contents($file),
                         'Please do not initialize JS component in php. Do it in template.'

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public function testExecuteWithWrongPath()`
`113`	`113`	`$this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath . $dirPath);`
`114`	`114`	`$this->model->execute();`
`115`	`115`
`116`		`- $this->assertFileNotExists(`
	`116`	`+ $this->assertFileDoesNotExist(`
`117`	`117`	`$this->fullDirectoryPath . $dirPath . $this->dirName`
`118`	`118`	`);`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public function testExecuteWithWrongPath()`
`184`	`184`	`$this->model->getStorage()->getSession()->setCurrentPath($dirPath);`
`185`	`185`	`$this->model->execute();`
`186`	`186`
`187`		`- $this->assertFileNotExists(`
	`187`	`+ $this->assertFileDoesNotExist(`
`188`	`188`	`$this->fullDirectoryPath . $dirPath . $this->fileName`
`189`	`189`	`);`
`190`	`190`	`}`
`@@ -204,7 +204,7 @@ public function testExecuteWithWrongFileName()`
`204`	`204`	`$this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);`
`205`	`205`	`$this->model->execute();`
`206`	`206`
`207`		`- $this->assertFileNotExists($this->fullDirectoryPath . $newFilename);`
	`207`	`+ $this->assertFileDoesNotExist($this->fullDirectoryPath . $newFilename);`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function testDebugInProductionMode()`
`127`	`127`
`128`	`128`	`$this->removeDebugLog();`
`129`	`129`	`$this->logger->debug($message);`
`130`		`- $this->assertFileNotExists($this->getDebuggerLogPath());`
	`130`	`+ $this->assertFileDoesNotExist($this->getDebuggerLogPath());`
`131`	`131`	`$this->assertNull($this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING));`
`132`	`132`
`133`	`133`	`$this->checkCommonFlow($message);`
`@@ -237,6 +237,6 @@ private function checkCommonFlow(string $message)`
`237`	`237`	`$this->enableDebugging(false);`
`238`	`238`	`$this->removeDebugLog();`
`239`	`239`	`$this->logger->debug($message);`
`240`		`- $this->assertFileNotExists($this->getDebuggerLogPath());`
	`240`	`+ $this->assertFileDoesNotExist($this->getDebuggerLogPath());`
`241`	`241`	`}`
`242`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function testWildCardNonMatchingTopic()`
`63`	`63`	`$testObject = $this->generateTestObject();`
`64`	`64`	`$this->publisher->publish('not.matching.wildcard.topic', $testObject);`
`65`	`65`	`sleep(2);`
`66`		`- $this->assertFileNotExists($this->logFilePath, "No log file must be created for non-matching topic.");`
	`66`	`+ $this->assertFileDoesNotExist($this->logFilePath, "No log file must be created for non-matching topic.");`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function testDeleteDirectory(): void`
`54`	`54`	`$fullPath = $mediaDirectory->getAbsolutePath($this->testDirectoryName);`
`55`	`55`	`$this->assertFileExists($fullPath);`
`56`	`56`	`$this->deleteByPaths->execute([$this->testDirectoryName]);`
`57`		`- $this->assertFileNotExists($fullPath);`
	`57`	`+ $this->assertFileDoesNotExist($fullPath);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ protected function tearDown(): void`
`86`	`86`
`87`	`87`	`public function testGeneration()`
`88`	`88`	`{`
`89`		`- $this->assertFileNotExists($this->_packPath);`
	`89`	`+ $this->assertFileDoesNotExist($this->_packPath);`
`90`	`90`
`91`	`91`	`ComponentRegistrar::register(`
`92`	`92`	`ComponentRegistrar::MODULE,`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static function setUpBeforeClass(): void`
`26`	`26`	`public function testOldWebLibrariesLocation()`
`27`	`27`	`{`
`28`	`28`	`$oldLocation = self::$root . '/pub/lib';`
`29`		`- $this->assertFileNotExists($oldLocation, "The web libraries have been moved from 'pub/lib' to 'lib/web'");`
	`29`	`+ $this->assertFileDoesNotExist($oldLocation, "The web libraries have been moved from 'pub/lib' to 'lib/web'");`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public function testOldPhpLibrariesLocation()`