Tweaked the tests

GrahamCampbell · GrahamCampbell · commit 2bccf7180378 · 2014-09-28T20:40:39.000+01:00
diff --git a/tests/Database/DatabaseConnectionFactoryTest.php b/tests/Database/DatabaseConnectionFactoryTest.php
@@ -40,7 +40,7 @@ public function testMakeCallsCreateConnectionForReadWrite()
 		$config = array(
 			'read' => array('database' => 'database'),
 			'write' => array('database' => 'database'),
-			'driver' => 'mysql', 'prefix' => 'prefix', 'name' => 'foo'
+			'driver' => 'mysql', 'prefix' => 'prefix', 'name' => 'foo',
 		);
 		$expect = $config;
 		unset($expect['read']);
diff --git a/tests/Database/DatabaseEloquentMorphToManyTest.php b/tests/Database/DatabaseEloquentMorphToManyTest.php
@@ -1,7 +1,6 @@
 <?php
 
 use Mockery as m;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 
 class DatabaseEloquentMorphToManyTest extends PHPUnit_Framework_TestCase {
diff --git a/tests/Database/DatabaseSQLiteSchemaGrammarTest.php b/tests/Database/DatabaseSQLiteSchemaGrammarTest.php
@@ -374,7 +374,7 @@ public function testAddingTimeStamps()
 		$this->assertEquals(2, count($statements));
 		$expected = array(
 			'alter table "users" add column "created_at" datetime not null',
-			'alter table "users" add column "updated_at" datetime not null'
+			'alter table "users" add column "updated_at" datetime not null',
 		);
 		$this->assertEquals($expected, $statements);
 	}
diff --git a/tests/Foundation/FoundationApplicationTest.php b/tests/Foundation/FoundationApplicationTest.php
@@ -1,7 +1,6 @@
 <?php
 
 use Mockery as m;
-use Illuminate\Http\Request;
 use Illuminate\Foundation\Application;
 
 class FoundationApplicationTest extends PHPUnit_Framework_TestCase {
diff --git a/tests/Http/HttpRequestTest.php b/tests/Http/HttpRequestTest.php
@@ -58,7 +58,7 @@ public function segmentProvider()
 			array('', 1, 'default'),
 			array('foo/bar//baz', '1', 'foo'),
 			array('foo/bar//baz', '2', 'bar'),
-			array('foo/bar//baz', '3', 'baz')
+			array('foo/bar//baz', '3', 'baz'),
 		);
 	}
 
@@ -81,7 +81,7 @@ public function segmentsProvider()
 			array('', array()),
 			array('foo/bar', array('foo', 'bar')),
 			array('foo/bar//baz', array('foo', 'bar', 'baz')),
-			array('foo/0/bar', array('foo', '0', 'bar'))
+			array('foo/0/bar', array('foo', '0', 'bar')),
 		);
 	}
 
diff --git a/tests/Pagination/PaginationPaginatorTest.php b/tests/Pagination/PaginationPaginatorTest.php
@@ -196,7 +196,7 @@ public function testGetUrlHasPriorityOverAppends()
 
 		$p->appends(array(
 			'sort' => 'desc',
-			'page' => '2'
+			'page' => '2',
 		));
 		$this->assertEquals('http://foo.com?sort=desc&page=1', $p->getUrl(1));
 	}
diff --git a/tests/Queue/QueueIronQueueTest.php b/tests/Queue/QueueIronQueueTest.php
@@ -41,7 +41,7 @@ public function testPushProperlyPushesJobOntoIronWithClosures()
 		$closure = new Illuminate\Support\SerializableClosure($innerClosure = function() use ($name) { return $name; });
 		$crypt->shouldReceive('encrypt')->once()->with(serialize($closure))->andReturn('serial_closure');
 		$crypt->shouldReceive('encrypt')->once()->with(json_encode(array(
-			'job' => 'IlluminateQueueClosure', 'data' => array('closure' => 'serial_closure'), 'attempts' => 1, 'queue' => 'default'
+			'job' => 'IlluminateQueueClosure', 'data' => array('closure' => 'serial_closure'), 'attempts' => 1, 'queue' => 'default',
 		)))->andReturn('encrypted');
 		$iron->shouldReceive('postMessage')->once()->with('default', 'encrypted', array())->andReturn((object) array('id' => 1));
 		$queue->push($innerClosure);
