Skip to content

Commit

Permalink
Bump phpunit dep to 7.x, fix blast damage
Browse files Browse the repository at this point in the history
  • Loading branch information
@CyberiaResurrection
CyberiaResurrection committed May 7, 2020
1 parent f102ef5 commit 1b26a22
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 58 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"phpspec/phpspec": "^3.0",
"squizlabs/php_codesniffer": "~2.3",
"mockery/mockery": "0.9.*|^1.0@dev",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"php-coveralls/php-coveralls": ">=v2.1",
"pcov/clobber": "dev-master"
},
Expand Down
60 changes: 30 additions & 30 deletions tests/EdmxTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ class EdmxTest extends TestCase
{
public function testIsOKAtDefault()
{
$msg = null;
$msg = '';
$edmx = new Edmx();
$this->assertTrue($edmx->isOK($msg), $msg);
}

public function testDefaultSerializeOk()
{
$ds = DIRECTORY_SEPARATOR;
$msg = null;
$msg = '';
$edmx = new Edmx();
$this->assertTrue($edmx->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);
$ymlDir = dirname(__DIR__) . $ds . 'src' . $ds . 'MetadataV3' . $ds . 'JMSmetadata';
$serializer =
\JMS\Serializer\SerializerBuilder::create()
Expand All @@ -52,10 +52,10 @@ public function v3MetadataAgainstXSD($data)
public function testDefaultSerializeDeserializeRoundTrip()
{
$ds = DIRECTORY_SEPARATOR;
$msg = null;
$msg = '';
$edmx = new Edmx();
$this->assertTrue($edmx->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);
$this->checkEdmxSerialiseDeserialiseRoundTrip($ds, $edmx, $msg);
}

Expand Down Expand Up @@ -85,7 +85,7 @@ private function checkEdmxSerialiseDeserialiseRoundTrip($ds, $edmx, $msg)
public function testFirstLevelSerializeDeserializeRoundTrip()
{
$ds = DIRECTORY_SEPARATOR;
$msg = null;
$msg = '';
$schema = new Schema('data', 'metadata');
$this->assertTrue($schema->isOK($msg), $msg);
$services = new TDataServicesType('3.0', '1.0');
Expand All @@ -94,23 +94,23 @@ public function testFirstLevelSerializeDeserializeRoundTrip()
$edmx = new Edmx();
$edmx->setDataServiceType($services);
$this->assertTrue($edmx->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);

$this->checkEdmxSerialiseDeserialiseRoundTrip($ds, $edmx, $msg);
}

public function testWithSingleEntitySerializeOk()
{
$ds = DIRECTORY_SEPARATOR;
$msg = null;
$msg = '';
$newEntity = new \AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityTypeType();
$newEntity->setName('simpleEntityType');
$this->assertTrue($newEntity->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);
$edmx = new Edmx();
$edmx->getDataServiceType()->getSchema()[0]->addToEntityType($newEntity);
$this->assertTrue($edmx->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);


$ymlDir = dirname(__DIR__) . $ds . 'src' . $ds . 'MetadataV3' . $ds . 'JMSmetadata';
Expand All @@ -126,15 +126,15 @@ public function testWithSingleEntitySerializeOk()
public function testWithSingleEntitySerializeDeserializeRoundTrip()
{
$ds = DIRECTORY_SEPARATOR;
$msg = null;
$msg = '';
$newEntity = new \AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityTypeType();
$newEntity->setName('simpleEntityType');
$this->assertTrue($newEntity->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);
$edmx = new Edmx();
$edmx->getDataServiceType()->getSchema()[0]->addToEntityType($newEntity);
$this->assertTrue($edmx->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);

$this->checkEdmxSerialiseDeserialiseRoundTrip($ds, $edmx, $msg);
}
Expand All @@ -143,7 +143,7 @@ public function testKnownGoodV3DocumentDeserialiseToOk()
{
$this->markTestSkipped('Skipped until service-document models get implemented');
$ds = DIRECTORY_SEPARATOR;
$msg = null;
$msg = '';

$docLocation = dirname(__DIR__) . $ds . 'tests' . $ds . 'exampleV3ServiceDocument.xml';
$document = file_get_contents($docLocation);
Expand All @@ -163,7 +163,7 @@ public function testKnownGoodV3DocumentDeserialiseToOk()
public function testKnownGoodV3MetadataDeserialiseToOk()
{
$ds = DIRECTORY_SEPARATOR;
$msg = null;
$msg = '';

$docLocation = dirname(__DIR__) . $ds . 'tests' . $ds . 'exampleV3ServiceMetadata.xml';
$document = file_get_contents($docLocation);
Expand All @@ -184,7 +184,7 @@ public function testKnownGoodV3MetadataDeserialiseToOkSerializeDeserializeRoundT
{
$this->markTestSkipped();
$ds = DIRECTORY_SEPARATOR;
$msg = null;
$msg = '';

$docLocation = dirname(__DIR__) . $ds . 'tests' . $ds . 'exampleV3ServiceMetadata.xml';
$document = file_get_contents($docLocation);
Expand All @@ -206,29 +206,29 @@ public function testKnownGoodV3MetadataDeserialiseToOkSerializeDeserializeRoundT
public function testWithSingleEntityWithPropertiesSerializeOk()
{
$ds = DIRECTORY_SEPARATOR;
$msg = null;
$msg = '';
$newProperty = new \AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityPropertyType();
$newProperty->setName('TheFirstProperty');
$newProperty->setType('String');
$this->assertTrue($newProperty->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);

$newEntity = new \AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityTypeType();
$newEntity->setName('simpleEntityType');
$newEntity->addToProperty($newProperty);
$this->assertTrue($newEntity->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);

$entitySet = new \AlgoWeb\ODataMetadata\MetadataV3\edm\EntityContainer\EntitySetAnonymousType();
$entitySet->setName(MetadataManager::pluralize($newEntity->getName()));
$entitySet->setEntityType($newEntity->getName());
$this->assertTrue($entitySet->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);
$edmx = new Edmx();
$edmx->getDataServiceType()->getSchema()[0]->addToEntityType($newEntity);
$edmx->getDataServiceType()->getSchema()[0]->getEntityContainer()[0]->addToEntitySet($entitySet);
$this->assertTrue($edmx->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);


$ymlDir = dirname(__DIR__) . $ds . 'src' . $ds . 'MetadataV3' . $ds . 'JMSmetadata';
Expand All @@ -243,53 +243,53 @@ public function testWithSingleEntityWithPropertiesSerializeOk()
public function testWithSingleEntityWithPropertiesSerializeDeserializeRoundTrip()
{
$ds = DIRECTORY_SEPARATOR;
$msg = null;
$msg = '';
$newProperty = new \AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityPropertyType();
$newProperty->setName('TheFirstProperty');
$newProperty->setType('String');
$this->assertTrue($newProperty->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);

$newEntity = new \AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityTypeType();
$newEntity->setName('simpleEntityType');
$newEntity->addToProperty($newProperty);
$this->assertTrue($newEntity->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);

$entitySet = new \AlgoWeb\ODataMetadata\MetadataV3\edm\EntityContainer\EntitySetAnonymousType();
$entitySet->setName(MetadataManager::pluralize($newEntity->getName()));
$entitySet->setEntityType($newEntity->getName());
$this->assertTrue($entitySet->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);
$edmx = new Edmx();
$edmx->getDataServiceType()->getSchema()[0]->addToEntityType($newEntity);
$edmx->getDataServiceType()->getSchema()[0]->getEntityContainer()[0]->addToEntitySet($entitySet);
$this->assertTrue($edmx->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);

$this->checkEdmxSerialiseDeserialiseRoundTrip($ds, $edmx, $msg);
}

public function testWithSingleEntityWithoutPropertiesSerializeDeserializeRoundTrip()
{
$ds = DIRECTORY_SEPARATOR;
$msg = null;
$msg = '';

$newEntity = new \AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityTypeType();
$newEntity->setName('simpleEntityType');
$this->assertTrue($newEntity->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);

$entitySet = new \AlgoWeb\ODataMetadata\MetadataV3\edm\EntityContainer\EntitySetAnonymousType();
$entitySet->setName(MetadataManager::pluralize($newEntity->getName()));
$entitySet->setEntityType($newEntity->getName());
$this->assertTrue($entitySet->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);
$edmx = new Edmx();
$edmx->getDataServiceType()->getSchema()[0]->addToEntityType($newEntity);
$edmx->getDataServiceType()->getSchema()[0]->getEntityContainer()[0]->addToEntitySet($entitySet);
$this->assertTrue($edmx->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);

$this->checkEdmxSerialiseDeserialiseRoundTrip($ds, $edmx, $msg);
}
Expand Down
6 changes: 3 additions & 3 deletions tests/MetadataManagerNavigationTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class MetadataManagerNavigationTest extends \PHPUnit\Framework\TestCase
{
public function testEntitysAndPropertiesAndNavigationPropertiesAndRoleDIRECTION()
{
$msg = null;
$msg = '';
$metadataManager = new MetadataManager();
$result = null;

Expand Down Expand Up @@ -130,10 +130,10 @@ public function testEntitysAndPropertiesAndNavigationPropertiesAndRoleDIRECTION(
// <NavigationProperty Name="Order_Details" Relationship="NorthwindModel.FK_Order_Details_Products" ToRole="Order_Details" FromRole="Products"/>


$msg = null;
$msg = '';
$edmx = $metadataManager->getEdmx();
$this->assertTrue($edmx->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);

$d = $metadataManager->getEdmxXML();
$categoryEType = null;
Expand Down
26 changes: 13 additions & 13 deletions tests/MetadataManagerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ class MetadataManagerTest extends \PHPUnit\Framework\TestCase
public function testIsOKAtDefault()
{
$metadataManager = new MetadataManager();
$msg = null;
$msg = '';
$edmx = $metadataManager->getEdmx();
$this->assertTrue($edmx->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);

$d = $metadataManager->getEdmxXML();
$this->v3MetadataAgainstXSD($d);
Expand Down Expand Up @@ -64,18 +64,18 @@ public function testEntitysAndProperties()
$metadataManager->addPropertyToEntityType($eType, 'CustomerTypeID', 'String', null, false, true);
$metadataManager->addPropertyToEntityType($eType, 'CustomerDesc', 'String');

$msg = null;
$msg = '';
$edmx = $metadataManager->getEdmx();
$this->assertTrue($edmx->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);

$d = $metadataManager->getEdmxXML();
$this->v3MetadataAgainstXSD($d);
}

public function testEntitysAndPropertiesAndNavigationProperties()
{
$msg = null;
$msg = '';
$metadataManager = new MetadataManager();
$result = null;

Expand Down Expand Up @@ -183,10 +183,10 @@ public function testEntitysAndPropertiesAndNavigationProperties()
// <NavigationProperty Name="Order_Details" Relationship="NorthwindModel.FK_Order_Details_Products" ToRole="Order_Details" FromRole="Products"/>


$msg = null;
$msg = '';
$edmx = $metadataManager->getEdmx();
$this->assertTrue($edmx->isOK($msg), $msg);
$this->assertNull($msg);
$this->assertEmpty($msg);

$d = $metadataManager->getEdmxXML();
$this->v3MetadataAgainstXSD($d);
Expand Down Expand Up @@ -429,7 +429,7 @@ public function testCreateSingletonNonStringName()

public function testCreateSingletonSuccessful()
{
$msg = null;
$msg = '';
$name = 'singleton';
$returnType = m::mock(TEntityTypeType::class)->makePartial();
$returnType->shouldReceive('getName')->andReturn('doubleton');
Expand Down Expand Up @@ -458,7 +458,7 @@ public function testCreateSingletonSuccessful()

public function testCreateSingletonSuccessfulWithEntitySet()
{
$msg = null;
$msg = '';
$name = 'singleton';
$returnType = m::mock(TEntityTypeType::class)->makePartial();
$returnType->shouldReceive('getName')->andReturn('doubleton');
Expand Down Expand Up @@ -491,7 +491,7 @@ public function testCreateSingletonSuccessfulWithEntitySet()

public function testCreateSingletonWithDocumentation()
{
$msg = null;
$msg = '';
$name = 'singleton';
$shortDesc = new TTextType();
$longDesc = new TTextType();
Expand Down Expand Up @@ -519,7 +519,7 @@ public function testCreateSingletonWithDocumentation()

public function testCreateSingletonWithDocumentationOnlyShortDesc()
{
$msg = null;
$msg = '';
$name = 'singleton';
$shortDesc = new TTextType();
$longDesc = null;
Expand Down Expand Up @@ -547,7 +547,7 @@ public function testCreateSingletonWithDocumentationOnlyShortDesc()

public function testCreateSingletonWithDocumentationOnlyLongDesc()
{
$msg = null;
$msg = '';
$name = 'singleton';
$shortDesc = null;
$longDesc = new TTextType();
Expand Down Expand Up @@ -1188,13 +1188,13 @@ public function testStaticGetterMethods()
*/
private function setUpMetadataForNavTests()
{
$msg = null;
$metadataManager = new MetadataManager('Data', 'Container');
$expectedCategorySetName = 'Categories';
$expectedCustomerSetName = 'Customers';

list($categoryType, $categorySet) = $metadataManager->addEntityType('Category');
list($customerType, $customerSet) = $metadataManager->addEntityType('Customer');
$msg = '';
$this->assertTrue($categoryType->isOK($msg), $msg);
$this->assertTrue($customerType->isOK($msg), $msg);
$this->assertEquals($expectedCategorySetName, $categorySet->getName());
Expand Down

0 comments on commit 1b26a22

Please sign in to comment.