@@ -16,22 +16,22 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | protected function setUp() |
| 18 | 18 | { |
| 19 | - $this->object = new \Aimeos\Controller\Frontend\Product\Standard( \TestHelperFrontend::getContext() ); |
|
| 19 | + $this->object = new \Aimeos\Controller\Frontend\Product\Standard(\TestHelperFrontend::getContext()); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | |
| 23 | 23 | protected function tearDown() |
| 24 | 24 | { |
| 25 | - unset( $this->object ); |
|
| 25 | + unset($this->object); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | |
| 29 | 29 | public function testAggregate() |
| 30 | 30 | { |
| 31 | 31 | $filter = $this->object->createFilter(); |
| 32 | - $list = $this->object->aggregate( $filter, 'index.attribute.id' ); |
|
| 32 | + $list = $this->object->aggregate($filter, 'index.attribute.id'); |
|
| 33 | 33 | |
| 34 | - $this->assertGreaterThan( 0, count( $list ) ); |
|
| 34 | + $this->assertGreaterThan(0, count($list)); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | |
@@ -39,103 +39,103 @@ discard block |
||
| 39 | 39 | { |
| 40 | 40 | $filter = $this->object->createFilter(); |
| 41 | 41 | |
| 42 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter ); |
|
| 43 | - $this->assertEquals( array(), $filter->getSortations() ); |
|
| 44 | - $this->assertEquals( 0, $filter->getSliceStart() ); |
|
| 45 | - $this->assertEquals( 100, $filter->getSliceSize() ); |
|
| 42 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter); |
|
| 43 | + $this->assertEquals(array(), $filter->getSortations()); |
|
| 44 | + $this->assertEquals(0, $filter->getSliceStart()); |
|
| 45 | + $this->assertEquals(100, $filter->getSliceSize()); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | public function testAddFilterAttribute() |
| 50 | 50 | { |
| 51 | 51 | $filter = $this->object->createFilter(); |
| 52 | - $filter = $this->object->addFilterAttribute( $filter, array( 0, 1 ), array(), array() ); |
|
| 52 | + $filter = $this->object->addFilterAttribute($filter, array(0, 1), array(), array()); |
|
| 53 | 53 | |
| 54 | 54 | $list = $filter->getConditions()->getExpressions(); |
| 55 | 55 | |
| 56 | - if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) { |
|
| 57 | - throw new \RuntimeException( 'Wrong expression' ); |
|
| 56 | + if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) { |
|
| 57 | + throw new \RuntimeException('Wrong expression'); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | - $this->assertEquals( 'index.attributeaggregate([0,1])', $list[0]->getName() ); |
|
| 61 | - $this->assertEquals( 2, $list[0]->getValue() ); |
|
| 60 | + $this->assertEquals('index.attributeaggregate([0,1])', $list[0]->getName()); |
|
| 61 | + $this->assertEquals(2, $list[0]->getValue()); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | |
| 65 | 65 | public function testAddFilterAttributeOptions() |
| 66 | 66 | { |
| 67 | 67 | $filter = $this->object->createFilter(); |
| 68 | - $filter = $this->object->addFilterAttribute( $filter, array(), array( 1 ), array() ); |
|
| 68 | + $filter = $this->object->addFilterAttribute($filter, array(), array(1), array()); |
|
| 69 | 69 | |
| 70 | 70 | $list = $filter->getConditions()->getExpressions(); |
| 71 | 71 | |
| 72 | - if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) { |
|
| 73 | - throw new \RuntimeException( 'Wrong expression' ); |
|
| 72 | + if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) { |
|
| 73 | + throw new \RuntimeException('Wrong expression'); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - $this->assertEquals( 'index.attributeaggregate([1])', $list[0]->getName() ); |
|
| 77 | - $this->assertEquals( 0, $list[0]->getValue() ); |
|
| 76 | + $this->assertEquals('index.attributeaggregate([1])', $list[0]->getName()); |
|
| 77 | + $this->assertEquals(0, $list[0]->getValue()); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | |
| 81 | 81 | public function testAddFilterAttributeOne() |
| 82 | 82 | { |
| 83 | 83 | $filter = $this->object->createFilter(); |
| 84 | - $filter = $this->object->addFilterAttribute( $filter, array(), array(), array( 'test' => array( 2 ) ) ); |
|
| 84 | + $filter = $this->object->addFilterAttribute($filter, array(), array(), array('test' => array(2))); |
|
| 85 | 85 | |
| 86 | 86 | $list = $filter->getConditions()->getExpressions(); |
| 87 | 87 | |
| 88 | - if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) { |
|
| 89 | - throw new \RuntimeException( 'Wrong expression' ); |
|
| 88 | + if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) { |
|
| 89 | + throw new \RuntimeException('Wrong expression'); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - $this->assertEquals( 'index.attributeaggregate([2])', $list[0]->getName() ); |
|
| 93 | - $this->assertEquals( 0, $list[0]->getValue() ); |
|
| 92 | + $this->assertEquals('index.attributeaggregate([2])', $list[0]->getName()); |
|
| 93 | + $this->assertEquals(0, $list[0]->getValue()); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | |
| 97 | 97 | public function testAddFilterCategory() |
| 98 | 98 | { |
| 99 | 99 | $context = \TestHelperFrontend::getContext(); |
| 100 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'catalog' ); |
|
| 100 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'catalog'); |
|
| 101 | 101 | |
| 102 | - $catId = $manager->findItem( 'root' )->getId(); |
|
| 102 | + $catId = $manager->findItem('root')->getId(); |
|
| 103 | 103 | $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST; |
| 104 | 104 | |
| 105 | 105 | $filter = $this->object->createFilter(); |
| 106 | - $filter = $this->object->addFilterCategory( $filter, $catId, $level ); |
|
| 106 | + $filter = $this->object->addFilterCategory($filter, $catId, $level); |
|
| 107 | 107 | |
| 108 | 108 | $list = $filter->getConditions()->getExpressions(); |
| 109 | 109 | |
| 110 | - if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) { |
|
| 111 | - throw new \RuntimeException( 'Wrong expression' ); |
|
| 110 | + if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) { |
|
| 111 | + throw new \RuntimeException('Wrong expression'); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - $this->assertEquals( 'index.catalog.id', $list[0]->getName() ); |
|
| 115 | - $this->assertEquals( 3, count( $list[0]->getValue() ) ); |
|
| 116 | - $this->assertEquals( array(), $filter->getSortations() ); |
|
| 114 | + $this->assertEquals('index.catalog.id', $list[0]->getName()); |
|
| 115 | + $this->assertEquals(3, count($list[0]->getValue())); |
|
| 116 | + $this->assertEquals(array(), $filter->getSortations()); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | |
| 120 | 120 | public function testAddFilterText() |
| 121 | 121 | { |
| 122 | 122 | $filter = $this->object->createFilter(); |
| 123 | - $filter = $this->object->addFilterText( $filter, 'Espresso' ); |
|
| 123 | + $filter = $this->object->addFilterText($filter, 'Espresso'); |
|
| 124 | 124 | |
| 125 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter ); |
|
| 125 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter); |
|
| 126 | 126 | |
| 127 | 127 | $list = $filter->getConditions()->getExpressions(); |
| 128 | 128 | |
| 129 | 129 | |
| 130 | - if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) { |
|
| 131 | - throw new \RuntimeException( 'Wrong expression' ); |
|
| 130 | + if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) { |
|
| 131 | + throw new \RuntimeException('Wrong expression'); |
|
| 132 | 132 | } |
| 133 | - $this->assertEquals( 'index.text.relevance("default","de","Espresso")', $list[0]->getName() ); |
|
| 134 | - $this->assertEquals( 0, $list[0]->getValue() ); |
|
| 133 | + $this->assertEquals('index.text.relevance("default","de","Espresso")', $list[0]->getName()); |
|
| 134 | + $this->assertEquals(0, $list[0]->getValue()); |
|
| 135 | 135 | |
| 136 | - $this->assertEquals( array(), $filter->getSortations() ); |
|
| 137 | - $this->assertEquals( 0, $filter->getSliceStart() ); |
|
| 138 | - $this->assertEquals( 100, $filter->getSliceSize() ); |
|
| 136 | + $this->assertEquals(array(), $filter->getSortations()); |
|
| 137 | + $this->assertEquals(0, $filter->getSliceStart()); |
|
| 138 | + $this->assertEquals(100, $filter->getSliceSize()); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | |
@@ -144,160 +144,160 @@ discard block |
||
| 144 | 144 | $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE; |
| 145 | 145 | |
| 146 | 146 | $filter = $this->object->createFilter(); |
| 147 | - $filter = $this->object->addFilterCategory( $filter, 0, $level, 'relevance', '-', 'test' ); |
|
| 147 | + $filter = $this->object->addFilterCategory($filter, 0, $level, 'relevance', '-', 'test'); |
|
| 148 | 148 | |
| 149 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter ); |
|
| 149 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter); |
|
| 150 | 150 | |
| 151 | 151 | $sort = $filter->getSortations(); |
| 152 | - if( ( $item = reset( $sort ) ) === false ) { |
|
| 153 | - throw new \RuntimeException( 'Sortation not set' ); |
|
| 152 | + if (($item = reset($sort)) === false) { |
|
| 153 | + throw new \RuntimeException('Sortation not set'); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | - $this->assertEquals( 'sort:index.catalog.position("test",["0"])', $item->getName() ); |
|
| 157 | - $this->assertEquals( '-', $item->getOperator() ); |
|
| 156 | + $this->assertEquals('sort:index.catalog.position("test",["0"])', $item->getName()); |
|
| 157 | + $this->assertEquals('-', $item->getOperator()); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | |
| 161 | 161 | public function testCreateFilterSortRelevanceText() |
| 162 | 162 | { |
| 163 | - $filter = $this->object->createFilter( 'relevance', '-', 1, 2, 'test' ); |
|
| 164 | - $filter = $this->object->addFilterText( $filter, 'Espresso' ); |
|
| 163 | + $filter = $this->object->createFilter('relevance', '-', 1, 2, 'test'); |
|
| 164 | + $filter = $this->object->addFilterText($filter, 'Espresso'); |
|
| 165 | 165 | |
| 166 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter ); |
|
| 167 | - $this->assertEquals( array(), $filter->getSortations() ); |
|
| 168 | - $this->assertEquals( 1, $filter->getSliceStart() ); |
|
| 169 | - $this->assertEquals( 2, $filter->getSliceSize() ); |
|
| 166 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter); |
|
| 167 | + $this->assertEquals(array(), $filter->getSortations()); |
|
| 168 | + $this->assertEquals(1, $filter->getSliceStart()); |
|
| 169 | + $this->assertEquals(2, $filter->getSliceSize()); |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | |
| 173 | 173 | public function testCreateFilterSortCode() |
| 174 | 174 | { |
| 175 | - $filter = $this->object->createFilter( 'code' ); |
|
| 175 | + $filter = $this->object->createFilter('code'); |
|
| 176 | 176 | |
| 177 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter ); |
|
| 177 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter); |
|
| 178 | 178 | |
| 179 | 179 | $sort = $filter->getSortations(); |
| 180 | - if( ( $item = reset( $sort ) ) === false ) { |
|
| 181 | - throw new \RuntimeException( 'Sortation not set' ); |
|
| 180 | + if (($item = reset($sort)) === false) { |
|
| 181 | + throw new \RuntimeException('Sortation not set'); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | - $this->assertEquals( 'product.code', $item->getName() ); |
|
| 184 | + $this->assertEquals('product.code', $item->getName()); |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | |
| 188 | 188 | public function testCreateFilterSortName() |
| 189 | 189 | { |
| 190 | - $filter = $this->object->createFilter( 'name' ); |
|
| 190 | + $filter = $this->object->createFilter('name'); |
|
| 191 | 191 | |
| 192 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter ); |
|
| 192 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter); |
|
| 193 | 193 | |
| 194 | 194 | $sort = $filter->getSortations(); |
| 195 | - if( ( $item = reset( $sort ) ) === false ) { |
|
| 196 | - throw new \RuntimeException( 'Sortation not set' ); |
|
| 195 | + if (($item = reset($sort)) === false) { |
|
| 196 | + throw new \RuntimeException('Sortation not set'); |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | - $this->assertEquals( 'sort:index.text.value("default","de","name")', $item->getName() ); |
|
| 199 | + $this->assertEquals('sort:index.text.value("default","de","name")', $item->getName()); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | |
| 203 | 203 | public function testCreateFilterSortPrice() |
| 204 | 204 | { |
| 205 | - $filter = $this->object->createFilter( 'price' ); |
|
| 205 | + $filter = $this->object->createFilter('price'); |
|
| 206 | 206 | |
| 207 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter ); |
|
| 207 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter); |
|
| 208 | 208 | |
| 209 | 209 | $sort = $filter->getSortations(); |
| 210 | - if( ( $item = reset( $sort ) ) === false ) { |
|
| 211 | - throw new \RuntimeException( 'Sortation not set' ); |
|
| 210 | + if (($item = reset($sort)) === false) { |
|
| 211 | + throw new \RuntimeException('Sortation not set'); |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | - $this->assertStringStartsWith( 'sort:index.price.value("default","EUR","default")', $item->getName() ); |
|
| 214 | + $this->assertStringStartsWith('sort:index.price.value("default","EUR","default")', $item->getName()); |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | |
| 218 | 218 | public function testCreateFilterSortInvalid() |
| 219 | 219 | { |
| 220 | - $filter = $this->object->createFilter( '', 'failure' ); |
|
| 220 | + $filter = $this->object->createFilter('', 'failure'); |
|
| 221 | 221 | |
| 222 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter ); |
|
| 223 | - $this->assertEquals( array(), $filter->getSortations() ); |
|
| 222 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter); |
|
| 223 | + $this->assertEquals(array(), $filter->getSortations()); |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | |
| 227 | 227 | public function testGetItem() |
| 228 | 228 | { |
| 229 | 229 | $context = \TestHelperFrontend::getContext(); |
| 230 | - $id = \Aimeos\MShop\Factory::createManager( $context, 'product' )->findItem( 'CNC' )->getId(); |
|
| 230 | + $id = \Aimeos\MShop\Factory::createManager($context, 'product')->findItem('CNC')->getId(); |
|
| 231 | 231 | |
| 232 | - $result = $this->object->getItem( $id ); |
|
| 232 | + $result = $this->object->getItem($id); |
|
| 233 | 233 | |
| 234 | - $this->assertInstanceOf( '\Aimeos\MShop\Product\Item\Iface', $result ); |
|
| 235 | - $this->assertGreaterThan( 0, $result->getPropertyItems() ); |
|
| 236 | - $this->assertGreaterThan( 0, $result->getRefItems( 'attribute' ) ); |
|
| 237 | - $this->assertGreaterThan( 0, $result->getRefItems( 'media' ) ); |
|
| 238 | - $this->assertGreaterThan( 0, $result->getRefItems( 'price' ) ); |
|
| 239 | - $this->assertGreaterThan( 0, $result->getRefItems( 'product' ) ); |
|
| 240 | - $this->assertGreaterThan( 0, $result->getRefItems( 'text' ) ); |
|
| 234 | + $this->assertInstanceOf('\Aimeos\MShop\Product\Item\Iface', $result); |
|
| 235 | + $this->assertGreaterThan(0, $result->getPropertyItems()); |
|
| 236 | + $this->assertGreaterThan(0, $result->getRefItems('attribute')); |
|
| 237 | + $this->assertGreaterThan(0, $result->getRefItems('media')); |
|
| 238 | + $this->assertGreaterThan(0, $result->getRefItems('price')); |
|
| 239 | + $this->assertGreaterThan(0, $result->getRefItems('product')); |
|
| 240 | + $this->assertGreaterThan(0, $result->getRefItems('text')); |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | |
| 244 | 244 | public function testGetItems() |
| 245 | 245 | { |
| 246 | 246 | $context = \TestHelperFrontend::getContext(); |
| 247 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'product' ); |
|
| 247 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'product'); |
|
| 248 | 248 | |
| 249 | 249 | $search = $manager->createSearch(); |
| 250 | - $search->setConditions( $search->compare( '==', 'product.code', array( 'CNC', 'CNE' ) ) ); |
|
| 250 | + $search->setConditions($search->compare('==', 'product.code', array('CNC', 'CNE'))); |
|
| 251 | 251 | |
| 252 | 252 | $ids = array(); |
| 253 | - foreach( $manager->searchItems( $search ) as $productItem ) { |
|
| 253 | + foreach ($manager->searchItems($search) as $productItem) { |
|
| 254 | 254 | $ids[] = $productItem->getId(); |
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | |
| 258 | - $result = $this->object->getItems( $ids ); |
|
| 258 | + $result = $this->object->getItems($ids); |
|
| 259 | 259 | |
| 260 | - $this->assertEquals( 2, count( $result ) ); |
|
| 260 | + $this->assertEquals(2, count($result)); |
|
| 261 | 261 | |
| 262 | - foreach( $result as $productItem ) { |
|
| 263 | - $this->assertInstanceOf( '\Aimeos\MShop\Product\Item\Iface', $productItem ); |
|
| 262 | + foreach ($result as $productItem) { |
|
| 263 | + $this->assertInstanceOf('\Aimeos\MShop\Product\Item\Iface', $productItem); |
|
| 264 | 264 | } |
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | |
| 268 | 268 | public function testSearchItemsCategory() |
| 269 | 269 | { |
| 270 | - $catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( \TestHelperFrontend::getContext() ); |
|
| 270 | + $catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager(\TestHelperFrontend::getContext()); |
|
| 271 | 271 | $search = $catalogManager->createSearch(); |
| 272 | 272 | |
| 273 | - $search->setConditions( $search->compare( '==', 'catalog.code', 'new' ) ); |
|
| 274 | - $search->setSlice( 0, 1 ); |
|
| 275 | - $items = $catalogManager->searchItems( $search ); |
|
| 273 | + $search->setConditions($search->compare('==', 'catalog.code', 'new')); |
|
| 274 | + $search->setSlice(0, 1); |
|
| 275 | + $items = $catalogManager->searchItems($search); |
|
| 276 | 276 | |
| 277 | - if( ( $item = reset( $items ) ) === false ) { |
|
| 278 | - throw new \RuntimeException( 'Product item not found' ); |
|
| 277 | + if (($item = reset($items)) === false) { |
|
| 278 | + throw new \RuntimeException('Product item not found'); |
|
| 279 | 279 | } |
| 280 | 280 | |
| 281 | - $filter = $this->object->createFilter( 'position', '+', 1, 1 ); |
|
| 282 | - $filter = $this->object->addFilterCategory( $filter, $item->getId() ); |
|
| 281 | + $filter = $this->object->createFilter('position', '+', 1, 1); |
|
| 282 | + $filter = $this->object->addFilterCategory($filter, $item->getId()); |
|
| 283 | 283 | |
| 284 | 284 | $total = 0; |
| 285 | - $results = $this->object->searchItems( $filter, array(), $total ); |
|
| 285 | + $results = $this->object->searchItems($filter, array(), $total); |
|
| 286 | 286 | |
| 287 | - $this->assertEquals( 3, $total ); |
|
| 288 | - $this->assertEquals( 1, count( $results ) ); |
|
| 287 | + $this->assertEquals(3, $total); |
|
| 288 | + $this->assertEquals(1, count($results)); |
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | |
| 292 | 292 | public function testSearchItemsText() |
| 293 | 293 | { |
| 294 | - $filter = $this->object->createFilter( 'relevance', '+', 0, 1, 'unittype13' ); |
|
| 295 | - $filter = $this->object->addFilterText( $filter, 'Expresso', 'relevance', '+', 'unittype13' ); |
|
| 294 | + $filter = $this->object->createFilter('relevance', '+', 0, 1, 'unittype13'); |
|
| 295 | + $filter = $this->object->addFilterText($filter, 'Expresso', 'relevance', '+', 'unittype13'); |
|
| 296 | 296 | |
| 297 | 297 | $total = 0; |
| 298 | - $results = $this->object->searchItems( $filter, array(), $total ); |
|
| 298 | + $results = $this->object->searchItems($filter, array(), $total); |
|
| 299 | 299 | |
| 300 | - $this->assertEquals( 2, $total ); |
|
| 301 | - $this->assertEquals( 1, count( $results ) ); |
|
| 300 | + $this->assertEquals(2, $total); |
|
| 301 | + $this->assertEquals(1, count($results)); |
|
| 302 | 302 | } |
| 303 | 303 | } |