From 59b25c3021838196d1839a165863dbdd50bf89fc Mon Sep 17 00:00:00 2001
From: haogatyp <gatermann@effective-webwork.de>
Date: Tue, 10 Oct 2023 18:24:53 +0200
Subject: [PATCH] #766 Removed unnecessary mock test class and moved remaining
 mock test class back to the support folder.

---
 tests/Bootstrap.php                           |  1 -
 .../oai/models/MockDefaultOaiServer.php       | 34 -------------------
 tests/modules/oai/models/OaiConfigTest.php    |  4 +--
 .../modules/oai/models/ServerFactoryTest.php  | 11 +++---
 .../MockXMetaDissPlusServer.php               |  0
 5 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 100644 tests/modules/oai/models/MockDefaultOaiServer.php
 rename tests/{modules/oai/models => support}/MockXMetaDissPlusServer.php (100%)

diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 78d7fd340..8a50c34e2 100644
--- a/tests/Bootstrap.php
+++ b/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
diff --git a/tests/modules/oai/models/MockDefaultOaiServer.php b/tests/modules/oai/models/MockDefaultOaiServer.php
deleted file mode 100644
index c54c6642d..000000000
--- a/tests/modules/oai/models/MockDefaultOaiServer.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * This file is part of OPUS. The software OPUS has been originally developed
- * at the University of Stuttgart with funding from the German Research Net,
- * the Federal Department of Higher Education and Research and the Ministry
- * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
- *
- * OPUS 4 is a complete rewrite of the original OPUS software and was developed
- * by the Stuttgart University Library, the Library Service Center
- * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
- * the Saarland University and State Library, the Saxon State Library -
- * Dresden State and University Library, the Bielefeld University Library and
- * the University Library of Hamburg University of Technology with funding from
- * the German Research Foundation and the European Regional Development Fund.
- *
- * LICENCE
- * OPUS is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the Licence, or any later version.
- * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details. You should have received a copy of the GNU General Public License
- * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * @copyright   Copyright (c) 2008, OPUS 4 development team
- * @license     http://www.gnu.org/licenses/gpl.html General Public License
- */
-
-class MockDefaultOaiServer extends Oai_Model_DefaultServer
-{
-}
diff --git a/tests/modules/oai/models/OaiConfigTest.php b/tests/modules/oai/models/OaiConfigTest.php
index 978c4830e..ccc69520b 100644
--- a/tests/modules/oai/models/OaiConfigTest.php
+++ b/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'        => 'opus4ci@example.org',
             'xsltFile'            => 'oaiFile.xslt',
-            'class'               => MockDefaultOaiServer::class,
+            'class'               => Oai_Model_Prefix_Oai_OaiDcServer::class,
             'viewHelpers'         => 'optionValue, fileUrl, frontdoorUrl, transferUrl, dcmiType, dcType, openAireType',
         ];
 
diff --git a/tests/modules/oai/models/ServerFactoryTest.php b/tests/modules/oai/models/ServerFactoryTest.php
index 9b9eac980..c54888598 100644
--- a/tests/modules/oai/models/ServerFactoryTest.php
+++ b/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'          => 'opus4ci@example.org',
-            '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)));
     }
 
diff --git a/tests/modules/oai/models/MockXMetaDissPlusServer.php b/tests/support/MockXMetaDissPlusServer.php
similarity index 100%
rename from tests/modules/oai/models/MockXMetaDissPlusServer.php
rename to tests/support/MockXMetaDissPlusServer.php