public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #6865 from carusogabriel/refactoring-tests 

Refactoring tests
pull/6872/head
Rob 2017-12-04 08:09:33 +01:00 committed by GitHub
parent 6bb3ab1868 885da4c8ef
commit e03a324613
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
View File

@ -814,9 +814,9 @@ return array(
EOF; EOF;
$this->generator->dump($this->config, $this->repository, $mainPackage, $this->im, 'composer', true, '_9'); $this->generator->dump($this->config, $this->repository, $mainPackage, $this->im, 'composer', true, '_9');
$this->assertEquals($expectedNamespace, file_get_contents($this->vendorDir.'/composer/autoload_namespaces.php')); $this->assertStringEqualsFile($this->vendorDir.'/composer/autoload_namespaces.php', $expectedNamespace);
$this->assertEquals($expectedPsr4, file_get_contents($this->vendorDir.'/composer/autoload_psr4.php')); $this->assertStringEqualsFile($this->vendorDir.'/composer/autoload_psr4.php', $expectedPsr4);
$this->assertEquals($expectedClassmap, file_get_contents($this->vendorDir.'/composer/autoload_classmap.php')); $this->assertStringEqualsFile($this->vendorDir.'/composer/autoload_classmap.php', $expectedClassmap);
} }
public function testIncludePathFileGeneration() public function testIncludePathFileGeneration()
@ -1080,9 +1080,9 @@ return array(
EOF; EOF;
$this->assertEquals($expectedNamespace, file_get_contents($vendorDir.'/composer/autoload_namespaces.php')); $this->assertStringEqualsFile($vendorDir.'/composer/autoload_namespaces.php', $expectedNamespace);
$this->assertEquals($expectedPsr4, file_get_contents($vendorDir.'/composer/autoload_psr4.php')); $this->assertStringEqualsFile($vendorDir.'/composer/autoload_psr4.php', $expectedPsr4);
$this->assertEquals($expectedClassmap, file_get_contents($vendorDir.'/composer/autoload_classmap.php')); $this->assertStringEqualsFile($vendorDir.'/composer/autoload_classmap.php', $expectedClassmap);
$this->assertContains("\$vendorDir . '/b/b/bootstrap.php',\n", file_get_contents($vendorDir.'/composer/autoload_files.php')); $this->assertContains("\$vendorDir . '/b/b/bootstrap.php',\n", file_get_contents($vendorDir.'/composer/autoload_files.php'));
$this->assertContains("\$baseDir . '/test.php',\n", file_get_contents($vendorDir.'/composer/autoload_files.php')); $this->assertContains("\$baseDir . '/test.php',\n", file_get_contents($vendorDir.'/composer/autoload_files.php'));
} }
@ -1158,9 +1158,9 @@ return array(
EOF; EOF;
$this->assertEquals($expectedNamespace, file_get_contents($this->vendorDir.'/composer/autoload_namespaces.php')); $this->assertStringEqualsFile($this->vendorDir.'/composer/autoload_namespaces.php', $expectedNamespace);
$this->assertEquals($expectedPsr4, file_get_contents($this->vendorDir.'/composer/autoload_psr4.php')); $this->assertStringEqualsFile($this->vendorDir.'/composer/autoload_psr4.php', $expectedPsr4);
$this->assertEquals($expectedClassmap, file_get_contents($this->vendorDir.'/composer/autoload_classmap.php')); $this->assertStringEqualsFile($this->vendorDir.'/composer/autoload_classmap.php', $expectedClassmap);
$this->assertContains("\$baseDir . '/../test.php',\n", file_get_contents($this->vendorDir.'/composer/autoload_files.php')); $this->assertContains("\$baseDir . '/../test.php',\n", file_get_contents($this->vendorDir.'/composer/autoload_files.php'));
} }
@ -1226,9 +1226,9 @@ return array(
EOF; EOF;
$this->assertEquals($expectedNamespace, file_get_contents($this->vendorDir.'/composer/autoload_namespaces.php')); $this->assertStringEqualsFile($this->vendorDir.'/composer/autoload_namespaces.php', $expectedNamespace);
$this->assertEquals($expectedPsr4, file_get_contents($this->vendorDir.'/composer/autoload_psr4.php')); $this->assertStringEqualsFile($this->vendorDir.'/composer/autoload_psr4.php', $expectedPsr4);
$this->assertEquals($expectedClassmap, file_get_contents($this->vendorDir.'/composer/autoload_classmap.php')); $this->assertStringEqualsFile($this->vendorDir.'/composer/autoload_classmap.php', $expectedClassmap);
} }
public function testVendorSubstringPath() public function testVendorSubstringPath()
@ -1274,8 +1274,8 @@ return array(
EOF; EOF;
$this->generator->dump($this->config, $this->repository, $package, $this->im, 'composer', false, 'VendorSubstring'); $this->generator->dump($this->config, $this->repository, $package, $this->im, 'composer', false, 'VendorSubstring');
$this->assertEquals($expectedNamespace, file_get_contents($this->vendorDir.'/composer/autoload_namespaces.php')); $this->assertStringEqualsFile($this->vendorDir.'/composer/autoload_namespaces.php', $expectedNamespace);
$this->assertEquals($expectedPsr4, file_get_contents($this->vendorDir.'/composer/autoload_psr4.php')); $this->assertStringEqualsFile($this->vendorDir.'/composer/autoload_psr4.php', $expectedPsr4);
} }
public function testExcludeFromClassmap() public function testExcludeFromClassmap()

