Skip to content

increase xpath support #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 22, 2022
Merged

increase xpath support #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
778b9c2
increase xpath support
pamoller Aug 15, 2022
f913926
use single quote
pamoller Aug 20, 2022
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
24 changes: 23 additions & 1 deletion src/Codeception/Util/JsonArray.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,33 @@ private function arrayToXml(DOMDocument $doc, DOMNode $node, array $array): void
if (is_array($value)) {
$this->arrayToXml($doc, $subNode, $value);
} else {
$subNode->nodeValue = htmlspecialchars((string)$value);
$this->setValue($subNode, $value);
}
}
}

private function setValue($subNode, $value) {
switch(gettype($value)) {
case 'boolean':
$subNode->nodeValue = $value?'true':'false';
$subNode->setAttribute('type', 'boolean');
break;
case 'integer':
case 'double':
$subNode->nodeValue = (string) $value;
$subNode->setAttribute('type', 'number');
break;
case 'NULL':
$subNode->nodeValue = '';
$subNode->setAttribute('type', 'null');
break;
default:
$subNode->nodeValue = htmlspecialchars((string) $value);
$subNode->setAttribute('type', 'string');
break;
}
}

private function getValidTagNameForInvalidKey($key)
{
static $map = [];
Expand Down
36 changes: 26 additions & 10 deletions tests/unit/Codeception/Util/JsonArrayTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ protected function _before()
public function testXmlConversion()
{
$this->assertStringContainsString(
'<ticket><title>Bug should be fixed</title><user><name>Davert</name></user><labels></labels></ticket>',
'<ticket><title type="string">Bug should be fixed</title><user><name type="string">Davert</name></user><labels type="null"></labels></ticket>',
$this->jsonArray->toXml()->saveXML()
);
}
Expand All @@ -32,17 +32,33 @@ public function testXmlArrayConversion2()
'[{"user":"Blacknoir","age":27,"tags":["wed-dev","php"]},'
. '{"user":"John Doe","age":27,"tags":["web-dev","java"]}]'
);
$this->assertStringContainsString('<tags>wed-dev</tags>', $jsonArray->toXml()->saveXML());
$this->assertStringContainsString('<tags type="string">wed-dev</tags>', $jsonArray->toXml()->saveXML());
$this->assertSame(2, $jsonArray->filterByXPath('//user')->length);
}

public function testXPathEvaluation()
{
$this->assertSame(true, $this->jsonArray->evaluateXPath('count(//ticket/title)>0'));
$this->assertEquals(1.0 , $this->jsonArray->evaluateXPath('count(//ticket/user/name)'));
$this->assertSame(true, $this->jsonArray->evaluateXPath("count(//user/name[text() = 'Davert']) > 0"));
$this->assertTrue($this->jsonArray->evaluateXPath('count(//ticket/title)>0'));
$this->assertEquals(1, $this->jsonArray->evaluateXPath('count(//ticket/user/name)'));
$this->assertTrue($this->jsonArray->evaluateXPath("count(//user/name[text() = 'Davert']) > 0"));
}

public function testXPathTypes()
{
$jsonArray = new JsonArray(
'{"boolean":true, "number": -1.2780E+2, "null": null, "string": "i\'am a sentence"}'
);
$this->assertEquals(0, $jsonArray->evaluateXPath("count(//*[text() = 'false'])"));
$this->assertEquals(1, $jsonArray->evaluateXPath("count(//boolean[text() = 'true'])"));
$this->assertEquals(1, $jsonArray->evaluateXPath("count(//boolean[@type = 'boolean'])"));
$this->assertEquals(1, $jsonArray->evaluateXPath("count(//number[text() = -127.80])"));
$this->assertEquals(1, $jsonArray->evaluateXPath("count(//number[text() = -1.2780E+2])"));
$this->assertEquals(1, $jsonArray->evaluateXPath("count(//number[@type = 'number'])"));
$this->assertEquals(1, $jsonArray->evaluateXPath("count(//null[@type = 'null'])"));
$this->assertEquals(1, $jsonArray->evaluateXPath("count(//null[text() = ''])"));
$this->assertEquals(1, $jsonArray->evaluateXPath("count(//string[@type = 'string'])"));
}

public function testXPathLocation()
{
$this->assertGreaterThan(0, $this->jsonArray->filterByXPath('//ticket/title')->length);
Expand Down Expand Up @@ -83,32 +99,32 @@ public function testConvertsBareJson()
public function testInvalidXmlTag()
{
$jsonArray = new JsonArray('{"a":{"foo/bar":1,"":2},"b":{"foo/bar":1,"":2},"baz":2}');
$expectedXml = '<a><invalidTag1>1</invalidTag1><invalidTag2>2</invalidTag2></a>'
. '<b><invalidTag1>1</invalidTag1><invalidTag2>2</invalidTag2></b><baz>2</baz>';
$expectedXml = '<a><invalidTag1 type="number">1</invalidTag1><invalidTag2 type="number">2</invalidTag2></a>'
. '<b><invalidTag1 type="number">1</invalidTag1><invalidTag2 type="number">2</invalidTag2></b><baz type="number">2</baz>';
$this->assertStringContainsString($expectedXml, $jsonArray->toXml()->saveXML());
}

public function testConvertsArrayHavingSingleElement()
{
$jsonArray = new JsonArray('{"success": 1}');
$expectedXml = '<?xml version="1.0" encoding="UTF-8"?>'
. "\n<root><success>1</success></root>\n";
. "\n<root><success type=\"number\">1</success></root>\n";
$this->assertSame($expectedXml, $jsonArray->toXml()->saveXML());
}

public function testConvertsArrayHavingTwoElements()
{
$jsonArray = new JsonArray('{"success": 1, "info": "test"}');
$expectedXml = '<?xml version="1.0" encoding="UTF-8"?>'
. "\n<root><success>1</success><info>test</info></root>\n";
. "\n<root><success type=\"number\">1</success><info type=\"string\">test</info></root>\n";
$this->assertSame($expectedXml, $jsonArray->toXml()->saveXML());
}

public function testConvertsArrayHavingSingleSubArray()
{
$jsonArray = new JsonArray('{"array": {"success": 1}}');
$expectedXml = '<?xml version="1.0" encoding="UTF-8"?>'
. "\n<array><success>1</success></array>\n";
. "\n<array><success type=\"number\">1</success></array>\n";
$this->assertSame($expectedXml, $jsonArray->toXml()->saveXML());
}
}