aviat
/
Query
1
1
Fork 0
Code Issues 1 Pull Requests Releases 2 Activity

Actually fix tests

This commit is contained in:
Timothy Warren 2015-11-10 11:18:11 -05:00
parent 499c7df005
commit 1e2a7ee566
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -1,6 +1,12 @@
test_config.json test_config.json
index.html index.html
tests/db_files/* tests/db_files/*
build/api/*
build/coverage/*
build/logs/*
build/pdepend/*
build/phpdox/*
cache.properties
._* ._*
tests/settings.json tests/settings.json
.php_cs .php_cs

6
src/Query/QueryBuilder.php
View File

@ -64,10 +64,10 @@ class QueryBuilder extends AbstractQueryBuilder implements QueryBuilderInterface
/** /**
* Constructor * Constructor
* *
* @param Driver_Interface $db * @param DriverInterface $db
* @param Query_Parser $parser * @param QueryParser $parser
*/ */
public function __construct(Driver_Interface $db, Query_Parser $parser) public function __construct(DriverInterface $db, QueryParser $parser)
{ {
// Inject driver and parser // Inject driver and parser
$this->db = $db; $this->db = $db;

6
src/Query/QueryParser.php
View File

@ -26,7 +26,7 @@ class QueryParser {
/** /**
* DB Driver * DB Driver
* *
* @var Driver_Interface * @var DriverInterface
*/ */
private $db; private $db;
@ -56,9 +56,9 @@ class QueryParser {
/** /**
* Constructor/entry point into parser * Constructor/entry point into parser
* *
* @param Driver\Driver_Interface $db * @param Driver\DriverInterface $db
*/ */
public function __construct(Driver_Interface $db) public function __construct(DriverInterface $db)
{ {
$this->db = $db; $this->db = $db;
} }

6
tests/core/connection_manager_test.php
View File

@ -6,7 +6,7 @@ class Connection_Manager_Test extends Query_TestCase {
public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
self::$instance = Query\Connection_Manager::get_instance(); self::$instance = Query\ConnectionManager::get_instance();
} }
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@ -72,7 +72,7 @@ class Connection_Manager_Test extends Query_TestCase {
); );
$conn = self::$instance->connect($params); $conn = self::$instance->connect($params);
$this->assertInstanceOf('Query\\Query_Builder', $conn); $this->assertInstanceOf('Query\\QueryBuilder', $conn);
// Check that the connection just made is returned from the get_connection method // Check that the connection just made is returned from the get_connection method
@ -94,7 +94,7 @@ class Connection_Manager_Test extends Query_TestCase {
); );
$conn = self::$instance->connect($params); $conn = self::$instance->connect($params);
$this->assertInstanceOf('Query\\Query_Builder', $conn); $this->assertInstanceOf('Query\\QueryBuilder', $conn);
$this->assertEqual($conn, self::$instance->get_connection('conn_manager')); $this->assertEqual($conn, self::$instance->get_connection('conn_manager'));
} }

2
tests/core/query_parser_test.php
View File

@ -21,7 +21,7 @@ class Query_Parser_Test extends Query_TestCase {
public function setUp() public function setUp()
{ {
$db = new Query\Drivers\Sqlite\Driver("sqlite::memory:"); $db = new Query\Drivers\Sqlite\Driver("sqlite::memory:");
$this->parser = new Query\Query_Parser($db); $this->parser = new Query\QueryParser($db);
} }
public function TestGeneric() public function TestGeneric()