diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Connection/SolrTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Connection/SolrTest.php index da9e16a34615c76d1482ea9dd7fc9b2452c1a6b4..a70422d95a8f096bff59ff5f8d10ca3f21c8431b 100644 --- a/module/VuFind/tests/integration-tests/src/VuFindTest/Connection/SolrTest.php +++ b/module/VuFind/tests/integration-tests/src/VuFindTest/Connection/SolrTest.php @@ -27,6 +27,8 @@ */ namespace VuFindTest\Integration\Connection; +use VuFindSearch\ParamBag; + /** * Solr Connection Test Class * @@ -60,11 +62,12 @@ class SolrTest extends \VuFindTest\Unit\TestCase { $solr = $this->getServiceManager()->get('VuFind\Search\BackendManager') ->get('Solr'); - $result = $solr->alphabeticBrowse('author', 'Dublin Society', 0, 1); + $extras = new ParamBag(['extras' => 'id']); + $result = $solr->alphabeticBrowse('author', 'Dublin Society', 0, 1, $extras); $item = $result['Browse']['items'][0]; - $this->assertEquals($item['count'], count($item['ids'])); + $this->assertEquals($item['count'], count($item['extras']['id'])); $this->assertTrue(empty($item['useInstead'])); - $this->assertTrue(in_array('vtls000013187', $item['ids'])); + $this->assertTrue(in_array(['vtls000013187'], $item['extras']['id'])); $this->assertTrue(in_array('Royal Dublin Society', $item['seeAlso'])); $this->assertEquals('Dublin Society', $item['heading']); } @@ -78,10 +81,12 @@ class SolrTest extends \VuFindTest\Unit\TestCase { $solr = $this->getServiceManager()->get('VuFind\Search\BackendManager') ->get('Solr'); - $result = $solr->alphabeticBrowse('author', 'Dublin Society, Royal', 0, 1); + $extras = new ParamBag(['extras' => 'id']); + $result = $solr + ->alphabeticBrowse('author', 'Dublin Society, Royal', 0, 1, $extras); $item = $result['Browse']['items'][0]; $this->assertEquals(0, $item['count']); - $this->assertEquals($item['count'], count($item['ids'])); + $this->assertEquals($item['count'], count($item['extras']['id'])); $this->assertEquals('Dublin Society, Royal', $item['heading']); $this->assertTrue(empty($item['seeAlso'])); $this->assertTrue(in_array('Royal Dublin Society', $item['useInstead'])); @@ -96,15 +101,16 @@ class SolrTest extends \VuFindTest\Unit\TestCase { $solr = $this->getServiceManager()->get('VuFind\Search\BackendManager') ->get('Solr'); - $result = $solr->alphabeticBrowse('dewey', '123.45 .I39', 0, 1); + $extras = new ParamBag(['extras' => 'id']); + $result = $solr->alphabeticBrowse('dewey', '123.45 .I39', 0, 1, $extras); $item = $result['Browse']['items'][0]; $this->assertEquals(1, $item['count']); - $this->assertEquals($item['count'], count($item['ids'])); + $this->assertEquals($item['count'], count($item['extras']['id'])); $this->assertEquals('123.45 .I39', $item['heading']); - $result = $solr->alphabeticBrowse('dewey', '123.46 .Q39', 0, 1); + $result = $solr->alphabeticBrowse('dewey', '123.46 .Q39', 0, 1, $extras); $item = $result['Browse']['items'][0]; $this->assertEquals(1, $item['count']); - $this->assertEquals($item['count'], count($item['ids'])); + $this->assertEquals($item['count'], count($item['extras']['id'])); $this->assertEquals('123.46 .Q39', $item['heading']); }