MAGETWO-49469: Contribute Ogre Bugfixes and Stories for Sprint 44

- Fixing test

Author: mazhalai

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

@@ -170,14 +170,13 @@ public function __construct(
         $this->searchRequestName = $searchRequestName;
     }
 
-
     /**
      * @deprecated
      * @return \Magento\Search\Api\SearchInterface
      */
     private function getSearch()
     {
-        if ($this->search !== null) {
+        if ($this->search === null) {
             $this->search = ObjectManager::getInstance()->get('\Magento\Search\Api\SearchInterface');
         }
         return $this->search;
@@ -194,10 +193,11 @@ public function setSearch(\Magento\Search\Api\SearchInterface $object)
 
     /**
      * @deprecated
+     * @return \Magento\Framework\Api\Search\SearchCriteriaBuilder
      */
     private function getSearchCriteriaBuilder()
     {
-        if ($this->searchCriteriaBuilder !== null) {
+        if ($this->searchCriteriaBuilder === null) {
             $this->searchCriteriaBuilder = ObjectManager::getInstance()
                 ->get('\Magento\Framework\Api\Search\SearchCriteriaBuilder');
         }
@@ -208,18 +208,18 @@ private function getSearchCriteriaBuilder()
      * @deprecated
      * @param \Magento\Framework\Api\Search\SearchCriteriaBuilder $object
      */
-    public function setSearchCriteriaBuilder($object)
+    public function setSearchCriteriaBuilder(\Magento\Framework\Api\Search\SearchCriteriaBuilder $object)
     {
         $this->searchCriteriaBuilder = $object;
     }
 
-
     /**
      * @deprecated
+     * @return \Magento\Framework\Api\FilterBuilder
      */
     private function getFilterBuilder()
     {
-        if ($this->filterBuilder !== null) {
+        if ($this->filterBuilder === null) {
             $this->filterBuilder = ObjectManager::getInstance()->get('\Magento\Framework\Api\FilterBuilder');
         }
         return $this->filterBuilder;
@@ -229,7 +229,7 @@ private function getFilterBuilder()
      * @deprecated
      * @param \Magento\Framework\Api\FilterBuilder $object
      */
-    public function setFilterBuilder($object)
+    public function setFilterBuilder(\Magento\Framework\Api\FilterBuilder $object)
     {
         $this->filterBuilder = $object;
     }

app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php

@@ -38,10 +38,14 @@ protected function setUp()
                 'storeManager' => $storeManager,
                 'universalFactory' => $universalFactory,
                 'scopeConfig' => $scopeConfig,
-                'searchCriteriaBuilder' => $criteriaBuilder,
-                'filterBuilder' => $filterBuilder,
             ]
         );
+
+        $search = $this->getMockForAbstractClass('\Magento\Search\Api\SearchInterface');
+        $this->model->setSearchCriteriaBuilder($criteriaBuilder);
+        $this->model->setSearch($search);
+        $this->model->setFilterBuilder($filterBuilder);
+
     }
 
     /**