Fix Tuque tests and set a default read-only property for checksumType. (

#165) * Use the trustStore that bundles with Java as the included one in Fedora is a sample. * Add tests showing that HTTPS content setting is broken on X datastreams. * Catch the exceptions until a further dig into FCREPO. * But wait 3.6.2 has a different breaking bug. * Add test showing default value isn't set for checksumType. * Add default dsChecksumType property for read-only. * Code review feedback.
Islandora · Jul 10, 2018 · fd3051d · fd3051d
1 parent ceaa130
commit fd3051d
Show file tree

Hide file tree

Showing 7 changed files with 133 additions and 4 deletions.
diff --git a/Datastream.php b/Datastream.php
@@ -1089,6 +1089,13 @@ protected function checksumMagicProperty($function, $value) {
     return $this->generalReadOnly('dsChecksum', 'none', $function, $value);
   }
 
+  /**
+   * @see AbstractDatastream::checksumType
+   */
+  protected function checksumTypeMagicProperty($function, $value) {
+    return $this->generalReadOnly('dsChecksumType', 'DISABLED', $function, $value);
+  }
+
   /**
    * @see AbstractDatastream::url
    */

diff --git a/tests/DatastreamTest.php b/tests/DatastreamTest.php
@@ -17,6 +17,8 @@ protected function setUp() {
     $this->api = new FedoraApi($connection);
     $cache = new SimpleCache();
     $this->repository = new FedoraRepository($this->api, $cache);
+    $describe = $this->api->a->describeRepository();
+    $this->fedoraVersion = isset($describe['repositoryVersion']) ? $describe['repositoryVersion'] : NULL;
 
     // create an object
     $string1 = FedoraTestHelpers::randomString(10);
@@ -204,7 +206,22 @@ public function testContentsSet() {
     $this->assertEquals(3, $newds->size);
   }
 
-  public function testContentSetUrl() {
+  public function testContentSetUrlHttp() {
+    $temp = tempnam(sys_get_temp_dir(), 'tuque');
+    $this->ds->setContentFromUrl(LOC_HTTP_URL);
+    $actual = file_get_contents(LOC_HTTP_URL);
+    $this->assertEquals($actual, $this->ds->content);
+    $this->ds->getContent($temp);
+    $this->assertEquals($actual, file_get_contents($temp));
+    unlink($temp);
+  }
+
+  public function testContentSetUrlHttps() {
+    // Get the Fedora version as there is currently a bug that needs
+    // investigation in 3.6.2 that breaks the tests otherwise.
+    if ($this->fedoraVersion === '3.6.2') {
+      $this->markTestSkipped('Is a bug in 3.6.2 that requires investigation.');
+    }
     $temp = tempnam(sys_get_temp_dir(), 'tuque');
     $this->ds->setContentFromUrl(TEST_PNG_URL);
     $actual = file_get_contents(TEST_PNG_URL);
@@ -244,7 +261,29 @@ public function testContentXFromFile() {
     $this->assertEquals('<testFixture></testFixture>', trim($newds->content));
   }
 
-  public function testContentXFromUrl() {
+  public function testContentXFromUrlHttpLoc() {
+    $file = getcwd() . '/tests/test_data/loc.xml';
+    $data = file_get_contents($file);
+    $this->x->setContentFromUrl(LOC_HTTP_URL);
+    $newds = new FedoraDatastream($this->testDsidX, $this->object, $this->repository);
+    $this->assertEquals(trim($data), trim($newds->content));
+  }
+
+  /**
+   * @expectedException        RepositoryException
+   */
+  public function testContentXFromUrlHttpsLoc() {
+    $file = getcwd() . '/tests/test_data/loc.xml';
+    $data = file_get_contents($file);
+    $this->x->setContentFromUrl(LOC_HTTPS_URL);
+    $newds = new FedoraDatastream($this->testDsidX, $this->object, $this->repository);
+    $this->assertEquals(trim($data), trim($newds->content));
+  }
+
+  /**
+   * @expectedException        RepositoryException
+   */
+  public function testContentXFromUrlHttps() {
     $data = <<<foo
 <woo>
   <test>
@@ -257,6 +296,26 @@ public function testContentXFromUrl() {
     $this->assertEquals($data, trim($newds->content));
   }
 
+  public function testContentMFromHttpsUrl() {
+    // Get the Fedora version as there is currently a bug that needs
+    // investigation in 3.6.2 that breaks the tests otherwise.
+    if ($this->fedoraVersion === '3.6.2') {
+      $this->markTestSkipped('Is a bug in 3.6.2 that requires investigation.');
+    }
+    $data = <<<foo
+<woo>
+  <test>
+    <xml></xml>
+  </test>
+</woo>
+foo;
+    $new_ds = $this->object->constructDatastream('fcreporocks', 'M');
+    $new_ds->content = '<om>nom</om>';
+    $this->object->ingestDatastream($new_ds);
+    $this->object[$new_ds->id]->setContentFromUrl(TEST_XML_URL);
+    $this->assertEquals($data, trim($new_ds->content));
+  }
+
   public function testVersions() {
     $this->assertEquals(1, count($this->ds));
     $this->ds->label = 'foot';
@@ -379,4 +438,18 @@ public function testLockingRefresh() {
     }
     $this->fail();
   }
+
+  public function testDatastreamVersionPropertiesExistWithDefaultValues() {
+    $new_ds = $this->object->constructDatastream('woot', 'M');
+    $new_ds->mimeType = 'text/plain';
+    $new_ds->content = 'initial version';
+    $this->object->ingestDatastream($new_ds);
+    $new_ds->content = 'version 2';
+
+    foreach ($this->object['woot'] as $ds) {
+      $this->assertEquals($ds->checksum, 'none');
+      $this->assertEquals($ds->checksumType, 'DISABLED');
+    }
+
+  }
 }
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
@@ -2,9 +2,11 @@
   <php>
     <const name="FEDORAURL" value="http://localhost:8080/fedora"/>
     <const name="FEDORAUSER" value="fedoraAdmin"/>
-    <const name="FEDORAPASS" value="wei9bo0eethooD"/>
+    <const name="FEDORAPASS" value="islandora"/>
     <const name="TEST_PNG_URL" value="http://islandora.ca/testfiles/tuque/test.png"/>
     <const name="TEST_XML_URL" value="http://islandora.ca/testfiles/tuque/woo.xml"/>
+    <const name="LOC_HTTP_URL" value="http://www.loc.gov/standards/mods/v3/modsejournal.xml"/>
+    <const name="LOC_HTTPS_URL" value="https://www.loc.gov/standards/mods/v3/modsejournal.xml"/>
   </php>
   <logging>
     <log type="coverage-html" target="../build/coverage" title="Tuque"

diff --git a/tests/phpunit.xml.sample b/tests/phpunit.xml.sample
@@ -5,5 +5,7 @@
     <const name="FEDORAPASS" value="fedoraAdmin"/>
     <const name="TEST_PNG_URL" value="http://islandora.ca/testfiles/tuque/test.png"/>
     <const name="TEST_XML_URL" value="http://islandora.ca/testfiles/tuque/woo.xml"/>
+    <const name="LOC_HTTP_URL" value="http://www.loc.gov/standards/mods/v3/modsejournal.xml"/>
+    <const name="LOC_HTTPS_URL" value="https://www.loc.gov/standards/mods/v3/modsejournal.xml"/>
   </php>
 </phpunit>
diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh
@@ -16,7 +16,7 @@ tar xf islandora_tomcat.$FEDORA_VERSION.tar.gz
 cd islandora_tomcat
 export CATALINA_HOME='.'
 export FEDORA_HOME=fedora
-export JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -Djavax.net.ssl.trustStore=$CATALINA_HOME/fedora/server/truststore -Djavax.net.ssl.trustStorePassword=tomcat"
+export JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled"
 
 # Needed for Fedora 3.8.1
 if [ $FEDORA_VERSION = "3.8.1" ]; then

diff --git a/tests/test_data/loc.xml b/tests/test_data/loc.xml
@@ -0,0 +1,43 @@
+<mods xmlns="http://www.loc.gov/mods/v3" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-0.xsd">
+  <titleInfo>
+    <title>Emergence and Dissolvence in the Self-Organization of Complex Systems</title>
+  </titleInfo>
+  <name type="personal">
+    <namePart type="family">Testa</namePart>
+    <namePart type="given">Bernard</namePart>
+    <role>
+      <roleTerm>author</roleTerm>
+    </role>
+  </name>
+  <name type="personal">
+    <namePart type="family">Kier</namePart>
+    <namePart type="given">Lamont B.</namePart>
+    <role>
+      <roleTerm>author</roleTerm>
+    </role>
+  </name>
+  <typeOfResource>text</typeOfResource>
+  <identifier type="uri">http://www.mdpi.org/entropy/papers/e2010001.pdf</identifier>
+  <relatedItem type="host">
+    <titleInfo>
+      <title>Entropy</title>
+    </titleInfo>
+    <originInfo>
+      <issuance>continuing</issuance>
+    </originInfo>
+    <part>
+      <detail type="volume">
+        <number>2</number>
+      </detail>
+      <detail type="issue">
+        <caption>no.</caption>
+        <number>1</number>
+      </detail>
+      <extent unit="pages">
+        <start>17</start>
+        <end>17</end>
+      </extent>
+      <date>2000</date>
+    </part>
+  </relatedItem>
+</mods>
diff --git a/tests/travis.xml b/tests/travis.xml
@@ -5,5 +5,7 @@
     <const name="FEDORAPASS" value="fedoraAdmin"/>
     <const name="TEST_PNG_URL" value="http://islandora.ca/testfiles/tuque/test.png"/>
     <const name="TEST_XML_URL" value="http://islandora.ca/testfiles/tuque/woo.xml"/>
+    <const name="LOC_HTTP_URL" value="http://www.loc.gov/standards/mods/v3/modsejournal.xml"/>
+    <const name="LOC_HTTPS_URL" value="https://www.loc.gov/standards/mods/v3/modsejournal.xml"/>
   </php>
 </phpunit>