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

Commit 67e214e

Browse files
OcramiusOcramius
authored
Merge pull request #119 from webimpress/hotfix/expected-actual
Fixes in tests - changed order of params
2 parents df2a93d + 96faf17 commit 67e214e

File tree

3 files changed

+34
-35
lines changed

3 files changed

+34
-35
lines changed

‎test/Generator/ClassGeneratorTest.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testNameAccessors()
3838
{
3939
$classGenerator = new ClassGenerator();
4040
$classGenerator->setName('TestClass');
41-
self::assertEquals($classGenerator->getName(), 'TestClass');
41+
self::assertEquals('TestClass', $classGenerator->getName());
4242
}
4343

4444
public function testClassDocBlockAccessors()
@@ -61,7 +61,7 @@ public function testExtendedClassAccessors()
6161
{
6262
$classGenerator = new ClassGenerator();
6363
$classGenerator->setExtendedClass('ExtendedClass');
64-
self::assertEquals($classGenerator->getExtendedClass(), 'ExtendedClass');
64+
self::assertEquals('ExtendedClass', $classGenerator->getExtendedClass());
6565
}
6666

6767
public function testHasExtendedClass()
@@ -86,7 +86,7 @@ public function testImplementedInterfacesAccessors()
8686
{
8787
$classGenerator = new ClassGenerator();
8888
$classGenerator->setImplementedInterfaces(['Class1', 'Class2']);
89-
self::assertEquals($classGenerator->getImplementedInterfaces(), ['Class1', 'Class2']);
89+
self::assertEquals(['Class1', 'Class2'], $classGenerator->getImplementedInterfaces());
9090
}
9191

9292
public function testHasImplementedInterface()
@@ -123,7 +123,7 @@ public function testPropertyAccessors()
123123

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

128128
// add a new property
129129
$classGenerator->addProperty('prop3');
@@ -602,7 +602,7 @@ public function testCanAddConstant()
602602

603603
self::assertInstanceOf(PropertyGenerator::class, $constant);
604604
self::assertTrue($constant->isConst());
605-
self::assertEquals($constant->getDefaultValue()->getValue(), 'value');
605+
self::assertEquals('value', $constant->getDefaultValue()->getValue());
606606
}
607607

