@@ -179,32 +179,6 @@ public function testSendWithInvalidUri()
179179 $ this ->httpAdapter ->sendRequest ($ request );
180180 }
181181
182- /**
183- * @dataProvider requestsProvider
184- * @group integration
185- */
186- public function testSendRequests (array $ requests )
187- {
188- $ batchResult = $ this ->httpAdapter ->sendRequests ($ requests );
189-
190- $ this ->assertMultiResponses ($ batchResult ->getResponses (), $ requests );
191- }
192-
193- /**
194- * @dataProvider erroredRequestsProvider
195- * @group integration
196- */
197- public function testSendErroredRequests (array $ requests , array $ erroredRequests )
198- {
199- try {
200- $ this ->httpAdapter ->sendRequests (array_merge ($ requests , $ erroredRequests ));
201- $ this ->fail ();
202- } catch (BatchException $ e ) {
203- $ this ->assertMultiResponses ($ e ->getResult ()->getResponses (), $ requests );
204- $ this ->assertMultiExceptions ($ e ->getResult ()->getExceptions (), $ erroredRequests );
205- }
206- }
207-
208182 /**
209183 * @return array
210184 */
@@ -239,73 +213,6 @@ public function requestWithOutcomeProvider()
239213 return $ cartesianProduct ->compute ();
240214 }
241215
242- /**
243- * @return array
244- */
245- public function requestsProvider ()
246- {
247- $ requests = $ this ->requestProvider ();
248- $ messageFactory = MessageFactoryDiscovery::find ();
249-
250- foreach ($ requests as &$ request ) {
251- $ headers = $ request [2 ];
252- $ body = $ request [3 ];
253-
254- if ($ body !== null ) {
255- $ headers ['Content-Length ' ] = strlen ($ body );
256- }
257-
258- $ request = $ messageFactory ->createRequest (
259- $ request [0 ],
260- $ request [1 ],
261- '1.1 ' ,
262- $ headers ,
263- $ body
264- );
265- }
266-
267- return [[$ requests ]];
268- }
269-
270- /**
271- * @return array
272- */
273- public function erroredRequestsProvider ()
274- {
275- $ requests = [];
276- $ erroredRequests = [];
277- $ messageFactory = MessageFactoryDiscovery::find ();
278-
279- $ sets = [
280- 'methods ' => ['GET ' ],
281- 'uris ' => [$ this ->getUri (), $ this ->getInvalidUri ()],
282- 'headers ' => $ this ->getHeaders (),
283- 'body ' => $ this ->getBodies (),
284- ];
285-
286- $ cartesianProduct = new CartesianProduct ($ sets );
287-
288- foreach ($ cartesianProduct as $ request ) {
289- $ headers = $ request [2 ];
290- $ body = $ request [3 ];
291-
292- if ($ body !== null ) {
293- $ headers ['Content-Length ' ] = strlen ($ body );
294- }
295-
296- $ requests [] = $ messageFactory ->createRequest (
297- $ request [0 ],
298- $ request [1 ],
299- '1.1 ' ,
300- $ headers ,
301- $ body
302- );
303- }
304-
305- // First x are simple requests, all-x are errored requests
306- return [array_chunk ($ requests , count ($ requests )/2 )];
307- }
308-
309216 /**
310217 * @return array
311218 */
@@ -479,31 +386,6 @@ protected function assertRequest(
479386 }
480387 }
481388
482- /**
483- * @param ResponseInterface[] $responses
484- * @param array $requests
485- */
486- private function assertMultiResponses (array $ responses , array $ requests )
487- {
488- $ this ->assertCount (count ($ requests ), $ responses );
489- }
490-
491- /**
492- * @param RequestException[] $exceptions
493- * @param array $requests
494- */
495- private function assertMultiExceptions (array $ exceptions , array $ requests )
496- {
497- $ this ->assertCount (count ($ requests ), $ exceptions );
498-
499- foreach ($ exceptions as $ exception ) {
500- $ this ->assertInstanceOf (
501- 'Psr\Http\Message\RequestInterface ' ,
502- $ exception ->getRequest ()
503- );
504- }
505- }
506-
507389 /**
508390 * @return array
509391 */
0 commit comments