Move all integration tests into the tests directory

Everything is finally useable from other crates, and we've figured out
how to configure Cargo to let us reference schema.rs from other test
files. This finally means that we can start toying with real usage.
(Even if it's limited at the moment, there's defnitely still some value
it what we have so far).

Shit, I should write some docs.

Author: sgrif

Cargo.toml

@@ -11,6 +11,11 @@ byteorder = "0.3.*"
 [dev-dependencies]
 compiletest_rs = "*"
 
+[[test]]
+name = "compile_tests"
+path = "tests/compile_tests.rs"
+harness = true
+
 [[test]]
 name = "integration_tests"
 path = "tests/lib.rs"

src/lib.rs

@@ -11,9 +11,6 @@ mod row;
 #[macro_use]
 mod macros;
 
-#[cfg(test)]
-mod tests;
-
 pub use result::*;
 pub use query_source::{QuerySource, Queriable, Table, Column, JoinTo};
 pub use connection::Connection;

src/tests/mod.rs

@@ -1,8 +1,8 @@
-use super::schema::*;
+use schema::*;
 
 #[test]
 fn find() {
-    use tests::schema::users::table as users;
+    use schema::users::table as users;
 
     let connection = connection();
     setup_users_table(&connection);

src/tests/schema.rs

@@ -2,7 +2,7 @@ use super::schema::*;
 
 #[test]
 fn insert_records() {
-    use tests::schema::users::table as users;
+    use schema::users::table as users;
     let connection = connection();
     setup_users_table(&connection);
 
@@ -24,7 +24,7 @@ fn insert_records() {
 
 #[test]
 fn insert_with_defaults() {
-    use tests::schema::users::table as users;
+    use schema::users::table as users;
     let connection = connection();
     connection.execute("CREATE TABLE users (
         id SERIAL PRIMARY KEY,
@@ -49,7 +49,7 @@ fn insert_with_defaults() {
 
 #[test]
 fn insert_with_defaults_not_provided() {
-    use tests::schema::users::table as users;
+    use schema::users::table as users;
     let connection = connection();
     connection.execute("CREATE TABLE users (
         id SERIAL PRIMARY KEY,

src/tests/find.rs tests/find.rssrc/tests/find.rs renamed to tests/find.rs

@@ -1,5 +1,5 @@
 use super::schema::*;
-use {Table, QuerySource};
+use yaqb::{Table, QuerySource};
 
 #[test]
 fn belongs_to() {

src/tests/insert.rs tests/insert.rssrc/tests/insert.rs renamed to tests/insert.rs

@@ -1,7 +1,10 @@
 #[macro_use]
 extern crate yaqb;
 
-mod compile_tests;
+mod find;
+mod insert;
+mod joins;
 mod macros;
 mod schema;
+mod select;
 mod types;

src/tests/joins.rs tests/joins.rssrc/tests/joins.rs renamed to tests/joins.rs

@@ -1,5 +1,5 @@
 use super::schema::*;
-use {types, QuerySource};
+use yaqb::{types, QuerySource};
 
 #[test]
 fn selecting_basic_data() {
@@ -35,8 +35,8 @@ fn selecting_a_struct() {
 
 #[test]
 fn with_safe_select() {
-    use tests::schema::users::columns::*;
-    use tests::schema::users::table as users;
+    use schema::users::columns::*;
+    use schema::users::table as users;
 
     let connection = connection();
     setup_users_table(&connection);
@@ -56,8 +56,8 @@ fn with_safe_select() {
 
 #[test]
 fn selecting_multiple_columns() {
-    use tests::schema::users::columns::*;
-    use tests::schema::users::table as users;
+    use schema::users::columns::*;
+    use schema::users::table as users;
 
     let connection = connection();
     setup_users_table(&connection);
@@ -77,8 +77,8 @@ fn selecting_multiple_columns() {
 
 #[test]
 fn selecting_multiple_columns_into_struct() {
-    use tests::schema::users::columns::*;
-    use tests::schema::users::table as users;
+    use schema::users::columns::*;
+    use schema::users::table as users;
 
     let connection = connection();
     setup_users_table(&connection);
@@ -116,8 +116,8 @@ fn with_select_sql() {
 
 #[test]
 fn selecting_nullable_followed_by_non_null() {
-    use tests::schema::users::columns::*;
-    use tests::schema::users::table as users;
+    use schema::users::columns::*;
+    use schema::users::table as users;
 
     let connection = connection();
     setup_users_table(&connection);