Skip to content

Commit c6556ca

Browse files
SeldaekSeldaek
committed
Fix test suite
1 parent d156f62 commit c6556ca

File tree

2 files changed

+42
-27
lines changed

2 files changed

+42
-27
lines changed

‎Tests/DependencyInjection/FixtureMonologExtensionTest.php‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ public function testLoadWithSeveralHandlers()
2828
$this->assertTrue($container->hasDefinition('monolog.handler.nested'));
2929

3030
$logger = $container->getDefinition('monolog.logger');
31-
$this->assertCount(3, $logger->getMethodCalls());
32-
$this->assertDICDefinitionMethodCallAt(2, $logger, 'pushHandler', array(new Reference('monolog.handler.custom')));
33-
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
34-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.filtered')));
31+
$this->assertCount(4, $logger->getMethodCalls());
32+
$this->assertDICDefinitionMethodCallAt(3, $logger, 'pushHandler', array(new Reference('monolog.handler.custom')));
33+
$this->assertDICDefinitionMethodCallAt(2, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
34+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.filtered')));
35+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
3536

3637
$handler = $container->getDefinition('monolog.handler.custom');
3738
$this->assertDICDefinitionClass($handler, '%monolog.handler.stream.class%');
@@ -56,9 +57,10 @@ public function testLoadWithOverwriting()
5657
$this->assertTrue($container->hasDefinition('monolog.handler.nested'));
5758

5859
$logger = $container->getDefinition('monolog.logger');
59-
$this->assertCount(2, $logger->getMethodCalls());
60-
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.custom')));
61-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
60+
$this->assertCount(3, $logger->getMethodCalls());
61+
$this->assertDICDefinitionMethodCallAt(2, $logger, 'pushHandler', array(new Reference('monolog.handler.custom')));
62+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
63+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
6264

6365
$handler = $container->getDefinition('monolog.handler.custom');
6466
$this->assertDICDefinitionClass($handler, '%monolog.handler.stream.class%');
@@ -80,10 +82,11 @@ public function testLoadWithNewAtEnd()
8082
$this->assertTrue($container->hasDefinition('monolog.handler.new'));
8183

8284
$logger = $container->getDefinition('monolog.logger');
83-
$this->assertCount(3, $logger->getMethodCalls());
84-
$this->assertDICDefinitionMethodCallAt(2, $logger, 'pushHandler', array(new Reference('monolog.handler.custom')));
85-
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
86-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.new')));
85+
$this->assertCount(4, $logger->getMethodCalls());
86+
$this->assertDICDefinitionMethodCallAt(3, $logger, 'pushHandler', array(new Reference('monolog.handler.custom')));
87+
$this->assertDICDefinitionMethodCallAt(2, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
88+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.new')));
89+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
8790

8891
$handler = $container->getDefinition('monolog.handler.new');
8992
$this->assertDICDefinitionClass($handler, '%monolog.handler.stream.class%');
@@ -102,11 +105,12 @@ public function testLoadWithNewAndPriority()
102105
$this->assertTrue($container->hasDefinition('monolog.handler.last'));
103106

104107
$logger = $container->getDefinition('monolog.logger');
105-
$this->assertCount(4, $logger->getMethodCalls());
106-
$this->assertDICDefinitionMethodCallAt(3, $logger, 'pushHandler', array(new Reference('monolog.handler.first')));
107-
$this->assertDICDefinitionMethodCallAt(2, $logger, 'pushHandler', array(new Reference('monolog.handler.custom')));
108-
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
109-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.last')));
108+
$this->assertCount(5, $logger->getMethodCalls());
109+
$this->assertDICDefinitionMethodCallAt(4, $logger, 'pushHandler', array(new Reference('monolog.handler.first')));
110+
$this->assertDICDefinitionMethodCallAt(3, $logger, 'pushHandler', array(new Reference('monolog.handler.custom')));
111+
$this->assertDICDefinitionMethodCallAt(2, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
112+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.last')));
113+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
110114

111115
$handler = $container->getDefinition('monolog.handler.main');
112116
$this->assertDICDefinitionClass($handler, '%monolog.handler.buffer.class%');

‎Tests/DependencyInjection/MonologExtensionTest.php‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public function testLoadWithDefault()
2727
$this->assertTrue($container->hasDefinition('monolog.handler.main'));
2828

2929
$logger = $container->getDefinition('monolog.logger');
30-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
30+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
31+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
3132

3233
$handler = $container->getDefinition('monolog.handler.main');
3334
$this->assertDICDefinitionClass($handler, '%monolog.handler.stream.class%');
@@ -43,7 +44,8 @@ public function testLoadWithCustomValues()
4344
$this->assertTrue($container->hasDefinition('monolog.handler.custom'));
4445

4546
$logger = $container->getDefinition('monolog.logger');
46-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.custom')));
47+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
48+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.custom')));
4749

4850
$handler = $container->getDefinition('monolog.handler.custom');
4951
$this->assertDICDefinitionClass($handler, '%monolog.handler.stream.class%');
@@ -62,7 +64,8 @@ public function testLoadWithNestedHandler()
6264

6365
$logger = $container->getDefinition('monolog.logger');
6466
// Nested handler must not be pushed to logger
65-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.custom')));
67+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
68+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.custom')));
6669

6770
$handler = $container->getDefinition('monolog.handler.custom');
6871
$this->assertDICDefinitionClass($handler, '%monolog.handler.stream.class%');
@@ -166,7 +169,8 @@ public function testSyslogHandlerWithLogopts()
166169
$this->assertTrue($container->hasDefinition('monolog.handler.main'));
167170

168171
$logger = $container->getDefinition('monolog.logger');
169-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
172+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
173+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
170174

171175
$handler = $container->getDefinition('monolog.handler.main');
172176
$this->assertDICDefinitionClass($handler, '%monolog.handler.syslog.class%');
@@ -181,7 +185,8 @@ public function testRollbarHandlerCreatesNotifier()
181185
$this->assertTrue($container->hasDefinition('monolog.handler.main'));
182186

183187
$logger = $container->getDefinition('monolog.logger');
184-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
188+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
189+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
185190

186191
$handler = $container->getDefinition('monolog.handler.main');
187192
$this->assertDICDefinitionClass($handler, '%monolog.handler.rollbar.class%');
@@ -196,7 +201,8 @@ public function testRollbarHandlerReusesNotifier()
196201
$this->assertTrue($container->hasDefinition('monolog.handler.main'));
197202

198203
$logger = $container->getDefinition('monolog.logger');
199-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
204+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
205+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
200206

201207
$handler = $container->getDefinition('monolog.handler.main');
202208
$this->assertDICDefinitionClass($handler, '%monolog.handler.rollbar.class%');
@@ -220,7 +226,8 @@ public function testSocketHandler()
220226
$this->assertTrue($container->hasDefinition('monolog.handler.socket'));
221227

222228
$logger = $container->getDefinition('monolog.logger');
223-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.socket')));
229+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
230+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.socket')));
224231

225232
$handler = $container->getDefinition('monolog.handler.socket');
226233
$this->assertDICDefinitionClass($handler, '%monolog.handler.socket.class%');
@@ -252,7 +259,8 @@ public function testRavenHandlerWhenADSNIsSpecified()
252259
$this->assertTrue($container->hasDefinition('monolog.handler.raven'));
253260

254261
$logger = $container->getDefinition('monolog.logger');
255-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.raven')));
262+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
263+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.raven')));
256264

257265
$this->assertTrue($container->hasDefinition('monolog.raven.client.'.sha1($dsn)));
258266

@@ -269,7 +277,8 @@ public function testRavenHandlerWhenADSNAndAClientAreSpecified()
269277
$this->assertFalse($container->hasDefinition('raven.client'));
270278

271279
$logger = $container->getDefinition('monolog.logger');
272-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.raven')));
280+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
281+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.raven')));
273282

274283
$handler = $container->getDefinition('monolog.handler.raven');
275284
$this->assertDICConstructorArguments($handler, array(new Reference('raven.client'), 100, true));
@@ -284,7 +293,8 @@ public function testRavenHandlerWhenAClientIsSpecified()
284293
$this->assertFalse($container->hasDefinition('raven.client'));
285294

286295
$logger = $container->getDefinition('monolog.logger');
287-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.raven')));
296+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
297+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.raven')));
288298

289299
$handler = $container->getDefinition('monolog.handler.raven');
290300
$this->assertDICConstructorArguments($handler, array(new Reference('raven.client'), 100, true));
@@ -316,7 +326,8 @@ public function testLogglyHandler()
316326
$this->assertTrue($container->hasDefinition('monolog.handler.loggly'));
317327

318328
$logger = $container->getDefinition('monolog.logger');
319-
$this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.loggly')));
329+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
330+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.loggly')));
320331
$handler = $container->getDefinition('monolog.handler.loggly');
321332
$this->assertDICDefinitionClass($handler, '%monolog.handler.loggly.class%');
322333
$this->assertDICConstructorArguments($handler, array($token, \Monolog\Logger::DEBUG, true));

0 commit comments

Comments
 (0)