#766 Removed unnecessary mock test class and moved remaining mock tes…

…t class back to the support folder.

tests/Bootstrap.php

@@ -42,7 +42,6 @@
 
 // Ensure library/ is on include_path
 set_include_path(implode(PATH_SEPARATOR, [
-    APPLICATION_PATH . DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR . 'modules' . DIRECTORY_SEPARATOR . 'oai'. DIRECTORY_SEPARATOR . 'models',
     APPLICATION_PATH . DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR . 'support', // Support-Klassen fuer Tests
     APPLICATION_PATH . DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR . 'library', // tests/library
     APPLICATION_PATH . DIRECTORY_SEPARATOR . 'library', // Server library

tests/modules/oai/models/OaiConfigTest.php

@@ -50,7 +50,7 @@ protected function getTestConfiguration()
                 ],
                 'format' => [
                     'default'       => [
-                        'class'       => MockDefaultOaiServer::class,
+                        'class'       => Oai_Model_Prefix_Oai_OaiDcServer::class,
                         'viewHelpers' => 'optionValue, fileUrl, frontdoorUrl, transferUrl, dcmiType, dcType, openAireType',
                         'xsltFile'    => 'oaiFile.xslt',
                     ],
@@ -88,7 +88,7 @@ public function testGetDefaults()
             'resumptionTokenPath' => '/vagrant/tests/workspace/tmp/resumption',
             'emailContact'        => '[email protected]',
             'xsltFile'            => 'oaiFile.xslt',
-            'class'               => MockDefaultOaiServer::class,
+            'class'               => Oai_Model_Prefix_Oai_OaiDcServer::class,
             'viewHelpers'         => 'optionValue, fileUrl, frontdoorUrl, transferUrl, dcmiType, dcType, openAireType',
         ];
 

tests/modules/oai/models/ServerFactoryTest.php

@@ -53,9 +53,8 @@ protected function getTestConfiguration()
                 ],
                 'format' => [
                     'default'       => [
-                        'class'                => MockDefaultOaiServer::class,
+                        'class'                => Oai_Model_Prefix_Oai_OaiDcServer::class,
                         'viewHelpers'          => 'optionValue, fileUrl, frontdoorUrl, transferUrl, dcmiType, dcType, openAireType',
-                        'xsltFile'             => 'oaiFile.xslt',
                         'hasFilesVisibleInOai' => 1,
                     ],
                     'copy_xml'      => [
@@ -102,7 +101,7 @@ public function testCreate()
         $serverFactory = new Oai_Model_ServerFactory();
         $serverFactory->setOaiConfig($this->getOaiConfig());
         $server = $serverFactory->create();
-        $this->assertEquals(MockDefaultOaiServer::class, get_class($server));
+        $this->assertEquals(Oai_Model_Prefix_Oai_OaiDcServer::class, get_class($server));
     }
 
     public function testCreateWithMetadataPrefix()
@@ -118,7 +117,7 @@ public function testCreateWithUnknownMetadataPrefix()
         $serverFactory = new Oai_Model_ServerFactory();
         $serverFactory->setOaiConfig($this->getOaiConfig());
         $server = $serverFactory->create('unknownPrefix');
-        $this->assertEquals(MockDefaultOaiServer::class, get_class($server));
+        $this->assertEquals(Oai_Model_Prefix_Oai_OaiDcServer::class, get_class($server));
     }
 
     public function testCreateWithNoFormatConfiguration()
@@ -184,7 +183,7 @@ public function testDefaultServerOptionsWithDefaultConfiguration()
             'maxListRecords'        => 10,
             'resumptionTokenPath'   => '/vagrant/tests/workspace/tmp/resumption',
             'emailContact'          => '[email protected]',
-            'xsltFile'              => 'oaiFile.xslt',
+            'xsltFile'              => 'oai_dc.xslt',
             'documentStatesAllowed' => ['published', 'deleted'],
             'viewHelpers'           => ['optionValue', 'fileUrl', 'frontdoorUrl', 'transferUrl', 'dcmiType', 'dcType', 'openAireType', 'listMetadataFormats'],
             'notEmbargoedOn'        => false,
@@ -194,7 +193,7 @@ public function testDefaultServerOptionsWithDefaultConfiguration()
             'checkEmbargo'          => false,
         ];
 
-        $this->assertEquals(MockDefaultOaiServer::class, get_class($server));
+        $this->assertEquals(Oai_Model_Prefix_Oai_OaiDcServer::class, get_class($server));
         $this->assertEquals($expectedOptions, $server->getOptions(array_keys($expectedOptions)));
     }