diff --git a/tests/Queue/QueueSqsJobTest.php b/tests/Queue/QueueSqsJobTest.php
@@ -1,15 +1,10 @@
 <?php
 
 use Mockery as m;
-
 use Aws\Sqs\SqsClient;
-use Aws\Common\Credentials\Credentials;
-use Aws\Common\Credentials\CredentialsInterface;
-use Aws\Common\Signature\SignatureInterface;
-use Aws\Common\Signature\SignatureV4;
-
 use Guzzle\Common\Collection;
-use Guzzle\Service\Resource\Model;
+use Aws\Common\Signature\SignatureV4;
+use Aws\Common\Credentials\Credentials;
 
 class QueueSqsJobTest extends PHPUnit_Framework_TestCase {
 
@@ -51,6 +46,7 @@ public function setUp() {
 
 	}
 
+
 	public function tearDown()
 	{
 		m::close();
@@ -76,6 +72,7 @@ public function testDeleteRemovesTheJobFromSqs()
 		$job->delete();
 	}
 
+
 	protected function getJob()
 	{
 		return new Illuminate\Queue\Jobs\SqsJob(
diff --git a/tests/Queue/QueueSqsQueueTest.php b/tests/Queue/QueueSqsQueueTest.php
@@ -90,4 +90,5 @@ public function testPushProperlyPushesJobOntoSqs()
 		$id = $queue->push($this->mockedJob, $this->mockedData, $this->queueName);
 		$this->assertEquals($this->mockedMessageId, $id);
 	}
+
 }
diff --git a/tests/Session/SessionStoreTest.php b/tests/Session/SessionStoreTest.php
@@ -294,7 +294,7 @@ public function getMocks()
 		return array(
 			$this->getSessionName(),
 			m::mock('SessionHandlerInterface'),
-			$this->getSessionId()
+			$this->getSessionId(),
 		);
 	}
 
diff --git a/tests/Support/SupportClassLoaderTest.php b/tests/Support/SupportClassLoaderTest.php
@@ -1,6 +1,5 @@
 <?php
 