4
tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
View File

@ -175,7 +175,7 @@ class ClassMapGeneratorTest extends TestCase
ClassMapGenerator::createMap($finder, null, $io); ClassMapGenerator::createMap($finder, null, $io);
$this->assertTrue(in_array($msg, $messages, true), $msg . ' not found in expected messages (' . var_export($messages, true) . ')'); $this->assertContains($msg, $messages, $msg . ' not found in expected messages (' . var_export($messages, true) . ')');
$fs = new Filesystem(); $fs = new Filesystem();
$fs->removeDirectory($tempDir); $fs->removeDirectory($tempDir);
@ -242,7 +242,7 @@ class ClassMapGeneratorTest extends TestCase
ClassMapGenerator::dump(array($tempDir), $resultFile); ClassMapGenerator::dump(array($tempDir), $resultFile);
$fileInDirectory = str_replace('\\', '\\\\', $fileInDirectory); $fileInDirectory = str_replace('\\', '\\\\', $fileInDirectory);
$this->assertEquals("<?php return array (\n 'TestClass' => '$fileInDirectory',\n);", file_get_contents($resultFile)); $this->assertStringEqualsFile($resultFile, "<?php return array (\n 'TestClass' => '$fileInDirectory',\n);");
$fs = new Filesystem(); $fs = new Filesystem();
$fs->removeDirectory($tempDir); $fs->removeDirectory($tempDir);

4
tests/Composer/Test/Repository/ArtifactRepositoryTest.php
View File

@ -61,7 +61,7 @@ class ArtifactRepositoryTest extends TestCase
$repo = new ArtifactRepository($coordinates, new NullIO(), new Config()); $repo = new ArtifactRepository($coordinates, new NullIO(), new Config());
foreach ($repo->getPackages() as $package) { foreach ($repo->getPackages() as $package) {
$this->assertTrue(strpos($package->getDistUrl(), strtr($absolutePath, '\\', '/')) === 0); $this->assertSame(strpos($package->getDistUrl(), strtr($absolutePath, '\\', '/')), 0);
} }
} }
@ -72,7 +72,7 @@ class ArtifactRepositoryTest extends TestCase
$repo = new ArtifactRepository($coordinates, new NullIO(), new Config()); $repo = new ArtifactRepository($coordinates, new NullIO(), new Config());
foreach ($repo->getPackages() as $package) { foreach ($repo->getPackages() as $package) {
$this->assertTrue(strpos($package->getDistUrl(), $relativePath) === 0); $this->assertSame(strpos($package->getDistUrl(), $relativePath), 0);
} }
} }
} }

2
tests/Composer/Test/Repository/PathRepositoryTest.php
View File

@ -55,7 +55,7 @@ class PathRepositoryTest extends TestCase
$this->assertEquals('test/path-unversioned', $package->getName()); $this->assertEquals('test/path-unversioned', $package->getName());
$packageVersion = $package->getVersion(); $packageVersion = $package->getVersion();
$this->assertTrue(!empty($packageVersion)); $this->assertNotEmpty($packageVersion);
} }
public function testLoadPackageFromFileSystemWithWildcard() public function testLoadPackageFromFileSystemWithWildcard()

4
tests/Composer/Test/Util/ConfigValidatorTest.php
View File

@ -29,9 +29,9 @@ class ConfigValidatorTest extends TestCase
$configValidator = new ConfigValidator(new NullIO()); $configValidator = new ConfigValidator(new NullIO());
list(, , $warnings) = $configValidator->validate(__DIR__ . '/Fixtures/composer_commit-ref.json'); list(, , $warnings) = $configValidator->validate(__DIR__ . '/Fixtures/composer_commit-ref.json');
$this->assertEquals(true, in_array( $this->assertContains(
'The package "some/package" is pointing to a commit-ref, this is bad practice and can cause unforeseen issues.', 'The package "some/package" is pointing to a commit-ref, this is bad practice and can cause unforeseen issues.',
$warnings $warnings
)); );
} }
} }

4
tests/Composer/Test/XdebugHandlerTest.php
View File

@ -128,7 +128,7 @@ class XdebugHandlerTest extends TestCase
$xdebug = new XdebugHandlerMock($loaded); $xdebug = new XdebugHandlerMock($loaded);
$xdebug->check(); $xdebug->check();
$this->assertEquals(false, getenv(XdebugHandlerMock::ENV_VERSION)); $this->assertFalse(getenv(XdebugHandlerMock::ENV_VERSION));
} }
public function testEnvVersionWhenRestartFails() public function testEnvVersionWhenRestartFails()
@ -141,7 +141,7 @@ class XdebugHandlerTest extends TestCase
// Mimic failed restart // Mimic failed restart
$xdebug = new XdebugHandlerMock($loaded); $xdebug = new XdebugHandlerMock($loaded);
$xdebug->check(); $xdebug->check();
$this->assertEquals(false, getenv(XdebugHandlerMock::ENV_VERSION)); $this->assertFalse(getenv(XdebugHandlerMock::ENV_VERSION));
} }
public static function setUpBeforeClass() public static function setUpBeforeClass()