|
@@ -22,14 +22,14 @@ discard block |
|
|
block discarded – undo |
|
22
|
22
|
{ |
|
23
|
23
|
$context = \TestHelper::getContext(); |
|
24
|
24
|
$this->editor = $context->getEditor(); |
|
25
|
|
- $this->object = new \Aimeos\MShop\Customer\Manager\FosUser( $context ); |
|
|
25
|
+ $this->object = new \Aimeos\MShop\Customer\Manager\FosUser($context); |
|
26
|
26
|
|
|
27
|
27
|
$this->fixture = array( |
|
28
|
28
|
'label' => 'unitTest', |
|
29
|
29
|
'status' => 2, |
|
30
|
30
|
); |
|
31
|
31
|
|
|
32
|
|
- $this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' ); |
|
|
32
|
+ $this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.'); |
|
33
|
33
|
} |
|
34
|
34
|
|
|
35
|
35
|
|
|
@@ -38,28 +38,28 @@ discard block |
|
|
block discarded – undo |
|
38
|
38
|
*/ |
|
39
|
39
|
protected function tearDown() |
|
40
|
40
|
{ |
|
41
|
|
- unset( $this->object, $this->fixture, $this->address ); |
|
|
41
|
+ unset($this->object, $this->fixture, $this->address); |
|
42
|
42
|
} |
|
43
|
43
|
|
|
44
|
44
|
|
|
45
|
45
|
public function testCleanup() |
|
46
|
46
|
{ |
|
47
|
|
- $this->object->cleanup( array( -1 ) ); |
|
|
47
|
+ $this->object->cleanup(array( -1 )); |
|
48
|
48
|
} |
|
49
|
49
|
|
|
50
|
50
|
|
|
51
|
51
|
public function testGetSearchAttributes() |
|
52
|
52
|
{ |
|
53
|
|
- foreach( $this->object->getSearchAttributes() as $attribute ) |
|
|
53
|
+ foreach ($this->object->getSearchAttributes() as $attribute) |
|
54
|
54
|
{ |
|
55
|
|
- $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); |
|
|
55
|
+ $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute); |
|
56
|
56
|
} |
|
57
|
57
|
} |
|
58
|
58
|
|
|
59
|
59
|
|
|
60
|
60
|
public function testCreateItem() |
|
61
|
61
|
{ |
|
62
|
|
- $this->assertInstanceOf( '\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem() ); |
|
|
62
|
+ $this->assertInstanceOf('\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem()); |
|
63
|
63
|
} |
|
64
|
64
|
|
|
65
|
65
|
|
|
@@ -67,21 +67,21 @@ discard block |
|
|
block discarded – undo |
|
67
|
67
|
{ |
|
68
|
68
|
$search = $this->object->createSearch(); |
|
69
|
69
|
$conditions = array( |
|
70
|
|
- $search->compare( '==', 'customer.code', 'UTC003' ), |
|
71
|
|
- $search->compare( '==', 'customer.editor', $this->editor ) |
|
|
70
|
+ $search->compare('==', 'customer.code', 'UTC003'), |
|
|
71
|
+ $search->compare('==', 'customer.editor', $this->editor) |
|
72
|
72
|
); |
|
73
|
|
- $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
74
|
|
- $items = $this->object->searchItems( $search, array( 'text' ) ); |
|
|
73
|
+ $search->setConditions($search->combine('&&', $conditions)); |
|
|
74
|
+ $items = $this->object->searchItems($search, array('text')); |
|
75
|
75
|
|
|
76
|
|
- if( ( $expected = reset( $items ) ) === false ) { |
|
77
|
|
- throw new \Exception( 'No customer item with code "UTC003" found' ); |
|
|
76
|
+ if (($expected = reset($items)) === false) { |
|
|
77
|
+ throw new \Exception('No customer item with code "UTC003" found'); |
|
78
|
78
|
} |
|
79
|
79
|
|
|
80
|
|
- $actual = $this->object->getItem( $expected->getId(), array( 'text' ) ); |
|
|
80
|
+ $actual = $this->object->getItem($expected->getId(), array('text')); |
|
81
|
81
|
|
|
82
|
|
- $this->assertEquals( $expected, $actual ); |
|
83
|
|
- $this->assertEquals( 3, count( $actual->getListItems( 'text' ) ) ); |
|
84
|
|
- $this->assertEquals( 3, count( $actual->getRefItems( 'text' ) ) ); |
|
|
82
|
+ $this->assertEquals($expected, $actual); |
|
|
83
|
+ $this->assertEquals(3, count($actual->getListItems('text'))); |
|
|
84
|
+ $this->assertEquals(3, count($actual->getRefItems('text'))); |
|
85
|
85
|
} |
|
86
|
86
|
|
|
87
|
87
|
|
|
@@ -89,56 +89,56 @@ discard block |
|
|
block discarded – undo |
|
89
|
89
|
{ |
|
90
|
90
|
$item = $this->object->createItem(); |
|
91
|
91
|
|
|
92
|
|
- $item->setCode( 'unitTest' ); |
|
93
|
|
- $item->setLabel( 'unitTest' ); |
|
94
|
|
- $this->object->saveItem( $item ); |
|
95
|
|
- $itemSaved = $this->object->getItem( $item->getId() ); |
|
|
92
|
+ $item->setCode('unitTest'); |
|
|
93
|
+ $item->setLabel('unitTest'); |
|
|
94
|
+ $this->object->saveItem($item); |
|
|
95
|
+ $itemSaved = $this->object->getItem($item->getId()); |
|
96
|
96
|
|
|
97
|
97
|
$itemExp = clone $itemSaved; |
|
98
|
|
- $itemExp->setCode( 'unitTest2' ); |
|
99
|
|
- $itemExp->setLabel( 'unitTest2' ); |
|
100
|
|
- $this->object->saveItem( $itemExp ); |
|
101
|
|
- $itemUpd = $this->object->getItem( $itemExp->getId() ); |
|
102
|
|
- |
|
103
|
|
- $this->object->deleteItem( $item->getId() ); |
|
104
|
|
- |
|
105
|
|
- $this->assertTrue( $item->getId() !== null ); |
|
106
|
|
- $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
107
|
|
- $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); |
|
108
|
|
- $this->assertEquals( $item->getStatus(), $itemSaved->getStatus() ); |
|
109
|
|
- $this->assertEquals( $item->getCode(), $itemSaved->getCode() ); |
|
110
|
|
- $this->assertEquals( $item->getLabel(), $itemSaved->getLabel() ); |
|
111
|
|
- $this->assertEquals( $item->getPaymentAddress(), $itemSaved->getPaymentAddress() ); |
|
112
|
|
- $this->assertEquals( $item->getBirthday(), $itemSaved->getBirthday() ); |
|
113
|
|
- $this->assertEquals( $item->getPassword(), $itemSaved->getPassword() ); |
|
114
|
|
- $this->assertEquals( $item->getRoles(), $itemSaved->getRoles() ); |
|
115
|
|
- |
|
116
|
|
- $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
117
|
|
- $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
118
|
|
- $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
119
|
|
- |
|
120
|
|
- $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
121
|
|
- $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
|
122
|
|
- $this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() ); |
|
123
|
|
- $this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() ); |
|
124
|
|
- $this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() ); |
|
125
|
|
- $this->assertEquals( $itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress() ); |
|
126
|
|
- $this->assertEquals( $itemExp->getBirthday(), $itemUpd->getBirthday() ); |
|
127
|
|
- $this->assertEquals( $itemExp->getPassword(), $itemUpd->getPassword() ); |
|
128
|
|
- $this->assertEquals( $itemExp->getRoles(), $itemUpd->getRoles() ); |
|
129
|
|
- |
|
130
|
|
- $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
|
131
|
|
- $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
132
|
|
- $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
133
|
|
- |
|
134
|
|
- $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
135
|
|
- $this->object->getItem( $item->getId() ); |
|
|
98
|
+ $itemExp->setCode('unitTest2'); |
|
|
99
|
+ $itemExp->setLabel('unitTest2'); |
|
|
100
|
+ $this->object->saveItem($itemExp); |
|
|
101
|
+ $itemUpd = $this->object->getItem($itemExp->getId()); |
|
|
102
|
+ |
|
|
103
|
+ $this->object->deleteItem($item->getId()); |
|
|
104
|
+ |
|
|
105
|
+ $this->assertTrue($item->getId() !== null); |
|
|
106
|
+ $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
|
107
|
+ $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); |
|
|
108
|
+ $this->assertEquals($item->getStatus(), $itemSaved->getStatus()); |
|
|
109
|
+ $this->assertEquals($item->getCode(), $itemSaved->getCode()); |
|
|
110
|
+ $this->assertEquals($item->getLabel(), $itemSaved->getLabel()); |
|
|
111
|
+ $this->assertEquals($item->getPaymentAddress(), $itemSaved->getPaymentAddress()); |
|
|
112
|
+ $this->assertEquals($item->getBirthday(), $itemSaved->getBirthday()); |
|
|
113
|
+ $this->assertEquals($item->getPassword(), $itemSaved->getPassword()); |
|
|
114
|
+ $this->assertEquals($item->getRoles(), $itemSaved->getRoles()); |
|
|
115
|
+ |
|
|
116
|
+ $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
|
117
|
+ $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
|
118
|
+ $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
|
119
|
+ |
|
|
120
|
+ $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
|
121
|
+ $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); |
|
|
122
|
+ $this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus()); |
|
|
123
|
+ $this->assertEquals($itemExp->getCode(), $itemUpd->getCode()); |
|
|
124
|
+ $this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel()); |
|
|
125
|
+ $this->assertEquals($itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress()); |
|
|
126
|
+ $this->assertEquals($itemExp->getBirthday(), $itemUpd->getBirthday()); |
|
|
127
|
+ $this->assertEquals($itemExp->getPassword(), $itemUpd->getPassword()); |
|
|
128
|
+ $this->assertEquals($itemExp->getRoles(), $itemUpd->getRoles()); |
|
|
129
|
+ |
|
|
130
|
+ $this->assertEquals($this->editor, $itemUpd->getEditor()); |
|
|
131
|
+ $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
|
132
|
+ $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
|
133
|
+ |
|
|
134
|
+ $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
|
135
|
+ $this->object->getItem($item->getId()); |
|
136
|
136
|
} |
|
137
|
137
|
|
|
138
|
138
|
|
|
139
|
139
|
public function testCreateSearch() |
|
140
|
140
|
{ |
|
141
|
|
- $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() ); |
|
|
141
|
+ $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch()); |
|
142
|
142
|
} |
|
143
|
143
|
|
|
144
|
144
|
|
|
@@ -148,65 +148,65 @@ discard block |
|
|
block discarded – undo |
|
148
|
148
|
$search = $this->object->createSearch(); |
|
149
|
149
|
|
|
150
|
150
|
$expr = array(); |
|
151
|
|
- $expr[] = $search->compare( '!=', 'customer.id', null ); |
|
152
|
|
- $expr[] = $search->compare( '==', 'customer.label', 'UTC002' ); |
|
153
|
|
- $expr[] = $search->compare( '==', 'customer.code', 'UTC002' ); |
|
154
|
|
- |
|
155
|
|
- $expr[] = $search->compare( '>=', 'customer.salutation', '' ); |
|
156
|
|
- $expr[] = $search->compare( '>=', 'customer.company', '' ); |
|
157
|
|
- $expr[] = $search->compare( '>=', 'customer.vatid', '' ); |
|
158
|
|
- $expr[] = $search->compare( '>=', 'customer.title', '' ); |
|
159
|
|
- $expr[] = $search->compare( '>=', 'customer.firstname', '' ); |
|
160
|
|
- $expr[] = $search->compare( '>=', 'customer.lastname', '' ); |
|
161
|
|
- $expr[] = $search->compare( '>=', 'customer.address1', '' ); |
|
162
|
|
- $expr[] = $search->compare( '>=', 'customer.address2', '' ); |
|
163
|
|
- $expr[] = $search->compare( '>=', 'customer.address3', '' ); |
|
164
|
|
- $expr[] = $search->compare( '>=', 'customer.postal', '' ); |
|
165
|
|
- $expr[] = $search->compare( '>=', 'customer.city', '' ); |
|
166
|
|
- $expr[] = $search->compare( '>=', 'customer.state', '' ); |
|
167
|
|
- $expr[] = $search->compare( '!=', 'customer.languageid', null ); |
|
168
|
|
- $expr[] = $search->compare( '>=', 'customer.countryid', '' ); |
|
169
|
|
- $expr[] = $search->compare( '>=', 'customer.telephone', '' ); |
|
170
|
|
- $expr[] = $search->compare( '>=', 'customer.email', '' ); |
|
171
|
|
- $expr[] = $search->compare( '>=', 'customer.telefax', '' ); |
|
172
|
|
- $expr[] = $search->compare( '>=', 'customer.website', '' ); |
|
173
|
|
- |
|
174
|
|
- $expr[] = $search->compare( '==', 'customer.birthday', '1970-01-01' ); |
|
175
|
|
- $expr[] = $search->compare( '>=', 'customer.password', '' ); |
|
176
|
|
- $expr[] = $search->compare( '==', 'customer.status', 0 ); |
|
177
|
|
- $expr[] = $search->compare( '!=', 'customer.mtime', '1970-01-01 00:00:00' ); |
|
178
|
|
- $expr[] = $search->compare( '!=', 'customer.ctime', '1970-01-01 00:00:00' ); |
|
179
|
|
- $expr[] = $search->compare( '==', 'customer.editor', $this->editor ); |
|
180
|
|
- |
|
181
|
|
- $expr[] = $search->compare( '!=', 'customer.address.id', null ); |
|
182
|
|
- $expr[] = $search->compare( '!=', 'customer.address.parentid', null ); |
|
183
|
|
- $expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' ); |
|
184
|
|
- $expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' ); |
|
185
|
|
- $expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' ); |
|
186
|
|
- $expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' ); |
|
187
|
|
- $expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' ); |
|
188
|
|
- $expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' ); |
|
189
|
|
- $expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' ); |
|
190
|
|
- $expr[] = $search->compare( '==', 'customer.address.address2', '2-4' ); |
|
191
|
|
- $expr[] = $search->compare( '==', 'customer.address.address3', '' ); |
|
192
|
|
- $expr[] = $search->compare( '==', 'customer.address.postal', '11099' ); |
|
193
|
|
- $expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' ); |
|
194
|
|
- $expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' ); |
|
195
|
|
- $expr[] = $search->compare( '==', 'customer.address.languageid', 'de' ); |
|
196
|
|
- $expr[] = $search->compare( '==', 'customer.address.countryid', 'DE' ); |
|
197
|
|
- $expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' ); |
|
198
|
|
- $expr[] = $search->compare( '==', 'customer.address.email', '[email protected]' ); |
|
199
|
|
- $expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' ); |
|
200
|
|
- $expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' ); |
|
201
|
|
- $expr[] = $search->compare( '==', 'customer.address.flag', 0 ); |
|
202
|
|
- $expr[] = $search->compare( '==', 'customer.address.position', 1 ); |
|
203
|
|
- $expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' ); |
|
204
|
|
- $expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' ); |
|
205
|
|
- $expr[] = $search->compare( '==', 'customer.address.editor', $this->editor ); |
|
206
|
|
- |
|
207
|
|
- $search->setConditions( $search->combine( '&&', $expr ) ); |
|
208
|
|
- $result = $this->object->searchItems( $search, array(), $total ); |
|
209
|
|
- $this->assertEquals( 1, count( $result ) ); |
|
|
151
|
+ $expr[] = $search->compare('!=', 'customer.id', null); |
|
|
152
|
+ $expr[] = $search->compare('==', 'customer.label', 'UTC002'); |
|
|
153
|
+ $expr[] = $search->compare('==', 'customer.code', 'UTC002'); |
|
|
154
|
+ |
|
|
155
|
+ $expr[] = $search->compare('>=', 'customer.salutation', ''); |
|
|
156
|
+ $expr[] = $search->compare('>=', 'customer.company', ''); |
|
|
157
|
+ $expr[] = $search->compare('>=', 'customer.vatid', ''); |
|
|
158
|
+ $expr[] = $search->compare('>=', 'customer.title', ''); |
|
|
159
|
+ $expr[] = $search->compare('>=', 'customer.firstname', ''); |
|
|
160
|
+ $expr[] = $search->compare('>=', 'customer.lastname', ''); |
|
|
161
|
+ $expr[] = $search->compare('>=', 'customer.address1', ''); |
|
|
162
|
+ $expr[] = $search->compare('>=', 'customer.address2', ''); |
|
|
163
|
+ $expr[] = $search->compare('>=', 'customer.address3', ''); |
|
|
164
|
+ $expr[] = $search->compare('>=', 'customer.postal', ''); |
|
|
165
|
+ $expr[] = $search->compare('>=', 'customer.city', ''); |
|
|
166
|
+ $expr[] = $search->compare('>=', 'customer.state', ''); |
|
|
167
|
+ $expr[] = $search->compare('!=', 'customer.languageid', null); |
|
|
168
|
+ $expr[] = $search->compare('>=', 'customer.countryid', ''); |
|
|
169
|
+ $expr[] = $search->compare('>=', 'customer.telephone', ''); |
|
|
170
|
+ $expr[] = $search->compare('>=', 'customer.email', ''); |
|
|
171
|
+ $expr[] = $search->compare('>=', 'customer.telefax', ''); |
|
|
172
|
+ $expr[] = $search->compare('>=', 'customer.website', ''); |
|
|
173
|
+ |
|
|
174
|
+ $expr[] = $search->compare('==', 'customer.birthday', '1970-01-01'); |
|
|
175
|
+ $expr[] = $search->compare('>=', 'customer.password', ''); |
|
|
176
|
+ $expr[] = $search->compare('==', 'customer.status', 0); |
|
|
177
|
+ $expr[] = $search->compare('!=', 'customer.mtime', '1970-01-01 00:00:00'); |
|
|
178
|
+ $expr[] = $search->compare('!=', 'customer.ctime', '1970-01-01 00:00:00'); |
|
|
179
|
+ $expr[] = $search->compare('==', 'customer.editor', $this->editor); |
|
|
180
|
+ |
|
|
181
|
+ $expr[] = $search->compare('!=', 'customer.address.id', null); |
|
|
182
|
+ $expr[] = $search->compare('!=', 'customer.address.parentid', null); |
|
|
183
|
+ $expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH'); |
|
|
184
|
+ $expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999'); |
|
|
185
|
+ $expr[] = $search->compare('==', 'customer.address.salutation', 'mr'); |
|
|
186
|
+ $expr[] = $search->compare('==', 'customer.address.title', 'Dr.'); |
|
|
187
|
+ $expr[] = $search->compare('==', 'customer.address.firstname', 'Good'); |
|
|
188
|
+ $expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest'); |
|
|
189
|
+ $expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben'); |
|
|
190
|
+ $expr[] = $search->compare('==', 'customer.address.address2', '2-4'); |
|
|
191
|
+ $expr[] = $search->compare('==', 'customer.address.address3', ''); |
|
|
192
|
+ $expr[] = $search->compare('==', 'customer.address.postal', '11099'); |
|
|
193
|
+ $expr[] = $search->compare('==', 'customer.address.city', 'Berlin'); |
|
|
194
|
+ $expr[] = $search->compare('==', 'customer.address.state', 'Berlin'); |
|
|
195
|
+ $expr[] = $search->compare('==', 'customer.address.languageid', 'de'); |
|
|
196
|
+ $expr[] = $search->compare('==', 'customer.address.countryid', 'DE'); |
|
|
197
|
+ $expr[] = $search->compare('==', 'customer.address.telephone', '055544332221'); |
|
|
198
|
+ $expr[] = $search->compare('==', 'customer.address.email', '[email protected]'); |
|
|
199
|
+ $expr[] = $search->compare('==', 'customer.address.telefax', '055544333212'); |
|
|
200
|
+ $expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org'); |
|
|
201
|
+ $expr[] = $search->compare('==', 'customer.address.flag', 0); |
|
|
202
|
+ $expr[] = $search->compare('==', 'customer.address.position', 1); |
|
|
203
|
+ $expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00'); |
|
|
204
|
+ $expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00'); |
|
|
205
|
+ $expr[] = $search->compare('==', 'customer.address.editor', $this->editor); |
|
|
206
|
+ |
|
|
207
|
+ $search->setConditions($search->combine('&&', $expr)); |
|
|
208
|
+ $result = $this->object->searchItems($search, array(), $total); |
|
|
209
|
+ $this->assertEquals(1, count($result)); |
|
210
|
210
|
} |
|
211
|
211
|
|
|
212
|
212
|
|
|
@@ -215,44 +215,44 @@ discard block |
|
|
block discarded – undo |
|
215
|
215
|
$total = 0; |
|
216
|
216
|
|
|
217
|
217
|
$search = $this->object->createSearch(); |
|
218
|
|
- $search->setConditions( $search->compare( '==', 'customer.address.editor', $this->editor ) ); |
|
219
|
|
- $search->setSlice( 0, 2 ); |
|
|
218
|
+ $search->setConditions($search->compare('==', 'customer.address.editor', $this->editor)); |
|
|
219
|
+ $search->setSlice(0, 2); |
|
220
|
220
|
|
|
221
|
|
- $results = $this->object->searchItems( $search, array(), $total ); |
|
222
|
|
- $this->assertEquals( 2, count( $results ) ); |
|
223
|
|
- $this->assertEquals( 3, $total ); |
|
|
221
|
+ $results = $this->object->searchItems($search, array(), $total); |
|
|
222
|
+ $this->assertEquals(2, count($results)); |
|
|
223
|
+ $this->assertEquals(3, $total); |
|
224
|
224
|
|
|
225
|
|
- foreach($results as $itemId => $item) { |
|
226
|
|
- $this->assertEquals( $itemId, $item->getId() ); |
|
|
225
|
+ foreach ($results as $itemId => $item) { |
|
|
226
|
+ $this->assertEquals($itemId, $item->getId()); |
|
227
|
227
|
} |
|
228
|
228
|
} |
|
229
|
229
|
|
|
230
|
230
|
|
|
231
|
231
|
public function testSearchItemsBaseCriteria() |
|
232
|
232
|
{ |
|
233
|
|
- $search = $this->object->createSearch( true ); |
|
|
233
|
+ $search = $this->object->createSearch(true); |
|
234
|
234
|
$conditions = array( |
|
235
|
|
- $search->compare( '==', 'customer.address.editor', $this->editor ), |
|
|
235
|
+ $search->compare('==', 'customer.address.editor', $this->editor), |
|
236
|
236
|
$search->getConditions() |
|
237
|
237
|
); |
|
238
|
|
- $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
239
|
|
- $this->assertEquals( 2, count( $this->object->searchItems( $search, array(), $total ) ) ); |
|
|
238
|
+ $search->setConditions($search->combine('&&', $conditions)); |
|
|
239
|
+ $this->assertEquals(2, count($this->object->searchItems($search, array(), $total))); |
|
240
|
240
|
} |
|
241
|
241
|
|
|
242
|
242
|
|
|
243
|
243
|
public function testGetSubManager() |
|
244
|
244
|
{ |
|
245
|
|
- $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address' ) ); |
|
246
|
|
- $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address', 'Standard' ) ); |
|
|
245
|
+ $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address')); |
|
|
246
|
+ $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address', 'Standard')); |
|
247
|
247
|
|
|
248
|
|
- $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
249
|
|
- $this->object->getSubManager( 'unknown' ); |
|
|
248
|
+ $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
|
249
|
+ $this->object->getSubManager('unknown'); |
|
250
|
250
|
} |
|
251
|
251
|
|
|
252
|
252
|
|
|
253
|
253
|
public function testGetSubManagerInvalidName() |
|
254
|
254
|
{ |
|
255
|
|
- $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
256
|
|
- $this->object->getSubManager( 'address', 'unknown' ); |
|
|
255
|
+ $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
|
256
|
+ $this->object->getSubManager('address', 'unknown'); |
|
257
|
257
|
} |
|
258
|
258
|
} |