Universal-Omega/PortableInfobox
1
0
Fork 0
mirror of https://github.com/Universal-Omega/PortableInfobox.git synced 2024-11-15 20:09:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

XW-2415 | test getSourcesMetadata method and fix an issue that was found

Browse source
This commit is contained in:
Igor Rogatty 2016-12-14 15:46:17 +01:00
parent 7889cb59e4
commit 4705117c83
2 changed files with 217 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/Parser/Nodes/Node.php
View file

@ -48,7 +48,7 @@ class Node {
$baseLabel ;
}
if ( $sourcesLength > 0 ) {
if ( $sourcesLength > 0 && $this->hasPrimarySource( $this->xmlNode ) ) {
// self::extractSourcesFromNode() puts the value of the `source` attribute as the first element of $sources
$firstSource = reset( $sources );
$metadata[$firstSource]['primary'] = true;
@ -257,7 +257,7 @@ class Node {
*
*/
protected function extractSourcesFromNode( \SimpleXMLElement $xmlNode ) {
$sources = $this->getXmlAttribute( $xmlNode, self::DATA_SRC_ATTR_NAME ) ?
$sources = $this->hasPrimarySource( $xmlNode ) ?
[ $this->getXmlAttribute( $xmlNode, self::DATA_SRC_ATTR_NAME ) ] : [];
if ( $xmlNode->{self::FORMAT_TAG_NAME} ) {
@ -270,6 +270,10 @@ class Node {
return $sources;
}
protected function hasPrimarySource( \SimpleXMLElement $xmlNode ) {
return (bool) $this->getXmlAttribute( $xmlNode, self::DATA_SRC_ATTR_NAME );
}
protected function matchVariables( \SimpleXMLElement $node, array $source ) {
preg_match_all( self::EXTRACT_SOURCE_REGEX, (string)$node, $sources );

267
tests/nodes/NodeDataTest.php
View file

@ -39,94 +39,249 @@ class NodeDataTest extends WikiaBaseTest {
}
/**
* @covers \Wikia\PortableInfobox\Parser\Nodes\Node::getSourceLabel
* @dataProvider sourceLabelDataProvider
* @covers \Wikia\PortableInfobox\Parser\Nodes\Node::getSourcesMetadata
* @dataProvider sourcesMetadataDataProvider
*
* @param $markup
* @param $params
* @param $expected
*/
// TODO
//public function testSourceLabel( $markup, $params, $expected ) {
// $node = \Wikia\PortableInfobox\Parser\Nodes\NodeFactory::newFromXML( $markup, $params );
//
// $this->assertEquals( $expected, $node->getSourceLabel() );
//}
public function testSourcesMetadata( $markup, $params, $expected ) {
$node = \Wikia\PortableInfobox\Parser\Nodes\NodeFactory::newFromXML( $markup, $params );
public function sourceLabelDataProvider() {
$this->assertEquals( $expected, $node->getSourcesMetadata() );
}
public function sourcesMetadataDataProvider() {
return [
[ '<data source="test"></data>', [ ], ['test' => ''] ],
[ '<image source="test"/>', [ ], ['test' => ''] ],
[ '<title source="test"/>', [ ], ['test' => ''] ],
[ '<data source="test"><default>{{{test}}}</default></data>',
[ ], ['test' => ''] ],
[ '<data source="test"><label source="test">{{{test}}}</label><default>{{{test}}}</default></data>',
[ ], ['test' => '{{{test}}}'] ],
[ '<data source="test"><label>testLabel</label></data>', [ ], ['test' => 'testLabel'] ],
[ '<data></data>', [ ], [ ] ],
[ '<group><data source="test"><label>labelInsideGroup</label></data></group>', [], ['test' =>'labelInsideGroup'] ],
[ '<group>' .
'<data source="test"><label>labelInsideGroup</label></data>' .
'<data source="test2"><label>labelInsideGroup2</label></data>' .
'</group>',
[], ['test' =>'labelInsideGroup', 'test2' =>'labelInsideGroup2'] ],
[ '<group>' .
'<title source="title"/>' .
'<image source="image"/>' .
'<data source="test"><label>labelInsideGroup</label></data>' .
'<data source="test2"><label>labelInsideGroup2</label></data>' .
'</group>',
[], ['test' =>'labelInsideGroup', 'test2' =>'labelInsideGroup2', 'title' => '', 'image' => ''] ],
[ '<data source="test"><default>{{{test 2}}}</default></data>', [ ], [ 'test' => '', 'test 2' => '' ] ],
[ '<data source="test1"><default>{{#if: {{{test2|}}}| [[{{{test2}}} with some text]] }}</default></data>',
[ ], [ 'test1' => '', 'test2' => '' ] ],
[ '<data><default>{{#switch: {{{test2|}}}|{{{test3}}}|{{{test4|kdjk|sajdkfj|}}}]] }}</default></data>',
[ ], [ 'test2' => '', 'test3' => '', 'test4' => '' ] ],
[ '<data source="test1">' .
[
'<data source="test"></data>',
[],
[
'test' => [
'label' => '',
'primary' => true
]
]
],
[
'<image source="test"/>',
[],
[
'test' => [
'label' => '',
'primary' => true
]
]
],
[
'<title source="test"/>',
[],
[
'test' => [
'label' => '',
'primary' => true
]
]
],
[
'<data source="test"><default>{{{test}}}</default></data>',
[],
[
'test' => [
'label' => '',
'primary' => true
]
]
],
[
'<data source="test"><label source="test">{{{test}}}</label><default>{{{test}}}</default></data>',
[],
[
'test' => [
'label' => '{{{test}}}',
'primary' => true
]
]
],
[
'<data source="test"><label>testLabel</label></data>',
[],
[
'test' => [
'label' => 'testLabel',
'primary' => true
]
]
],
[ '<data></data>', [], [] ],
[
'<data source="test"><default>{{{test 2}}}</default></data>',
[],
[
'test' => [
'label' => '',
'primary' => true
],
'test 2' => [
'label' => ''
]
]
],
[
'<data source="test1"><default>{{#if: {{{test2|}}}| [[{{{test2}}} with some text]] }}</default></data>',
[],
[
'test1' => [
'label' => '',
'primary' => true
],
'test2' => [
'label' => ''
]
]
],
[
'<data><default>{{#switch: {{{test2|}}}|{{{test3}}}|{{{test4|kdjk|sajdkfj|}}}]] }}</default></data>',
[],
[
'test2' => [
'label' => ''
],
'test3' => [
'label' => ''
],
'test4' => [
'label' => ''
]
]
],
[
'<data source="test1">' .
'<format>my {{{test2}}}$$$</format>' .
'<default>{{#switch: {{{test3|}}}|{{{test4}}}|{{{test5|kdjk|sajdkfj|}}}]] }}</default>' .
'</data>',
[ 'test1' => 'blabla' ], [ 'test1' => '', 'test2' => '', 'test3' => '', 'test4' => '', 'test5' => '' ] ],
[ '<data>' .
[ 'test1' => 'blabla' ],
[
'test1' => [
'label' => '',
'primary' => true
],
'test2' => [
'label' => ''
],
'test3' => [
'label' => ''
],
'test4' => [
'label' => ''
],
'test5' => [
'label' => ''
]
]
],
[
'<data>' .
'<format>my {{{test2}}}$$$</format>' .
'<default>{{#switch: {{{test3|}}}|{{{test4}}}|{{{test5|kdjk|sajdkfj|}}}]] }}</default>' .
'</data>',
[ ], [ 'test2' => '', 'test3' => '', 'test4' => '', 'test5' => '' ] ],
[ '<data source="test1">' .
[],
[
'test2' => [
'label' => ''
],
'test3' => [
'label' => ''
],
'test4' => [
'label' => ''
],
'test5' => [
'label' => ''
]
]
],
[
'<data source="test1">' .
'<label>label</label>' .
'<default>{{#if: {{{test2|}}}| [[{{{test2}}} with some text]] }}</default>' .
'</data>',
[ ], [ 'test1' => 'label (test1)', 'test2' => 'label (test2)' ] ],
[ '<data>' .
[],
[
'test1' => [
'label' => 'label (test1)',
'primary' => true
],
'test2' => [
'label' => 'label (test2)'
],
]
],
[
'<data>' .
'<label>other label</label>' .
'<default>{{#switch: {{{test2|}}}|{{{test3}}}|{{{test4|kdjk|sajdkfj|}}}]] }}</default>' .
'</data>',
[ ], [ 'test2' => 'other label (test2)', 'test3' => 'other label (test3)', 'test4' => 'other label (test4)' ] ],
[ '<data source="test1">' .
[],
[
'test2' => [
'label' => 'other label (test2)'
],
'test3' => [
'label' => 'other label (test3)'
],
'test4' => [
'label' => 'other label (test4)'
],
]
],
[
'<data source="test1">' .
'<label>next label</label>' .
'<format>my {{{test2}}}$$$</format>' .
'<default>{{#switch: {{{test3|}}}|{{{test4}}}|{{{test5|kdjk|sajdkfj|}}}]] }}</default>' .
'</data>',
[ 'test1' => 'blabla' ],
[
'test1' => 'next label (test1)',
'test2' => 'next label (test2)',
'test3' => 'next label (test3)',
'test4' => 'next label (test4)',
'test5' => 'next label (test5)'
'test1' => [
'label' => 'next label (test1)',
'primary' => true
],
'test2' => [
'label' => 'next label (test2)'
],
'test3' => [
'label' => 'next label (test3)'
],
'test4' => [
'label' => 'next label (test4)'
],
'test5' => [
'label' => 'next label (test5)'
]
]
],
[ '<data>' .
[
'<data>' .
'<label>last label</label>' .
'<format>my {{{test2}}}$$$</format>' .
'<default>{{#switch: {{{test3|}}}|{{{test4}}}|{{{test5|kdjk|sajdkfj|}}}]] }}</default>' .
'</data>',
[ ],
[],
[
'test2' => 'last label (test2)',
'test3' => 'last label (test3)',
'test4' => 'last label (test4)',
'test5' => 'last label (test5)'
'test2' => [
'label' => 'last label (test2)'
],
'test3' => [
'label' => 'last label (test3)'
],
'test4' => [
'label' => 'last label (test4)'
],
'test5' => [
'label' => 'last label (test5)'
]
]
]
];