Skip to content

Commit 52cc374

Browse files
committed
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.
1 parent 23a573c commit 52cc374

9 files changed

Lines changed: 24 additions & 151 deletions

File tree

Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ byteorder = "0.3.*"
1111
[dev-dependencies]
1212
compiletest_rs = "*"
1313

14+
[[test]]
15+
name = "compile_tests"
16+
path = "tests/compile_tests.rs"
17+
harness = true
18+
1419
[[test]]
1520
name = "integration_tests"
1621
path = "tests/lib.rs"

src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ mod row;
1111
#[macro_use]
1212
mod macros;
1313

14-
#[cfg(test)]
15-
mod tests;
16-
1714
pub use result::*;
1815
pub use query_source::{QuerySource, Queriable, Table, Column, JoinTo};
1916
pub use connection::Connection;

src/tests/mod.rs

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/tests/schema.rs

Lines changed: 0 additions & 127 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use super::schema::*;
1+
use schema::*;
22

33
#[test]
44
fn find() {
5-
use tests::schema::users::table as users;
5+
use schema::users::table as users;
66

77
let connection = connection();
88
setup_users_table(&connection);
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::schema::*;
22

33
#[test]
44
fn insert_records() {
5-
use tests::schema::users::table as users;
5+
use schema::users::table as users;
66
let connection = connection();
77
setup_users_table(&connection);
88

@@ -24,7 +24,7 @@ fn insert_records() {
2424

2525
#[test]
2626
fn insert_with_defaults() {
27-
use tests::schema::users::table as users;
27+
use schema::users::table as users;
2828
let connection = connection();
2929
connection.execute("CREATE TABLE users (
3030
id SERIAL PRIMARY KEY,
@@ -49,7 +49,7 @@ fn insert_with_defaults() {
4949

5050
#[test]
5151
fn insert_with_defaults_not_provided() {
52-
use tests::schema::users::table as users;
52+
use schema::users::table as users;
5353
let connection = connection();
5454
connection.execute("CREATE TABLE users (
5555
id SERIAL PRIMARY KEY,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::schema::*;
2-
use {Table, QuerySource};
2+
use yaqb::{Table, QuerySource};
33

44
#[test]
55
fn belongs_to() {

tests/lib.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
#[macro_use]
22
extern crate yaqb;
33

4-
mod compile_tests;
4+
mod find;
5+
mod insert;
6+
mod joins;
57
mod macros;
68
mod schema;
9+
mod select;
710
mod types;
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::schema::*;
2-
use {types, QuerySource};
2+
use yaqb::{types, QuerySource};
33

44
#[test]
55
fn selecting_basic_data() {
@@ -35,8 +35,8 @@ fn selecting_a_struct() {
3535

3636
#[test]
3737
fn with_safe_select() {
38-
use tests::schema::users::columns::*;
39-
use tests::schema::users::table as users;
38+
use schema::users::columns::*;
39+
use schema::users::table as users;
4040

4141
let connection = connection();
4242
setup_users_table(&connection);
@@ -56,8 +56,8 @@ fn with_safe_select() {
5656

5757
#[test]
5858
fn selecting_multiple_columns() {
59-
use tests::schema::users::columns::*;
60-
use tests::schema::users::table as users;
59+
use schema::users::columns::*;
60+
use schema::users::table as users;
6161

6262
let connection = connection();
6363
setup_users_table(&connection);
@@ -77,8 +77,8 @@ fn selecting_multiple_columns() {
7777

7878
#[test]
7979
fn selecting_multiple_columns_into_struct() {
80-
use tests::schema::users::columns::*;
81-
use tests::schema::users::table as users;
80+
use schema::users::columns::*;
81+
use schema::users::table as users;
8282

8383
let connection = connection();
8484
setup_users_table(&connection);
@@ -116,8 +116,8 @@ fn with_select_sql() {
116116

117117
#[test]
118118
fn selecting_nullable_followed_by_non_null() {
119-
use tests::schema::users::columns::*;
120-
use tests::schema::users::table as users;
119+
use schema::users::columns::*;
120+
use schema::users::table as users;
121121

122122
let connection = connection();
123123
setup_users_table(&connection);

0 commit comments

Comments
 (0)