diff -r d7c5b43d309a -r 0365fd9977a4 server/src/tests/Models/DocumentTest.php --- a/server/src/tests/Models/DocumentTest.php Wed Oct 19 15:55:04 2016 +0200 +++ b/server/src/tests/Models/DocumentTest.php Wed Oct 19 18:05:51 2016 +0200 @@ -140,7 +140,7 @@ public function testGetOtherTypes() { $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->inputGraphes['TEST']); - $this->assertCount(5, $doc->getOtherTypes(), "types array must be of size 5"); + $this->assertCount(6, $doc->getOtherTypes(), "types array must be of size 5"); foreach($doc->getTypes() as $type) { $this->assertThat( @@ -156,12 +156,11 @@ public function testGetDiscourseTypes() { $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->inputGraphes['TEST']); - $this->assertCount(3, $doc->getDiscourseTypes(), "types array must be of size 3"); + $this->assertCount(2, $doc->getDiscourseTypes(), "types array must be of size 3"); - $this->assertContainsOnlyInstancesOf("EasyRdf\Literal", $doc->getDiscourseTypes(), "Result contains only literals"); + $this->assertContainsOnlyInstancesOf("EasyRdf\Resource", $doc->getDiscourseTypes(), "Result contains only Resources"); $type = $doc->getDiscourseTypes()[0]; - $this->assertEquals("narrative", $type->getValue(), "discourse type is narrative"); - $this->assertEquals("http://www.language-archives.org/OLAC/1.1/discourse-type", $type->getDatatypeUri(), "discourse type url"); + $this->assertEquals("http://ark.bnf.fr/ark:/12148/cb11932135w", $type->getUri(), "discourse type is cb11932135w"); } public function testCloneDocument() { @@ -188,14 +187,14 @@ public function testUpdateDiscourseTypes() { - $newDiscourseTypes = ['oratory','dialogue','narrative', 'formulaic', 'ludic']; + $newDiscourseTypes = ["http://ark.bnf.fr/ark:/12148/cb11932135w" , "http://ark.bnf.fr/ark:/12148/cb13319048g", "http://ark.bnf.fr/ark:/12148/cb11949715t" , "http://ark.bnf.fr/ark:/12148/cb119783362"]; $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->inputGraphes['TEST']); - $this->assertCount(3, $doc->getDiscourseTypes(), "types array must be of size 3"); + $this->assertCount(2, $doc->getDiscourseTypes(), "types array must be of size 2"); $doc->updateDiscourseTypes($newDiscourseTypes); - $this->assertCount(5, $doc->getDiscourseTypes(), "types array must be of size 5"); + $this->assertCount(4, $doc->getDiscourseTypes(), "types array must be of size 4"); $discourseTypes = $doc->getDiscourseTypes(); foreach($newDiscourseTypes as $dt) { @@ -206,7 +205,7 @@ public function testUpdateDiscourseTypesDelta() { - $newDiscourseTypes = ['oratory','dialogue','narrative', 'formulaic', 'ludic']; + $newDiscourseTypes = ["http://ark.bnf.fr/ark:/12148/cb11932135w" , "http://ark.bnf.fr/ark:/12148/cb13319048g", "http://ark.bnf.fr/ark:/12148/cb11949715t" , "http://ark.bnf.fr/ark:/12148/cb119783362"]; $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->inputGraphes['TEST']); @@ -221,13 +220,13 @@ $this->assertEquals(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $delta->getDeletedGraph()->getUri(), "uri of deleted graph must be ok"); $this->assertEquals(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $delta->getAddedGraph()->getUri(), "uri of added graph must be ok"); - $this->assertEquals(3, $delta->getDeletedGraph()->countTriples(), "deleted graph must have only 3 triples"); - $this->assertEquals(5, $delta->getAddedGraph()->countTriples(), "deleted graph must have only 5 triples"); + $this->assertEquals(2, $delta->getDeletedGraph()->countTriples(), "deleted graph must have only 2 triples"); + $this->assertEquals(4, $delta->getAddedGraph()->countTriples(), "deleted graph must have only 4 triples"); - $resQueryDiscourseType = $delta->getAddedGraph()->allLiterals($doc->getProvidedCHO(), 'dc11:type'); + $resQueryDiscourseType = $delta->getAddedGraph()->allResources($doc->getProvidedCHO(), 'dc11:type'); foreach($resQueryDiscourseType as $dt) { - $this->assertInstanceOf(EasyRdf\Literal::class, $dt, "This must be a litteral"); - $this->assertEquals('http://www.language-archives.org/OLAC/1.1/discourse-type', $dt->getDatatypeUri(), "The type of the Litteral must be correct"); + $this->assertInstanceOf(EasyRdf\Resource::class, $dt, "This must be a Resource"); + $this->assertRegexp(config('corpusparole.bnf_ark_url_regexp'), $dt->getUri(), "The resource uri must be bnf ark"); } foreach($newDiscourseTypes as $dt) { $this->assertContains($dt, $resQueryDiscourseType, "all discourse types must be in result list");