Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions fixtures/general/base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,9 @@
<sv:value>10</sv:value>
</sv:property>

<!-- at the very end of the document on purpose -->
<sv:property sv:name="multi-empty" sv:type="String" sv:multiple="true"></sv:property>
<sv:property sv:name="multi-empty-selfclosing" sv:type="String" sv:multiple="true"/>
</sv:node>
</sv:node>

Expand Down
14 changes: 7 additions & 7 deletions tests/11_Import/ImportRepositoryContentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ private function doTestImportXMLSystem($connect, $session)
}

/**
* @expectedException PHPCR\PathNotFoundException
* @expectedException \PHPCR\PathNotFoundException
*/
public function testImportXMLSystemPathNotFoundSession()
{
$session = $this->sharedFixture['session'];
$session->importXML('/inexistent-path', __DIR__.'/../../fixtures/general/base.xml', ImportUUIDBehaviorInterface::IMPORT_UUID_COLLISION_THROW);
}
/**
* @expectedException PHPCR\PathNotFoundException
* @expectedException \PHPCR\PathNotFoundException
*/
public function testImportXMLSystemPathNotFoundWorkspace()
{
Expand All @@ -77,7 +77,7 @@ public function testImportXMLSystemPathNotFoundWorkspace()
}

/**
* @expectedException PHPCR\ItemExistsException
* @expectedException \PHPCR\ItemExistsException
*/
public function testImportXMLSystemIdCollisionSession()
{
Expand All @@ -87,7 +87,7 @@ public function testImportXMLSystemIdCollisionSession()
}

/**
* @expectedException PHPCR\ItemExistsException
* @expectedException \PHPCR\ItemExistsException
*/
public function testImportXMLSystemIdCollisionWorkspace()
{
Expand All @@ -98,7 +98,7 @@ public function testImportXMLSystemIdCollisionWorkspace()

/**
* try to replace the path to which we are importing atm
* @expectedException PHPCR\NodeType\ConstraintViolationException
* @expectedException \PHPCR\NodeType\ConstraintViolationException
*/
public function testImportXMLUuidRemoveParentSession()
{
Expand All @@ -109,7 +109,7 @@ public function testImportXMLUuidRemoveParentSession()

/**
* try to replace the path to which we are importing atm
* @expectedException PHPCR\NodeType\ConstraintViolationException
* @expectedException \PHPCR\NodeType\ConstraintViolationException
*/
public function testImportXMLUuidRemoveParentWorkspace()
{
Expand Down Expand Up @@ -316,7 +316,7 @@ public function testImportXMLUuidReplaceRoot()
/**
* Provoke an io error
*
* @expectedException RuntimeException
* @expectedException \RuntimeException
*/
public function testImportXMLNoFile()
{
Expand Down