Fixed minor test problems.

- Missing declaration and mocking non-existent method were causing Travis failures under PHP 7.

module/VuFind/tests/unit-tests/src/VuFindTest/Search/Primo/OnCampusListenerTest.php

@@ -132,8 +132,6 @@ class OnCampusListenerTest extends TestCase
             = $this->getMockBuilder('VuFind\Search\Primo\PrimoPermissionHandler')
             ->disableOriginalConstructor()
             ->getMock();
-        $mockPermController->expects($this->any())->method('hasDefaultPermission')
-            ->will($this->returnValue(true));
         $mockPermController->expects($this->any())->method('hasPermission')
             ->will($this->returnValue(true));
 
@@ -161,8 +159,6 @@ class OnCampusListenerTest extends TestCase
             = $this->getMockBuilder('VuFind\Search\Primo\PrimoPermissionHandler')
             ->disableOriginalConstructor()
             ->getMock();
-        $mockPermController->expects($this->any())->method('hasDefaultPermission')
-            ->will($this->returnValue(false));
 
         $listener = new InjectOnCampusListener($mockPermController);
 
@@ -186,8 +182,6 @@ class OnCampusListenerTest extends TestCase
             = $this->getMockBuilder('VuFind\Search\Primo\PrimoPermissionHandler')
             ->disableOriginalConstructor()
             ->getMock();
-        $mockPermController->expects($this->any())->method('hasDefaultPermission')
-            ->will($this->returnValue(false));
         $mockPermController->expects($this->any())->method('hasPermission')
             ->will($this->returnValue(true));
 
@@ -213,8 +207,6 @@ class OnCampusListenerTest extends TestCase
             = $this->getMockBuilder('VuFind\Search\Primo\PrimoPermissionHandler')
             ->disableOriginalConstructor()
             ->getMock();
-        $mockPermController->expects($this->any())->method('hasDefaultPermission')
-            ->will($this->returnValue(false));
         $mockPermController->expects($this->any())->method('hasPermission')
             ->will($this->returnValue(false));
 

module/VuFind/tests/unit-tests/src/VuFindTest/Solr/WriterTest.php

@@ -49,9 +49,9 @@ class WriterTest extends \VuFindTest\Unit\TestCase
     {
         $bm = $this->getBackendManagerWithMockSolr();
         $connector = $bm->get('Solr')->getConnector();
-        $connector->expects($this->at(0))->method('setTimeout')->with($this->equalTo(60 * 60));
+        $connector->expects($this->at(1))->method('setTimeout')->with($this->equalTo(60 * 60));
         $connector->expects($this->once())->method('write')->with($this->isInstanceOf('VuFindSearch\Backend\Solr\Document\CommitDocument'));
-        $connector->expects($this->at(2))->method('setTimeout')->with($this->equalTo(30));
+        $connector->expects($this->at(3))->method('setTimeout')->with($this->equalTo(30));
         $writer = new Writer($bm, $this->getMockChangeTracker());
         $writer->commit('Solr');
     }
@@ -80,9 +80,9 @@ class WriterTest extends \VuFindTest\Unit\TestCase
     {
         $bm = $this->getBackendManagerWithMockSolr();
         $connector = $bm->get('Solr')->getConnector();
-        $connector->expects($this->at(0))->method('setTimeout')->with($this->equalTo(60 * 60 * 24));
+        $connector->expects($this->at(1))->method('setTimeout')->with($this->equalTo(60 * 60 * 24));
         $connector->expects($this->once())->method('write')->with($this->isInstanceOf('VuFindSearch\Backend\Solr\Document\OptimizeDocument'));
-        $connector->expects($this->at(2))->method('setTimeout')->with($this->equalTo(30));
+        $connector->expects($this->at(3))->method('setTimeout')->with($this->equalTo(30));
         $writer = new Writer($bm, $this->getMockChangeTracker());
         $writer->optimize('Solr');
     }
@@ -138,7 +138,7 @@ class WriterTest extends \VuFindTest\Unit\TestCase
             ->getMock();
         $mockConnector = $this->getMockBuilder('VuFindSearch\Backend\Solr\Connector')
             ->disableOriginalConstructor()
-            ->setMethods(['getUrl', 'setTimeout', 'write'])
+            ->setMethods(['getUrl', 'getTimeout', 'setTimeout', 'write'])
             ->getMock();
         $mockBackend->expects($this->any())->method('getConnector')->will($this->returnValue($mockConnector));
         $mockConnector->expects($this->any())->method('getTimeout')->will($this->returnValue(30));