added Nette\Tester

.gitignore

@@ -0,0 +1,2 @@
+/tools
+/composer.lock

composer.json

@@ -10,6 +10,12 @@
 			"homepage": "http://davidgrudl.com"
 		}
 	],
+	"require-dev": {
+		"nette/tester": "@dev"
+	},
+	"config": {
+		"vendor-dir": "tools"
+	},
 	"autoload": {
 		"classmap": ["dibi/"]
 	}

tests/DibiFluent.cloning.phpt

@@ -4,17 +4,15 @@
  * Test: Cloning of DibiFluent
  *
  * @author     David Grudl
- * @category   Dibi
- * @subpackage UnitTests
  */
 
 
 
-require dirname(__FILE__) . '/initialize.php';
+require dirname(__FILE__) . '/bootstrap.php';
 
 
 
-dibi::connect($config['sqlite']);
+dibi::connect($config['sqlite3']);
 
 
 $fluent = new DibiFluent(dibi::getConnection());
@@ -23,50 +21,23 @@ $dolly = clone $fluent;
 $dolly->where('y=1');
 $dolly->clause('FOO');
 
-$fluent->test();
-$dolly->test();
+Assert::same( 'SELECT * FROM [table] WHERE x=1', (string) $fluent );
+Assert::same( 'SELECT * FROM [table] WHERE x=1 AND y=1 FOO', (string) $dolly );
 
 
 
 $fluent = dibi::select('id')->from('table')->where('id = %i',1);
 $dolly = clone $fluent;
 $dolly->where('cd = %i',5);
 
-$fluent->test();
-$dolly->test();
+Assert::same( 'SELECT [id] FROM [table] WHERE id = 1', (string) $fluent );
+Assert::same( 'SELECT [id] FROM [table] WHERE id = 1 AND cd = 5', (string) $dolly );
 
 
 
 $fluent = dibi::select("*")->from("table");
 $dolly = clone $fluent;
 $dolly->removeClause("select")->select("count(*)");
 
-$fluent->test();
-$dolly->test();
-
-
-
-__halt_compiler() ?>
-
-------EXPECT------
-SELECT *
-FROM [table]
-WHERE x=1
-
-SELECT *
-FROM [table]
-WHERE x=1 AND y=1 FOO
-
-SELECT [id]
-FROM [table]
-WHERE id = 1
-
-SELECT [id]
-FROM [table]
-WHERE id = 1 AND cd = 5
-
-SELECT *
-FROM [table]
-
-SELECT count(*)
-FROM [table]
+Assert::same( 'SELECT * FROM [table]', (string) $fluent );
+Assert::same( 'SELECT count(*) FROM [table]', (string) $dolly );