608608
/**
@@ -618,8 +618,8 @@ public function testCanAddConstantsWithArrayOfGenerators()
618618
]);
619619

620620
self::assertCount(2, $classGenerator->getConstants());
621-
self::assertEquals($classGenerator->getConstant('x')->getDefaultValue()->getValue(), 'value1');
622-
self::assertEquals($classGenerator->getConstant('y')->getDefaultValue()->getValue(), 'value2');
621+
self::assertEquals('value1', $classGenerator->getConstant('x')->getDefaultValue()->getValue());
622+
self::assertEquals('value2', $classGenerator->getConstant('y')->getDefaultValue()->getValue());
623623
}
624624

625625
/**
@@ -635,8 +635,8 @@ public function testCanAddConstantsWithArrayOfKeyValues()
635635
]);
636636

637637
self::assertCount(2, $classGenerator->getConstants());
638-
self::assertEquals($classGenerator->getConstant('x')->getDefaultValue()->getValue(), 'value1');
639-
self::assertEquals($classGenerator->getConstant('y')->getDefaultValue()->getValue(), 'value2');
638+
self::assertEquals('value1', $classGenerator->getConstant('x')->getDefaultValue()->getValue());
639+
self::assertEquals('value2', $classGenerator->getConstant('y')->getDefaultValue()->getValue());
640640
}
641641

642642
/**
@@ -743,7 +743,7 @@ public function testAddPropertyIsBackwardsCompatibleWithConstants()
743743

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

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

749749
/**
@@ -760,8 +760,8 @@ public function testAddPropertiesIsBackwardsCompatibleWithConstants()
760760
$classGenerator->addProperties($constants);
761761

762762
self::assertCount(2, $classGenerator->getConstants());
763-
self::assertEquals($classGenerator->getConstant('x')->getDefaultValue()->getValue(), 'value1');
764-
self::assertEquals($classGenerator->getConstant('y')->getDefaultValue()->getValue(), 'value2');
763+
self::assertEquals('value1', $classGenerator->getConstant('x')->getDefaultValue()->getValue());
764+
self::assertEquals('value2', $classGenerator->getConstant('y')->getDefaultValue()->getValue());
765765
}
766766

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

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

779779
/**
@@ -897,8 +897,8 @@ public function testCanAddTraitAliasWithString()
897897

898898
$aliases = $classGenerator->getTraitAliases();
899899
self::assertArrayHasKey('myTrait::method', $aliases);
900-
self::assertEquals($aliases['myTrait::method']['alias'], 'useMe');
901-
self::assertEquals($aliases['myTrait::method']['visibility'], ReflectionMethod::IS_PRIVATE);
900+
self::assertEquals('useMe', $aliases['myTrait::method']['alias']);
901+
self::assertEquals(ReflectionMethod::IS_PRIVATE, $aliases['myTrait::method']['visibility']);
902902
}
903903

904904
public function testCanAddTraitAliasWithArray()
@@ -913,8 +913,8 @@ public function testCanAddTraitAliasWithArray()
913913

914914
$aliases = $classGenerator->getTraitAliases();
915915
self::assertArrayHasKey('myTrait::method', $aliases);
916-
self::assertEquals($aliases['myTrait::method']['alias'], 'useMe');
917-
self::assertEquals($aliases['myTrait::method']['visibility'], ReflectionMethod::IS_PRIVATE);
916+
self::assertEquals('useMe', $aliases['myTrait::method']['alias']);
917+
self::assertEquals(ReflectionMethod::IS_PRIVATE, $aliases['myTrait::method']['visibility']);
918918
}
919919

920920
public function testAddTraitAliasExceptionInvalidMethodFormat()
@@ -984,8 +984,8 @@ public function testCanAddTraitOverride()
984984

985985
$overrides = $classGenerator->getTraitOverrides();
986986
self::assertCount(1, $overrides);
987-
self::assertEquals(key($overrides), 'myTrait::foo');
988-
self::assertEquals($overrides['myTrait::foo'][0], 'hisTrait');
987+
self::assertEquals('myTrait::foo', key($overrides));
988+
self::assertEquals('hisTrait', $overrides['myTrait::foo'][0]);
989989
}
990990

991991
public function testCanAddMultipleTraitOverrides()
@@ -996,7 +996,7 @@ public function testCanAddMultipleTraitOverrides()
996996

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

10021002
public function testAddTraitOverrideExceptionInvalidMethodFormat()
@@ -1067,7 +1067,7 @@ public function testCanRemoveTraitOverride()
10671067
$overrides = $classGenerator->getTraitOverrides();
10681068

10691069
self::assertCount(1, $overrides['myTrait::foo']);
1070-
self::assertEquals($overrides['myTrait::foo'][1], 'thatTrait');
1070+
self::assertEquals('thatTrait', $overrides['myTrait::foo'][1]);
10711071
}
10721072

10731073
public function testCanRemoveAllTraitOverrides()

‎test/Generator/TraitGeneratorTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testNameAccessors()
3838
{
3939
$classGenerator = new TraitGenerator();
4040
$classGenerator->setName('TestClass');
41-
self::assertEquals($classGenerator->getName(), 'TestClass');
41+
self::assertEquals('TestClass', $classGenerator->getName());
4242
}
4343

4444
public function testClassDocBlockAccessors()
@@ -58,7 +58,7 @@ public function testExtendedClassAccessors()
5858
{
5959
$classGenerator = new TraitGenerator();
6060
$classGenerator->setExtendedClass('ExtendedClass');
61-
self::assertEquals($classGenerator->getExtendedClass(), null);
61+
self::assertNull($classGenerator->getExtendedClass());
6262
}
6363

6464
public function testImplementedInterfacesAccessors()
@@ -82,7 +82,7 @@ public function testPropertyAccessors()
8282

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

8787
// add a new property
8888
$classGenerator->addProperty('prop3');
@@ -122,7 +122,7 @@ public function testMethodAccessors()
122122

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

127127
// add a new property
128128
$classGenerator->addMethod('methodThree');

‎test/Reflection/ReflectionDocBlockTagTest.php‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function testTagShouldAllowJustTagNameInDocBlockTagLine()
3333
$classReflection = new Reflection\ClassReflection(TestAsset\TestSampleClass6::class);
3434

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

3939
public function testTagShouldAllowMultipleWhitespacesBeforeDescription()
@@ -63,15 +63,15 @@ public function testTypeParam()
6363

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

66-
self::assertEquals($paramTag->getType(), 'int');
66+
self::assertEquals('int', $paramTag->getType());
6767
}
6868

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

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

7777
public function testAllowsMultipleSpacesInDocBlockTagLine()
@@ -80,10 +80,9 @@ public function testAllowsMultipleSpacesInDocBlockTagLine()
8080

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

83-
84-
self::assertEquals($paramTag->getType(), 'int', 'Second Match Failed');
85-
self::assertEquals($paramTag->getVariableName(), '$var', 'Third Match Failed');
86-
self::assertEquals($paramTag->getDescription(), 'Description of $var', 'Final Match Failed');
83+
self::assertEquals('int', $paramTag->getType(), 'Second Match Failed');
84+
self::assertEquals('$var', $paramTag->getVariableName(), 'Third Match Failed');
85+
self::assertEquals('Description of $var', $paramTag->getDescription(), 'Final Match Failed');
8786
}
8887

8988

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

108107
$paramTag = $classReflection->getMethod('doSomething')->getDocBlock()->getTag('return');
109-
self::assertEquals($paramTag->getType(), 'mixed');
108+
self::assertEquals('mixed', $paramTag->getType());
110109
}
111110

112111
public function testAllowsMultipleSpacesInDocBlockTagLine2()
@@ -115,8 +114,8 @@ public function testAllowsMultipleSpacesInDocBlockTagLine2()
115114

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

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

122121

0 commit comments

Comments
 (0)