Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Fixes in tests - changed order of params #119

Merged
merged 1 commit into from
Jul 5, 2017
Merged

Fixes in tests - changed order of params #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions test/Generator/ClassGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function testNameAccessors()
{
$classGenerator = new ClassGenerator();
$classGenerator->setName('TestClass');
self::assertEquals($classGenerator->getName(), 'TestClass');
self::assertEquals('TestClass', $classGenerator->getName());
}

public function testClassDocBlockAccessors()
Expand All @@ -61,7 +61,7 @@ public function testExtendedClassAccessors()
{
$classGenerator = new ClassGenerator();
$classGenerator->setExtendedClass('ExtendedClass');
self::assertEquals($classGenerator->getExtendedClass(), 'ExtendedClass');
self::assertEquals('ExtendedClass', $classGenerator->getExtendedClass());
}

public function testHasExtendedClass()
Expand All @@ -86,7 +86,7 @@ public function testImplementedInterfacesAccessors()
{
$classGenerator = new ClassGenerator();
$classGenerator->setImplementedInterfaces(['Class1', 'Class2']);
self::assertEquals($classGenerator->getImplementedInterfaces(), ['Class1', 'Class2']);
self::assertEquals(['Class1', 'Class2'], $classGenerator->getImplementedInterfaces());
}

public function testHasImplementedInterface()
Expand Down Expand Up @@ -123,7 +123,7 @@ public function testPropertyAccessors()

$property = $classGenerator->getProperty('propTwo');
self::assertInstanceOf(PropertyGenerator::class, $property);
self::assertEquals($property->getName(), 'propTwo');
self::assertEquals('propTwo', $property->getName());

// add a new property
$classGenerator->addProperty('prop3');
Expand Down Expand Up @@ -602,7 +602,7 @@ public function testCanAddConstant()

self::assertInstanceOf(PropertyGenerator::class, $constant);
self::assertTrue($constant->isConst());
self::assertEquals($constant->getDefaultValue()->getValue(), 'value');
self::assertEquals('value', $constant->getDefaultValue()->getValue());
}

