diff -r 86fcf0c837c0 -r 023b6d467566 server/src/tests/Repositories/DocumentRepositoryIntegrationTest.php --- a/server/src/tests/Repositories/DocumentRepositoryIntegrationTest.php Mon Mar 21 14:04:19 2016 +0100 +++ b/server/src/tests/Repositories/DocumentRepositoryIntegrationTest.php Fri Mar 25 17:03:45 2016 +0100 @@ -42,66 +42,66 @@ @prefix fn: . _:genid-2267740936ad4d04a567e6787732f0dd-genid1 a ; - owl:sameAs ; - "northlimit=47.431892250000033; southlimit=49.053971250000046;westlimit=6.846186050000028; eastlimit=8.232571550000074;"^^ , "FR"^^ , "France, Alsace"@fr . + owl:sameAs ; + "northlimit=47.431892250000033; southlimit=49.053971250000046;westlimit=6.846186050000028; eastlimit=8.232571550000074;"^^ , "FR"^^ , "France, Alsace"@fr . - a ; - ; - "Atlas linguistiques, cultures et parlers régionaux de France" ; - , ; - ; - ; - "Corpus de la Parole"@fr ; - . + <%1\$scrdo-ALA_738> a ; + ; + "Atlas linguistiques, cultures et parlers régionaux de France" ; + , ; + ; + ; + "Corpus de la Parole"@fr ; + . a ; - "audio/mpeg"^^ ; - "1996"^^ ; - "PT01H11M29S" ; - "2014-11-10T14:27:08+01:00"^^ ; - . + "audio/mpeg"^^ ; + "1996"^^ ; + "PT01H11M29S" ; + "2014-11-10T14:27:08+01:00"^^ ; + . a ; - "audio/x-wav"^^ ; - "1996"^^ ; - "PT01H11M29S" ; - "2014-11-10T14:27:08+01:00"^^ . + "audio/x-wav"^^ ; + "1996"^^ ; + "PT01H11M29S" ; + "2014-11-10T14:27:08+01:00"^^ . a ; - "audio/x-wav"^^ ; - "1996"^^ ; - "PT01H11M29S" ; - "2014-11-10T14:27:08+01:00"^^ ; - . + "audio/x-wav"^^ ; + "1996"^^ ; + "PT01H11M29S" ; + "2014-11-10T14:27:08+01:00"^^ ; + . a ; - "1996"^^ ; - "PT01H11M29S" ; - "2014-11-10T14:27:08+01:00"^^ ; - , ; - "Extrait des enquêtes dialectologiques en vue de constituer un atlas linguistique de l'Alsace."@fr ; - ; - "Atlas linguistiques, cultures et parlers régionaux de France" ; - "Copyright (c) Département de dialectologie alsacienne et mosellane de l'Université de Strasbourg" ; - , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , "anthropological_linguistics"^^ , "lexicography"^^ , "phonetics"^^ ; - "Atlas Linguistique et ethnographique de l'Alsace - Enquetes sur la conscience linguistique - ALA_738"@fr ; - , , , "dialogue"^^ , "primary_text"^^ ; - "Freely available for non-commercial use" ; - "2004-07-03"^^ ; - , ; - ; - _:genid-2267740936ad4d04a567e6787732f0dd-genid1 ; - ; - , . + "1996"^^ ; + "PT01H11M29S" ; + "2014-11-10T14:27:08+01:00"^^ ; + , ; + "Extrait des enquêtes dialectologiques en vue de constituer un atlas linguistique de l'Alsace."@fr ; + ; + "Atlas linguistiques, cultures et parlers régionaux de France" ; + "Copyright (c) Département de dialectologie alsacienne et mosellane de l'Université de Strasbourg" ; + , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , "anthropological_linguistics"^^ , "lexicography"^^ , "phonetics"^^ ; + "Atlas Linguistique et ethnographique de l'Alsace - Enquetes sur la conscience linguistique - ALA_738"@fr ; + , , , "dialogue"^^ , "primary_text"^^ ; + "Freely available for non-commercial use" ; + "2004-07-03"^^ ; + , ; + ; + _:genid-2267740936ad4d04a567e6787732f0dd-genid1 ; + ; + , . EOT; function __construct(string $name = null) { parent::__construct($name); - $this->graph = new EasyRdf\Graph("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-ALA_738", DocumentRepositoryIntegrationTest::TEST_DOC); } public function setUp() { parent::setUp(); + $this->graph = new EasyRdf\Graph(config('corpusparole.corpus_doc_id_base_uri')."crdo-ALA_738", sprintf(DocumentRepositoryIntegrationTest::TEST_DOC, config('corpusparole.corpus_doc_id_base_uri'))); $this->httpClient = new Client(['base_uri' => config('corpusparole.sesame_base_url')]); $this->sesameRepository = config('corpusparole.sesame_repository'); @@ -118,8 +118,8 @@ ]); $this->httpClient->put("repositories/$this->sesameRepository/statements", [ 'headers' => ['Content-type' => 'text/turtle;charset=UTF-8'], - 'body' => DocumentRepositoryIntegrationTest::TEST_DOC, - 'query' => ['context' => ''], + 'body' => sprintf(DocumentRepositoryIntegrationTest::TEST_DOC, config('corpusparole.corpus_doc_id_base_uri')), + 'query' => ['context' => "<".config('corpusparole.corpus_doc_id_base_uri')."crdo-ALA_738>"], ]); } @@ -136,7 +136,7 @@ $resDoc = $docList[0]; $this->assertInstanceOf(Document::class, $resDoc, "Res doc must be a Document"); - $this->assertEquals('corpusparole:crdo-ALA_738', $resDoc->getId(), "id must be crdo..."); + $this->assertEquals(config('corpusparole.corpus_id_scheme').'crdo-ALA_738', $resDoc->getId(), "id must be crdo..."); $this->assertEquals($expectedId, $resDoc->getUri(), 'url must be ...'); $this->assertNotNull($resDoc->getGraph(), 'Graph must not be null'); @@ -145,20 +145,20 @@ public function testGet() { $expectedId = $this->corpusDocIdBaseUri.'crdo-ALA_738'; - $returnedGraph = new EasyRdf\Graph($expectedId, DocumentRepositoryIntegrationTest::TEST_DOC); + $returnedGraph = new EasyRdf\Graph($expectedId, sprintf(DocumentRepositoryIntegrationTest::TEST_DOC,config('corpusparole.corpus_doc_id_base_uri'))); $res = $this->documentRepository->get('crdo-ALA_738'); $this->assertInstanceOf(Document::class, $res, "Result must be of type Document"); - $this->assertEquals('corpusparole:crdo-ALA_738', $res->getId(), 'id should be crdo-ALA_738' ); + $this->assertEquals(config('corpusparole.corpus_id_scheme').'crdo-ALA_738', $res->getId(), 'id should be crdo-ALA_738' ); $this->assertNotNull($res->getGraph(), "Graph shoul not be null"); - $this->assertEquals("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-ALA_738",$res->getGraph()->getUri(), "uri of graph must be http://corpusdelaparole.huma-num.fr/corpus/res/crdo-ALA_738"); + $this->assertEquals(config('corpusparole.corpus_doc_id_base_uri')."crdo-ALA_738",$res->getGraph()->getUri(), "uri of graph must be ".config('corpusparole.corpus_doc_id_base_uri')."crdo-ALA_738"); $this->assertTrue(EasyRdf\Isomorphic::isomorphic($res->getGraph(),$returnedGraph)); } public function testSave() { - $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-ALA_738", $this->graph); + $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-ALA_738", $this->graph); $doc->updateDiscourseTypes(['oratory','drama','narrative']); $res = $this->documentRepository->save($doc);