Skip to content

Commit fe67cff

Browse files
francisbessetfrancisbesset
committed
Merge branch 'fixed_tests'
2 parents 8d13d2d + e676eb0 commit fe67cff

File tree

15 files changed

+156
-116
lines changed

15 files changed

+156
-116
lines changed

‎.travis.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@ env:
1010
- SYMFONY_VERSION=2.1.*
1111
- SYMFONY_VERSION=2.2.*
1212
- SYMFONY_VERSION=2.3.*
13-
- SYMFONY_VERSION=dev-master
13+
- SYMFONY_VERSION=2.4.*
14+
- SYMFONY_VERSION=2.5.*
15+
- SYMFONY_VERSION="dev-master symfony/debug:~2.6@dev symfony/http-kernel:~2.6@dev"
1416

1517
before_script:
16-
- composer require symfony/http-foundation:${SYMFONY_VERSION} --no-interaction --prefer-source
18+
- composer self-update
19+
- composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
20+
- composer update --no-interaction --prefer-source
1721
- ./src/BeSimple/SoapClient/Tests/bin/phpwebserver.sh
1822
- ./src/BeSimple/SoapClient/Tests/bin/axis.sh
1923

@@ -22,4 +26,4 @@ script:
2226

2327
matrix:
2428
allow_failures:
25-
- env: SYMFONY_VERSION=dev-master
29+
- env: SYMFONY_VERSION="dev-master symfony/debug:~2.6@dev symfony/http-kernel:~2.6@dev"