/**
Expand All @@ -618,8 +618,8 @@ public function testCanAddConstantsWithArrayOfGenerators()
]);

self::assertCount(2, $classGenerator->getConstants());
self::assertEquals($classGenerator->getConstant('x')->getDefaultValue()->getValue(), 'value1');
self::assertEquals($classGenerator->getConstant('y')->getDefaultValue()->getValue(), 'value2');
self::assertEquals('value1', $classGenerator->getConstant('x')->getDefaultValue()->getValue());
self::assertEquals('value2', $classGenerator->getConstant('y')->getDefaultValue()->getValue());
}

/**
Expand All @@ -635,8 +635,8 @@ public function testCanAddConstantsWithArrayOfKeyValues()
]);

self::assertCount(2, $classGenerator->getConstants());
self::assertEquals($classGenerator->getConstant('x')->getDefaultValue()->getValue(), 'value1');
self::assertEquals($classGenerator->getConstant('y')->getDefaultValue()->getValue(), 'value2');
self::assertEquals('value1', $classGenerator->getConstant('x')->getDefaultValue()->getValue());
self::assertEquals('value2', $classGenerator->getConstant('y')->getDefaultValue()->getValue());
}

/**
Expand Down Expand Up @@ -743,7 +743,7 @@ public function testAddPropertyIsBackwardsCompatibleWithConstants()

$classGenerator->addProperty('x', 'value1', PropertyGenerator::FLAG_CONSTANT);

self::assertEquals($classGenerator->getConstant('x')->getDefaultValue()->getValue(), 'value1');
self::assertEquals('value1', $classGenerator->getConstant('x')->getDefaultValue()->getValue());
}

/**
Expand All @@ -760,8 +760,8 @@ public function testAddPropertiesIsBackwardsCompatibleWithConstants()
$classGenerator->addProperties($constants);

self::assertCount(2, $classGenerator->getConstants());
self::assertEquals($classGenerator->getConstant('x')->getDefaultValue()->getValue(), 'value1');
self::assertEquals($classGenerator->getConstant('y')->getDefaultValue()->getValue(), 'value2');
self::assertEquals('value1', $classGenerator->getConstant('x')->getDefaultValue()->getValue());
self::assertEquals('value2', $classGenerator->getConstant('y')->getDefaultValue()->getValue());
}

/**
Expand All @@ -773,7 +773,7 @@ public function testConstantsAddedFromReflection()
$classGenerator = ClassGenerator::fromReflection($reflector);
$constant = $classGenerator->getConstant('FOO');

self::assertEquals($constant->getDefaultValue()->getValue(), 'foo');
self::assertEquals('foo', $constant->getDefaultValue()->getValue());
}

/**
Expand Down Expand Up @@ -897,8 +897,8 @@ public function testCanAddTraitAliasWithString()

$aliases = $classGenerator->getTraitAliases();
self::assertArrayHasKey('myTrait::method', $aliases);
self::assertEquals($aliases['myTrait::method']['alias'], 'useMe');
self::assertEquals($aliases['myTrait::method']['visibility'], ReflectionMethod::IS_PRIVATE);
self::assertEquals('useMe', $aliases['myTrait::method']['alias']);
self::assertEquals(ReflectionMethod::IS_PRIVATE, $aliases['myTrait::method']['visibility']);
}

public function testCanAddTraitAliasWithArray()
Expand All @@ -913,8 +913,8 @@ public function testCanAddTraitAliasWithArray()

$aliases = $classGenerator->getTraitAliases();
self::assertArrayHasKey('myTrait::method', $aliases);
self::assertEquals($aliases['myTrait::method']['alias'], 'useMe');
self::assertEquals($aliases['myTrait::method']['visibility'], ReflectionMethod::IS_PRIVATE);
self::assertEquals('useMe', $aliases['myTrait::method']['alias']);
self::assertEquals(ReflectionMethod::IS_PRIVATE, $aliases['myTrait::method']['visibility']);
}

public function testAddTraitAliasExceptionInvalidMethodFormat()
Expand Down Expand Up @@ -984,8 +984,8 @@ public function testCanAddTraitOverride()

$overrides = $classGenerator->getTraitOverrides();
self::assertCount(1, $overrides);
self::assertEquals(key($overrides), 'myTrait::foo');
self::assertEquals($overrides['myTrait::foo'][0], 'hisTrait');
self::assertEquals('myTrait::foo', key($overrides));
self::assertEquals('hisTrait', $overrides['myTrait::foo'][0]);
}

public function testCanAddMultipleTraitOverrides()
Expand All @@ -996,7 +996,7 @@ public function testCanAddMultipleTraitOverrides()

$overrides = $classGenerator->getTraitOverrides();
self::assertCount(2, $overrides['myTrait::foo']);
self::assertEquals($overrides['myTrait::foo'][1], 'thatTrait');
self::assertEquals('thatTrait', $overrides['myTrait::foo'][1]);
}

public function testAddTraitOverrideExceptionInvalidMethodFormat()
Expand Down Expand Up @@ -1067,7 +1067,7 @@ public function testCanRemoveTraitOverride()
$overrides = $classGenerator->getTraitOverrides();

self::assertCount(1, $overrides['myTrait::foo']);
self::assertEquals($overrides['myTrait::foo'][1], 'thatTrait');
self::assertEquals('thatTrait', $overrides['myTrait::foo'][1]);
}

public function testCanRemoveAllTraitOverrides()
Expand Down
8 changes: 4 additions & 4 deletions test/Generator/TraitGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function testNameAccessors()
{
$classGenerator = new TraitGenerator();
$classGenerator->setName('TestClass');
self::assertEquals($classGenerator->getName(), 'TestClass');
self::assertEquals('TestClass', $classGenerator->getName());
}

public function testClassDocBlockAccessors()
Expand All @@ -58,7 +58,7 @@ public function testExtendedClassAccessors()
{
$classGenerator = new TraitGenerator();
$classGenerator->setExtendedClass('ExtendedClass');
self::assertEquals($classGenerator->getExtendedClass(), null);
self::assertNull($classGenerator->getExtendedClass());
}

public function testImplementedInterfacesAccessors()
Expand All @@ -82,7 +82,7 @@ public function testPropertyAccessors()

$property = $classGenerator->getProperty('propTwo');
self::assertInstanceOf(PropertyGenerator::class, $property);
self::assertEquals($property->getName(), 'propTwo');
self::assertEquals('propTwo', $property->getName());

// add a new property
$classGenerator->addProperty('prop3');
Expand Down Expand Up @@ -122,7 +122,7 @@ public function testMethodAccessors()

$method = $classGenerator->getMethod('methodOne');
self::assertInstanceOf(MethodGenerator::class, $method);
self::assertEquals($method->getName(), 'methodOne');
self::assertEquals('methodOne', $method->getName());

// add a new property
$classGenerator->addMethod('methodThree');
Expand Down
19 changes: 9 additions & 10 deletions test/Reflection/ReflectionDocBlockTagTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function testTagShouldAllowJustTagNameInDocBlockTagLine()
$classReflection = new Reflection\ClassReflection(TestAsset\TestSampleClass6::class);

$tag = $classReflection->getMethod('doSomething')->getDocBlock()->getTag('emptyTag');
self::assertEquals($tag->getName(), 'emptyTag', 'Factory First Match Failed');
self::assertEquals('emptyTag', $tag->getName(), 'Factory First Match Failed');
}

public function testTagShouldAllowMultipleWhitespacesBeforeDescription()
Expand Down Expand Up @@ -63,15 +63,15 @@ public function testTypeParam()

$paramTag = $classReflection->getMethod('doSomething')->getDocBlock()->getTag('param');

self::assertEquals($paramTag->getType(), 'int');
self::assertEquals('int', $paramTag->getType());
}

public function testVariableName()
{
$classReflection = new Reflection\ClassReflection(TestAsset\TestSampleClass5::class);

$paramTag = $classReflection->getMethod('doSomething')->getDocBlock()->getTag('param');
self::assertEquals($paramTag->getVariableName(), '$one');
self::assertEquals('$one', $paramTag->getVariableName());
}

public function testAllowsMultipleSpacesInDocBlockTagLine()
Expand All @@ -80,10 +80,9 @@ public function testAllowsMultipleSpacesInDocBlockTagLine()

$paramTag = $classReflection->getMethod('doSomething')->getDocBlock()->getTag('param');


self::assertEquals($paramTag->getType(), 'int', 'Second Match Failed');
self::assertEquals($paramTag->getVariableName(), '$var', 'Third Match Failed');
self::assertEquals($paramTag->getDescription(), 'Description of $var', 'Final Match Failed');
self::assertEquals('int', $paramTag->getType(), 'Second Match Failed');
self::assertEquals('$var', $paramTag->getVariableName(), 'Third Match Failed');
self::assertEquals('Description of $var', $paramTag->getDescription(), 'Final Match Failed');
}


Expand All @@ -106,7 +105,7 @@ public function testType()
$classReflection = new Reflection\ClassReflection(TestAsset\TestSampleClass5::class);

$paramTag = $classReflection->getMethod('doSomething')->getDocBlock()->getTag('return');
self::assertEquals($paramTag->getType(), 'mixed');
self::assertEquals('mixed', $paramTag->getType());
}

public function testAllowsMultipleSpacesInDocBlockTagLine2()
Expand All @@ -115,8 +114,8 @@ public function testAllowsMultipleSpacesInDocBlockTagLine2()

$paramTag = $classReflection->getMethod('doSomething')->getDocBlock()->getTag('return');

self::assertEquals($paramTag->getType(), 'string', 'Second Match Failed');
self::assertEquals($paramTag->getDescription(), 'Description of return value', 'Final Match Failed');
self::assertEquals('string', $paramTag->getType(), 'Second Match Failed');
self::assertEquals('Description of return value', $paramTag->getDescription(), 'Final Match Failed');
}


Expand Down