Handling and tests for malformed dates

NatLibFi · Jun 12, 2020 · 053b065 · 053b065
1 parent e5c649d
commit 053b065
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/model/sparql/GenericSparql.php b/model/sparql/GenericSparql.php
@@ -2249,7 +2249,8 @@ private function transformChangeListResults($result) {
                 try {
                     $concept['date'] = $row->date->getValue();
                 } catch (Exception $e) {
-                    //don't do anything to malformed dates e.g. 1986-21-00
+                    //don't record concepts with malformed dates e.g. 1986-21-00
+                    continue;
                 }
             }
 

diff --git a/tests/GenericSparqlTest.php b/tests/GenericSparqlTest.php
@@ -1107,6 +1107,23 @@ public function testQueryChangeList()
     $this->assertEquals(array('Fourth date', 'Hurr Durr', 'Second date', 'A date'), $order);
   }
 
+  /**
+   * @covers GenericSparql::queryChangeList
+   * @covers GenericSparql::generateChangeListQuery
+   * @covers GenericSparql::transFormChangeListResults
+   */
+  public function testMalformedDates() {
+    $voc = $this->model->getVocabulary('test');
+    $graph = $voc->getGraph();
+    $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model);
+    $result = $sparql->queryChangeList('dc:modified', 'en', 0, 10);
+    $uris = array();
+    foreach($result as $concept) {
+      $uris[] = $concept['uri'];
+    }
+    $this->assertNotContains('http://www.skosmos.skos/test/ta114', $uris);
+  }
+
   /**
    * @covers GenericSparql::formatTypes
    * @covers GenericSparql::queryConcepts

diff --git a/tests/WebControllerTest.php b/tests/WebControllerTest.php
@@ -209,6 +209,7 @@ public function testGetModifiedDate($concept, $git, $config, $modifiedDate)
     }
 
     /**
+     * @covers WebController::getChangeList
      * @covers WebController::formatChangeList
      */
     public function testFormatChangeList() {
@@ -225,5 +226,4 @@ public function testFormatChangeList() {
         $this->assertEquals(array('December 2011', 'February 2010', 'January 2000'), array_keys($months));
         $this->assertEquals($expected, $months['February 2010']);
     }
-
 }