-use Mockery as m;
 use Illuminate\Support\ClassLoader;
 
 class SupportClassLoaderTest extends PHPUnit_Framework_TestCase {
diff --git a/tests/Support/SupportFluentTest.php b/tests/Support/SupportFluentTest.php
@@ -4,11 +4,6 @@
 
 class SupportFluentTest extends PHPUnit_Framework_TestCase {
 
-	/**
-	 * Test the Fluent constructor.
-	 *
-	 * @test
-	 */
 	public function testAttributesAreSetByConstructor()
 	{
 		$array  = array('name' => 'Taylor', 'age' => 25);
@@ -23,11 +18,6 @@ public function testAttributesAreSetByConstructor()
 	}
 
 
-	/**
-	 * Test the Fluent constructor when given \stdClass/object.
-	 *
-	 * @test
-	 */
 	public function testAttributesAreSetByConstructorGivenStdClass()
 	{
 		$array  = array('name' => 'Taylor', 'age' => 25);
@@ -42,11 +32,6 @@ public function testAttributesAreSetByConstructorGivenStdClass()
 	}
 
 
-	/**
-	 * Test the Fluent constructor when given ArrayIterator interface.
-	 *
-	 * @test
-	 */
 	public function testAttributesAreSetByConstructorGivenArrayIterator()
 	{
 		$array  = array('name' => 'Taylor', 'age' => 25);
@@ -61,11 +46,6 @@ public function testAttributesAreSetByConstructorGivenArrayIterator()
 	}
 
 
-	/**
-	 * Test the Fluent::get() method.
-	 *
-	 * @test
-	 */
 	public function testGetMethodReturnsAttribute()
 	{
 		$fluent = new Fluent(array('name' => 'Taylor'));
@@ -76,11 +56,7 @@ public function testGetMethodReturnsAttribute()
 		$this->assertNull($fluent->foo);
 	}
 
-	/**
-	 * Test the Fluent magic methods can be used to set attributes.
-	 *
-	 * @test
-	 */
+
 	public function testMagicMethodsCanBeUsedToSetAttributes()
 	{
 		$fluent = new Fluent;
@@ -96,11 +72,6 @@ public function testMagicMethodsCanBeUsedToSetAttributes()
 	}
 
 
-	/**
-	 * Test the Fluent::__isset() method.
-	 *
-	 * @test
-	 */
 	public function testIssetMagicMethod()
 	{
 		$array  = array('name' => 'Taylor', 'age' => 25);
@@ -131,6 +102,7 @@ public function testToJsonEncodesTheToArrayResult()
 
 		$this->assertEquals(json_encode('foo'), $results);
 	}
+
 }
 
 
diff --git a/tests/Support/SupportMacroTraitTest.php b/tests/Support/SupportMacroTraitTest.php
@@ -1,7 +1,5 @@
 <?php
 
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Response;
 
 class SupportMacroTraitTest extends \PHPUnit_Framework_TestCase {
 
diff --git a/tests/View/ViewFactoryTest.php b/tests/View/ViewFactoryTest.php
@@ -386,7 +386,7 @@ protected function getFactoryArgs()
 		return array(
 			m::mock('Illuminate\View\Engines\EngineResolver'),
 			m::mock('Illuminate\View\ViewFinderInterface'),
-			m::mock('Illuminate\Events\Dispatcher')
+			m::mock('Illuminate\Events\Dispatcher'),
 		);
 	}
 
diff --git a/tests/View/ViewTest.php b/tests/View/ViewTest.php
@@ -54,7 +54,7 @@ public function testRenderSectionsReturnsEnvironmentSections()
 			m::mock('Illuminate\View\Engines\EngineInterface'),
 			'view',
 			'path',
-			array()
+			array(),
 		));
 
 		$view->shouldReceive('render')->with(m::type('Closure'))->once()->andReturn($sections = array('foo' => 'bar'));

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ public function testAddingTimeStamps()`
`374`	`374`	`$this->assertEquals(2, count($statements));`
`375`	`375`	`$expected = array(`
`376`	`376`	`'alter table "users" add column "created_at" datetime not null',`
`377`		`- 'alter table "users" add column "updated_at" datetime not null'`
	`377`	`+ 'alter table "users" add column "updated_at" datetime not null',`
`378`	`378`	`);`
`379`	`379`	`$this->assertEquals($expected, $statements);`
`380`	`380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public function testGetUrlHasPriorityOverAppends()`
`196`	`196`
`197`	`197`	`$p->appends(array(`
`198`	`198`	`'sort' => 'desc',`
`199`		`- 'page' => '2'`
	`199`	`+ 'page' => '2',`
`200`	`200`	`));`
`201`	`201`	`$this->assertEquals('http://foo.com?sort=desc&page=1', $p->getUrl(1));`
`202`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,4 +90,5 @@ public function testPushProperlyPushesJobOntoSqs()`
`90`	`90`	`$id = $queue->push($this->mockedJob, $this->mockedData, $this->queueName);`
`91`	`91`	`$this->assertEquals($this->mockedMessageId, $id);`
`92`	`92`	`}`
	`93`	`+`
`93`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ public function getMocks()`
`294`	`294`	`return array(`
`295`	`295`	`$this->getSessionName(),`
`296`	`296`	`m::mock('SessionHandlerInterface'),`
`297`		`- $this->getSessionId()`
	`297`	`+ $this->getSessionId(),`
`298`	`298`	`);`
`299`	`299`	`}`
`300`	`300`