‎composer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,13 @@
3737
},
3838
"require-dev": {
3939
"ext-mcrypt": "*",
40-
"mikey179/vfsStream": "dev-master",
41-
"symfony/filesystem": "~2.3",
40+
"mikey179/vfsStream": "~1.0",
41+
"symfony/filesystem": "~2.0",
4242
"symfony/process": "~2.3"
4343
},
4444
"autoload": {
4545
"psr-0": { "BeSimple\\": "src/" }
4646
},
47-
"minimum-stability": "dev",
4847
"extra": {
4948
"branch-alias": {
5049
"dev-master": "0.2-dev"

‎src/BeSimple/SoapBundle/Tests/ServiceBinding/RpcLiteralRequestMessageBinderTest.php‎

Lines changed: 108 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -16,83 +16,88 @@
1616
use BeSimple\SoapBundle\ServiceDefinition as Definition;
1717
use BeSimple\SoapBundle\Tests\fixtures\ServiceBinding as Fixtures;
1818
use BeSimple\SoapBundle\Util\Collection;
19+
use BeSimple\SoapCommon\Definition\Type\ComplexType;
20+
use BeSimple\SoapCommon\Definition\Type\TypeRepository;
1921

2022
class RpcLiteralRequestMessageBinderTest extends \PHPUnit_Framework_TestCase
2123
{
2224
/**
2325
* @dataProvider messageProvider
2426
*/
25-
public function testProcessMessage(Definition\Method $method, $message, $assert)
27+
public function testProcessMessage(Definition\Method $method, array $message, array $assert)
2628
{
2729
$messageBinder = new RpcLiteralRequestMessageBinder();
28-
$result = $messageBinder->processMessage($method, $message);
30+
$result = $messageBinder->processMessage($method, $message, $this->getTypeRepository());
2931

3032
$this->assertSame($assert, $result);
3133
}
3234

3335
public function testProcessMessageWithComplexType()
3436
{
37+
$typeRepository = $this->addComplexTypes($this->getTypeRepository());
3538
$messageBinder = new RpcLiteralRequestMessageBinder();
3639

40+
$method = new Definition\Method('complextype_argument', null);
41+
$method->addInput('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo');
42+
3743
$foo = new Fixtures\Foo('foobar', 19395);
3844
$result = $messageBinder->processMessage(
39-
new Definition\Method('complextype_argument', null, array(), array(
40-
new Definition\Argument('foo', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo')),
41-
)),
45+
$method,
4246
array($foo),
43-
$this->getDefinitionComplexTypes()
47+
$typeRepository
4448
);
4549

4650
$this->assertEquals(array('foo' => $foo), $result);
4751

48-
4952
$foo1 = new Fixtures\Foo('foobar', 29291);
5053
$foo2 = new Fixtures\Foo('barfoo', 39392);
5154
$foos = new \stdClass();
5255
$foos->item = array($foo1, $foo2);
5356

57+
$method = new Definition\Method('complextype_argument', null);
58+
$method->addInput('foos', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo[]');
59+
5460
$result = $messageBinder->processMessage(
55-
new Definition\Method('complextype_argument', null, array(), array(
56-
new Definition\Argument('foos', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo[]')),
57-
)),
61+
$method,
5862
array($foos),
59-
$this->getDefinitionComplexTypes()
63+
$typeRepository
6064
);
6165

6266
$this->assertEquals(array('foos' => array($foo1, $foo2)), $result);
6367
}
6468

65-
/**
66-
* @expectedException SoapFault
67-
*/
6869
public function testProcessMessageSoapFault()
6970
{
7071
$messageBinder = new RpcLiteralRequestMessageBinder();
7172

73+
$method = new Definition\Method('complextype_argument', null);
74+
$method->addInput('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo');
75+
7276
$foo = new Fixtures\Foo('foo', null);
73-
$result = $messageBinder->processMessage(
74-
new Definition\Method('complextype_argument', null, array(), array(
75-
new Definition\Argument('foo', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo')),
76-
)),
77+
78+
$this->setExpectedException('SoapFault');
79+
$messageBinder->processMessage(
80+
$method,
7781
array($foo),
78-
$this->getDefinitionComplexTypes()
82+
$this->addComplexTypes($this->getTypeRepository())
7983
);
8084
}
8185

8286
public function testProcessMessageWithComplexTypeReference()
8387
{
8488
$messageBinder = new RpcLiteralRequestMessageBinder();
8589

90+
$method = new Definition\Method('complextype_argument', null);
91+
$method->addInput('foos', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo[]');
92+
8693
$foo = new Fixtures\Foo('foo', 2499104);
8794
$foos = new \stdClass();
8895
$foos->item = array($foo, $foo);
8996

9097
$result = $messageBinder->processMessage(
91-
new Definition\Method('complextype_argument', null, array(), array(
92-
new Definition\Argument('foos', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo[]')),
93-
)),
98+
$method,
9499
array($foos),
95-
$this->getDefinitionComplexTypes()
100+
$this->addComplexTypes($this->getTypeRepository())
96101
);
97102

98103
$this->assertEquals(array('foos' => array($foo, $foo)), $result);
@@ -102,16 +107,17 @@ public function testProcessMessageWithComplexTypeIntoComplexType()
102107
{
103108
$messageBinder = new RpcLiteralRequestMessageBinder();
104109

110+
$method = new Definition\Method('complextype_argument', null);
111+
$method->addInput('fooBar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooBar');
112+
105113
$foo = new Fixtures\Foo('foo', 38845);
106114
$bar = new Fixtures\Bar('bar', null);
107115
$fooBar = new Fixtures\FooBar($foo, $bar);
108116

109117
$result = $messageBinder->processMessage(
110-
new Definition\Method('complextype_argument', null, array(), array(
111-
new Definition\Argument('fooBar', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooBar')),
112-
)),
118+
$method,
113119
array($fooBar),
114-
$this->getDefinitionComplexTypes()
120+
$this->addComplexTypes($this->getTypeRepository())
115121
);
116122

117123
$this->assertEquals(array('fooBar' => $fooBar), $result);
@@ -121,17 +127,18 @@ public function testProcessMessageComplexTypeWithArrays()
121127
{
122128
$messageBinder = new RpcLiteralRequestMessageBinder();
123129

130+
$method = new Definition\Method('complextype_with_array', null);
131+
$method->addInput('simple_arrays', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\SimpleArrays');
132+
124133
$array = array(1, 2, 3, 4);
125134
$stdClass = new \stdClass();
126135
$stdClass->item = $array;
127136
$simpleArrays = new Fixtures\SimpleArrays(null, new \stdClass(), $stdClass);
128137

129138
$result = $messageBinder->processMessage(
130-
new Definition\Method('complextype_with_array', null, array(), array(
131-
new Definition\Argument('simple_arrays', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\SimpleArrays')),
132-
)),
139+
$method,
133140
array($simpleArrays),
134-
$this->getDefinitionComplexTypes()
141+
$this->addComplexTypes($this->getTypeRepository())
135142
);
136143

137144
$result = $result['simple_arrays'];
@@ -144,12 +151,13 @@ public function testProcessMessageWithEmptyArrayComplexType()
144151
{
145152
$messageBinder = new RpcLiteralRequestMessageBinder();
146153

154+
$method = new Definition\Method('empty_array_complex_type', null);
155+
$method->addInput('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo[]');
156+
147157
$result = $messageBinder->processMessage(
148-
new Definition\Method('empty_array_complex_type', null, array(), array(
149-
new Definition\Argument('foo', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo[]')),
150-
)),
158+
$method,
151159
array(new \stdClass()),
152-
$this->getDefinitionComplexTypes()
160+
$this->addComplexTypes($this->getTypeRepository())
153161
);
154162

155163
$this->assertEquals(array('foo' => array()), $result);
@@ -159,16 +167,17 @@ public function testProccessMessagePreventInfiniteRecursion()
159167
{
160168
$messageBinder = new RpcLiteralRequestMessageBinder();
161169

170+
$method = new Definition\Method('prevent_infinite_recursion', null);
171+
$method->addInput('foo_recursive', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive');
172+
162173
$foo = new Fixtures\FooRecursive('foo', '');
163174
$bar = new Fixtures\BarRecursive($foo, 10394);
164175
$foo->bar = $bar;
165176

166177
$result = $messageBinder->processMessage(
167-
new Definition\Method('prevent_infinite_recursion', null, array(), array(
168-
new Definition\Argument('foo_recursive', new Definition\Type('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive')),
169-
)),
178+
$method,
170179
array($foo),
171-
$this->getDefinitionComplexTypes()
180+
$this->addComplexTypes($this->getTypeRepository())
172181
);
173182

174183
$this->assertEquals(array('foo_recursive' => $foo), $result);
@@ -179,84 +188,82 @@ public function messageProvider()
179188
$messages = array();
180189

181190
$messages[] = array(
182-
new Definition\Method('no_argument'),
191+
new Definition\Method('no_argument', null),
183192
array(),
184193
array(),
185194
);
186195

196+
$method = new Definition\Method('string_argument', null);
197+
$method->addInput('foo', 'string');
187198
$messages[] = array(
188-
new Definition\Method('string_argument', null, array(), array(
189-
new Definition\Argument('foo', new Definition\Type('string')),
190-
)),
199+
$method,
191200
array('bar'),
192201
array('foo' => 'bar'),
193202
);
194203

204+
$method = new Definition\Method('string_int_arguments', null);
205+
$method->addInput('foo', 'string');
206+
$method->addInput('bar', 'int');
195207
$messages[] = array(
196-
new Definition\Method('string_int_arguments', null, array(), array(
197-
new Definition\Argument('foo', new Definition\Type('string')),
198-
new Definition\Argument('bar', new Definition\Type('int')),
199-
)),
208+
$method,
200209
array('test', 20),
201210
array('foo' => 'test', 'bar' => 20),
202211
);
203212

213+
$method = new Definition\Method('array_string_arguments', null);
214+
$method->addInput('foo', 'string[]');
215+
$method->addInput('bar', 'int');
204216
$strings = new \stdClass();
205217
$strings->item = array('foo', 'bar', 'barfoo');
206218
$messages[] = array(
207-
new Definition\Method('array_string_arguments', null, array(), array(
208-
new Definition\Argument('foo', new Definition\Type('string[]')),
209-
new Definition\Argument('bar', new Definition\Type('int')),
210-
)),
219+
$method,
211220
array($strings, 4),
212221
array('foo' => array('foo', 'bar', 'barfoo'), 'bar' => 4),
213222
);
214223

224+
$method = new Definition\Method('empty_array', null);
225+
$method->addInput('foo', 'string[]');
215226
$messages[] = array(
216-
new Definition\Method('empty_array', null, array(), array(
217-
new Definition\Argument('foo', new Definition\Type('string[]')),
218-
)),
227+
$method,
219228
array(new \stdClass()),
220229
array('foo' => array()),
221230
);
222231

223232
return $messages;
224233
}
225234

226-
private function getDefinitionComplexTypes()
235+
private function addComplexTypes(TypeRepository $typeRepository)
227236
{
228-
$definitionComplexTypes = array();
229-
230-
$definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo'] = $this->createComplexTypeCollection(array(
231-
array('foo', 'string'),
232-
array('bar', 'int'),
233-
));
234-
235-
$definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Bar'] = $this->createComplexTypeCollection(array(
236-
array('foo', 'string'),
237-
array('bar', 'int', true),
238-
));
239-
240-
$definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooBar'] = $this->createComplexTypeCollection(array(
241-
array('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo'),
242-
array('bar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Bar'),
243-
));
244-
245-
$definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\SimpleArrays'] = $this->createComplexTypeCollection(array(
246-
array('array1', 'string[]', true),
247-
array('array2', 'string[]'),
248-
array('array3', 'string[]'),
249-
));
250-
251-
$definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive'] = $this->createComplexTypeCollection(array(
252-
array('bar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\BarRecursive'),
253-
));
254-
255-
$definitionComplexTypes['BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\BarRecursive'] = $this->createComplexTypeCollection(array(
256-
array('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive'),
257-
));
258-
259-
return $definitionComplexTypes;
237+
$foo = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo', 'Foo');
238+
$foo->add('foo', 'string');
239+
$foo->add('bar', 'int');
240+
$typeRepository->addComplexType($foo);
241+
242+
$bar = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Bar', 'Bar');
243+
$bar->add('foo', 'string');
244+
$bar->add('bar', 'int', true);
245+
$typeRepository->addComplexType($bar);
246+
247+
$fooBar = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooBar', 'FooBar');
248+
$fooBar->add('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Foo');
249+
$fooBar->add('bar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\Bar');
250+
$typeRepository->addComplexType($fooBar);
251+
252+
$simpleArrays = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\SimpleArrays', 'SimpleArrays');
253+
$simpleArrays->add('array1', 'string[]', true);
254+
$simpleArrays->add('array2', 'string[]');
255+
$simpleArrays->add('array3', 'string[]');
256+
$typeRepository->addComplexType($simpleArrays);
257+
258+
$fooRecursive = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive', 'FooRecursive');
259+
$fooRecursive->add('bar', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\BarRecursive');
260+
$typeRepository->addComplexType($fooRecursive);
261+
262+
$barRecursive = new ComplexType('BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\BarRecursive', 'BarRecursive');
263+
$barRecursive->add('foo', 'BeSimple\SoapBundle\Tests\fixtures\ServiceBinding\FooRecursive');
264+
$typeRepository->addComplexType($barRecursive);
265+
266+
return $typeRepository;
260267
}
261268

262269
private function createComplexTypeCollection(array $properties)
@@ -277,4 +284,18 @@ private function createComplexTypeCollection(array $properties)
277284

278285
return array('properties' => $collection);
279286
}
287+
288+
private function getTypeRepository()
289+
{
290+
$typeRepository = new TypeRepository();
291+
$typeRepository->addXmlNamespace('xsd', 'http://www.w3.org/2001/XMLSchema');
292+
$typeRepository->addType('string', 'xsd:string');
293+
$typeRepository->addType('boolean', 'xsd:boolean');
294+
$typeRepository->addType('int', 'xsd:int');
295+
$typeRepository->addType('float', 'xsd:float');
296+
$typeRepository->addType('date', 'xsd:date');
297+
$typeRepository->addType('dateTime', 'xsd:dateTime');
298+
299+
return $typeRepository;
300+
}
280301
}

‎src/BeSimple/SoapBundle/Tests/Soap/SoapRequestTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ class SoapRequestTest extends \PHPUnit_Framework_TestCase
2323
{
2424
public function testMtomMessage()
2525
{
26+
$this->markTestSkipped('Skip because I\'m not sure that SoapRequest is used in a HTTP Request process.');
27+
2628
$content = $this->loadRequestContentFixture('mtom/simple.txt');
2729

2830
$request = new SoapRequest(array(), array(), array(), array(), array(), array(), $content);

0 commit comments

Comments
 (0)