Clean-ups

Left overs to clean and changes from discussion.

Fixed config path finding
This commit is contained in:
Vassyli
2016-07-29 09:35:33 +02:00
parent 712a89bdad
commit ae63c209e9
10 changed files with 108 additions and 123 deletions
+20 -71
View File
@@ -32,25 +32,6 @@ class BootstrapTest extends \PHPUnit_Framework_TestCase
$this->assertNotNull($g->getLogger());
}
public function testWorkingFromChildWorkingDirectory()
{
$cwd = getcwd();
$oldconf = getenv("LOTGD_CONFIG");
chdir($cwd . "/tests/");
putenv("LOTGD_CONFIG=../".$oldconf);
$this->assertStringEndsWith("/tests", getcwd());
$this->assertStringStartsWith(".././", getenv("LOTGD_CONFIG"));
$game = Bootstrap::createGame();
chdir($cwd);
putenv("LOTGD_CONFIG=" . $oldconf);
$this->assertStringEndsNotWith("/tests", getcwd());
$this->assertStringStartsNotWith(".././", getenv("LOTGD_CONFIG"));
}
public function testBootstrapLoadsPackageModels()
{
$installationManager = $this->getMockBuilder(InstallationManager::class)
@@ -61,28 +42,32 @@ class BootstrapTest extends \PHPUnit_Framework_TestCase
$composer = $this->getMockBuilder(\Composer\Composer::class)
->disableOriginalConstructor()
->setMethods(["getInstallationManager", "translateNamespaceToPath"])
->setMethods(["getInstallationManager"])
->getMock();
$composer->method("getInstallationManager")->willReturn($installationManager);
$composer
$fakeModulePackage = $this->getMockBuilder(AliasPackage::class)
->disableOriginalConstructor()
->setMethods(["getType", "getAutoload"])
->getMock();
$fakeModulePackage->method("getType")->willReturn("lotgd-module");
$fakeModulePackage->method("getAutoload")->willReturn([
"psr-4" => [
"LotGD\\Core\\Tests\\FakeModule\\" => "FakeModule/"
]
]);
$composerManager = $this->getMockBuilder(ComposerManager::class)
->setMethods(["getPackages", "getComposer", "translateNamespaceToPath"])
->getMock();
$composerManager->method("getPackages")->willReturn([$fakeModulePackage]);
$composerManager->method("getComposer")->willReturn($composer);
$composerManager
->expects($this->exactly(1))
->method("translateNamespaceToPath")
->with("LotGD\\Core\\Tests\\FakeModule\\Models")
->willReturn(__DIR__ . "/FakeModule/Models");
$fakeModulePackage = $this->getMockBuilder(AliasPackage::class)
->disableOriginalConstructor()
->setMethods(["getType", "getExtra"])
->getMock();
$fakeModulePackage->method("getType")->willReturn("lotgd-module");
$fakeModulePackage->method("getExtra")->willReturn(["lotgd-namespace" => "LotGD\\Core\\Tests\\FakeModule\\"]);
$composerManager = $this->getMockBuilder(ComposerManager::class)
->setMethods(["getPackages", "getComposer"])
->getMock();
$composerManager->method("getPackages")->willReturn([$fakeModulePackage]);
$composerManager->method("getComposer")->willReturn($composer);
$bootstrap = $this->getMockBuilder(Bootstrap::class)
->setMethods(["createComposerManager"])
->getMock();
@@ -93,42 +78,6 @@ class BootstrapTest extends \PHPUnit_Framework_TestCase
$this->assertGreaterThanorEqual(3, $bootstrap->getReadAnnotationDirectories());
/*$user = new UserEntity();
$user->setName("Monthy");
$game->getEntityManager()->persist($user);
$game->getEntityManager()->flush();
$id = $user->getId();
$this->assertInternalType("int", $id);
$game->getEntityManager()->clear();
$user = $game->getEntityManager()->getRepository(UserEntity::class)->find($id);
$this->assertInternalType("int", $user->getId());
$this->assertInternalType("string", $user->getName());
$this->assertSame("Monthy", $user->getName());*/
}
/*public function testGenerateAnnotationDirectories()
{
$composerManager = $this->getMockBuilder(ComposerManager::class)
->disableOriginalConstructor()
->getMock();
$package = $this->getMockForAbstractClass(PackageInterface::class);
$package->method('getName')->willReturn('lotgd/BootstrapTest');
$package->method('getExtra')->willReturn(array(
'lotgd-namespace' => 'LotGD\\Core\\Tests\\FakeModule\\',
));
$composerManager->method('getPackages')->willReturn(array($package));
$bootstrap = $this->getMockBuilder(Bootstrap::class)
->setMethods(["createComposerManager"])
->getMock();
$bootstrap->method("createComposerManager")->willReturn($composerManager);
$game = $bootstrap->getGame();
$this->assertGreaterThanOrEqual(2, $bootstrap->getReadAnnotationDirectories());
$user = new UserEntity();
$user->setName("Monthy");
$game->getEntityManager()->persist($user);
@@ -140,5 +89,5 @@ class BootstrapTest extends \PHPUnit_Framework_TestCase
$this->assertInternalType("int", $user->getId());
$this->assertInternalType("string", $user->getName());
$this->assertSame("Monthy", $user->getName());
}*/
}
}