Tweak unittests and added validation test for #174

jenssegers · jenssegers · commit b32d35e30f2e · 2014-04-03T18:47:59.000+02:00
diff --git a/composer.json b/composer.json
@@ -16,8 +16,7 @@
         "illuminate/events": "4.1.x"
     },
     "require-dev": {
-        "illuminate/cache": "4.1.x",
-        "illuminate/auth": "4.1.x",
+        "orchestra/testbench": "2.1.*",
         "mockery/mockery": "*"
     },
     "autoload": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -39,5 +39,8 @@
             <directory>tests/RelationsTest.php</directory>
             <directory>tests/MysqlRelationsTest.php</directory>
         </testsuite>
+        <testsuite name="validation">
+            <directory>tests/ValidationTest.php</directory>
+        </testsuite>
     </testsuites>
 </phpunit>
diff --git a/tests/CacheTest.php b/tests/CacheTest.php
@@ -1,29 +1,19 @@
 <?php
 
-use Illuminate\Support\Facades\DB;
-
-class CacheTest extends PHPUnit_Framework_TestCase {
-
-	protected $cache;
-
-	public function setUp()
-	{
-		global $app;
-		$this->cache = $app['cache'];
-
-		User::create(array('name' => 'John Doe', 'age' => 35, 'title' => 'admin'));
-		User::create(array('name' => 'Jane Doe', 'age' => 33, 'title' => 'admin'));
-		User::create(array('name' => 'Harry Hoe', 'age' => 13, 'title' => 'user'));
-	}
+class CacheTest extends TestCase {
 
 	public function tearDown()
 	{
 		User::truncate();
-		$this->cache->forget('db.users');
+		Cache::forget('db.users');
 	}
 
 	public function testCache()
 	{
+		User::create(array('name' => 'John Doe', 'age' => 35, 'title' => 'admin'));
+		User::create(array('name' => 'Jane Doe', 'age' => 33, 'title' => 'admin'));
+		User::create(array('name' => 'Harry Hoe', 'age' => 13, 'title' => 'user'));
+
 		$users = DB::collection('users')->where('age', '>', 10)->remember(10)->get();
 		$this->assertEquals(3, count($users));
 
@@ -33,7 +23,7 @@ public function testCache()
 		$users = User::where('age', '>', 10)->remember(10, 'db.users')->get();
 		$this->assertEquals(3, count($users));
 
-		$users = $this->cache->get('db.users');
+		$users = Cache::get('db.users');
 		$this->assertEquals(3, count($users));
 	}
 
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -1,12 +1,6 @@
 <?php
-use Illuminate\Support\Facades\DB;
-use Jenssegers\Mongodb\Connection;
 
-class ConnectionTest extends PHPUnit_Framework_TestCase {
-
-	public function setUp() {}
-
-	public function tearDown() {}
+class ConnectionTest extends TestCase {
 
 	public function testConnection()
 	{
@@ -15,11 +9,11 @@ public function testConnection()
 
 		$c1 = DB::connection('mongodb');
 		$c2 = DB::connection('mongodb');
-		$this->assertEquals($c1, $c2);
+		$this->assertEquals(spl_object_hash($c1), spl_object_hash($c2));
 
 		$c1 = DB::connection('mongodb');
 		$c2 = DB::reconnect('mongodb');
-		$this->assertNotEquals($c1, $c2);
+		$this->assertNotEquals(spl_object_hash($c1), spl_object_hash($c2));
 	}
 
 	public function testDb()
diff --git a/tests/ModelTest.php b/tests/ModelTest.php
@@ -1,8 +1,6 @@
 <?php
 
-class ModelTest extends PHPUnit_Framework_TestCase {
-
-	public function setUp() {}
+class ModelTest extends TestCase {
 
 	public function tearDown()
 	{
diff --git a/tests/MysqlRelationsTest.php b/tests/MysqlRelationsTest.php
@@ -1,9 +1,11 @@
 <?php
 
-class MysqlRelationsTest extends PHPUnit_Framework_TestCase {
+class MysqlRelationsTest extends TestCase {
 
     public function setUp()
     {
+        parent::setUp();
+
         MysqlUser::executeSchema();
         MysqlBook::executeSchema();
         MysqlRole::executeSchema();
diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php
@@ -1,10 +1,6 @@
 <?php
 
-use Illuminate\Support\Facades\DB;
-
-class QueryBuilderTest extends PHPUnit_Framework_TestCase {
-
-	public function setUp() {}
+class QueryBuilderTest extends TestCase {
 
 	public function tearDown()
 	{
diff --git a/tests/QueryTest.php b/tests/QueryTest.php
@@ -1,11 +1,14 @@
 <?php
 
-class QueryTest extends PHPUnit_Framework_TestCase {
+class QueryTest extends TestCase {
 
 	protected static $started = false;
 
 	public function setUp()
 	{
+		parent::setUp();
+
+		// only run this stuff once
 		if (self::$started) return;
 
 		User::create(array('name' => 'John Doe', 'age' => 35, 'title' => 'admin'));
diff --git a/tests/RelationsTest.php b/tests/RelationsTest.php
@@ -1,11 +1,6 @@
 <?php
 
-use Illuminate\Database\Eloquent\Collection;
-
-class RelationsTest extends PHPUnit_Framework_TestCase {
-
-    public function setUp() {
-    }
+class RelationsTest extends TestCase {
 
     public function tearDown()
     {
@@ -148,8 +143,8 @@ public function testBelongsToMany()
         $this->assertTrue(array_key_exists('user_ids', $client->getAttributes()));
         $this->assertTrue(array_key_exists('client_ids', $user->getAttributes()));
 
-        $users = $client->getRelation('users');
         $clients = $user->getRelation('clients');
+        $users = $client->getRelation('users');
 
         $this->assertInstanceOf('Illuminate\Database\Eloquent\Collection', $users);
         $this->assertInstanceOf('Illuminate\Database\Eloquent\Collection', $clients);
diff --git a/tests/SchemaTest.php b/tests/SchemaTest.php
@@ -1,11 +1,6 @@
 <?php
 
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-
-class SchemaTest extends PHPUnit_Framework_TestCase {
-
-	public function setUp() {}
+class SchemaTest extends TestCase {
 
 	public function tearDown()
 	{
diff --git a/tests/SeederTest.php b/tests/SeederTest.php
@@ -1,10 +1,6 @@
 <?php
 
-use Illuminate\Support\Facades\DB;
-
-class SeederTest extends PHPUnit_Framework_TestCase {
-
-	public function setUp() {}
+class SeederTest extends TestCase {
 
 	public function tearDown()
 	{
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -0,0 +1,37 @@
+<?php
+
+class TestCase extends Orchestra\Testbench\TestCase {
+
+    /**
+     * Get package providers.
+     *
+     * @return array
+     */
+    protected function getPackageProviders()
+    {
+        return array('Jenssegers\Mongodb\MongodbServiceProvider');
+    }
+
+    /**
+     * Define environment setup.
+     *
+     * @param  Illuminate\Foundation\Application    $app
+     * @return void
+     */
+    protected function getEnvironmentSetUp($app)
+    {
+        // reset base path to point to our package's src directory
+        //$app['path.base'] = __DIR__ . '/../src';
+
+        // load custom config
+        $config = require 'config/database.php';
+
+        // set mongodb as default connection
+        $app['config']->set('database.default', 'mongodb');
+
+        // overwrite database configuration
+        $app['config']->set('database.connections.mysql', $config['connections']['mysql']);
+        $app['config']->set('database.connections.mongodb', $config['connections']['mongodb']);
+    }
+
+}
diff --git a/tests/ValidationTest.php b/tests/ValidationTest.php
@@ -0,0 +1,27 @@
+<?php
+
+class ValidationTest extends TestCase {
+
+    public function tearDown()
+    {
+        User::truncate();
+    }
+
+    public function testUnique()
+    {
+        $validator = Validator::make(
+            array('name' => 'John Doe'),
+            array('name' => 'required|unique:users')
+        );
+        $this->assertFalse($validator->fails());
+
+        User::create(array('name' => 'John Doe'));
+
+        $validator = Validator::make(
+            array('name' => 'John Doe'),
+            array('name' => 'required|unique:users')
+        );
+        $this->assertTrue($validator->fails());
+    }
+
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,47 +1,10 @@
 <?php
-$loader = require 'vendor/autoload.php';
-$loader->add('', 'tests/models');
-$loader->add('', 'tests/seeds');
-
-use Jenssegers\Mongodb\Model;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Container\Container;
-use Illuminate\Database\DatabaseManager;
-use Illuminate\Database\Connectors\ConnectionFactory;
-use Illuminate\Events\Dispatcher;
-use Illuminate\Cache\CacheManager;
-
-# Fake app class
-class App extends ArrayObject {
-	function bound() {}
-}
-
-# Fake app
-$app = new App;
 
-# Load database configuration
-$config = require 'config/database.php';
-foreach ($config as $key => $value)
-{
-	$app['config']["database.$key"] = $value;
-}
-
-# Event dispatcher
-$app['events'] = new Dispatcher;
-
-# Cache driver
-$app['config']['cache.driver'] = 'array';
-$app['cache'] = new CacheManager($app);
-
-# Initialize database manager
-$app['db.factory'] = new ConnectionFactory(new Container);
-$app['db'] = new DatabaseManager($app, $app['db.factory']);
+$loader = require 'vendor/autoload.php';
 
-# Extend database manager with reflection hack
-$reflection = new ReflectionClass('Jenssegers\Mongodb\Connection');
-$app['db']->extend('mongodb', array($reflection, 'newInstance'));
+// Could not figure out how to add this to the loader
+require 'TestCase.php';
 
-# Static setup
-\Jenssegers\Mongodb\Model::setConnectionResolver($app['db']);
-\Jenssegers\Eloquent\Model::setConnectionResolver($app['db']);
-DB::setFacadeApplication($app);
+// Add stuff to autoload
+$loader->add('', 'tests/models');
+$loader->add('', 'tests/seeds');
diff --git a/tests/config/database.php b/tests/config/database.php
@@ -2,10 +2,8 @@
 
 return array(
 
-	'fetch' => PDO::FETCH_CLASS,
-	'default' => 'mongodb',
-
 	'connections' => array(
+
 		'mongodb' => array(
 			'name'	   => 'mongodb',
 			'driver'   => 'mongodb',

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-class ModelTest extends PHPUnit_Framework_TestCase {`
`4`		`-`
`5`		`- public function setUp() {}`
	`3`	`+class ModelTest extends TestCase {`
`6`	`4`
`7`	`5`	`public function tearDown()`
`8`	`6`	`{`