Fix borked tests

diff --git a/t/10_adjacencylist.t b/t/10_adjacencylist.t
index 42b80cf..61fe503 100644 (file)
--- a/t/10_adjacencylist.t
+++ b/t/10_adjacencylist.t
@@ -4,13 +4,19 @@ use warnings;
 use lib 't/lib';
 
 use Test::More;
-use TreeTest;
 
-TreeTest::Schema::Node->load_components(qw(
+BEGIN {   # This must happen before the schema is loaded
+
+  require TreeTest::Schema::Node;
+
+  TreeTest::Schema::Node->load_components(qw(
     Tree::AdjacencyList
-));
+  ));
 
-TreeTest::Schema::Node->parent_column( 'parent_id' );
+  TreeTest::Schema::Node->parent_column( 'parent_id' );
+}
+
+use TreeTest;
 
 my $tests = TreeTest::count_tests();
 plan tests => $tests;

diff --git a/t/11_adjacencylist_ordered.t b/t/11_adjacencylist_ordered.t
index 6c1419e..372c8b4 100644 (file)
--- a/t/11_adjacencylist_ordered.t
+++ b/t/11_adjacencylist_ordered.t
@@ -4,15 +4,20 @@ use warnings;
 use lib 't/lib';
 
 use Test::More;
-use TreeTest;
 
-TreeTest::Schema::Node->load_components(qw(
+BEGIN {   # This must happen before the schema is loaded 
+
+  require TreeTest::Schema::Node;
+
+  TreeTest::Schema::Node->load_components(qw(
     Tree::AdjacencyList::Ordered
-));
+  ));
 
-TreeTest::Schema::Node->position_column( 'position' );
-TreeTest::Schema::Node->parent_column( 'parent_id' );
+  TreeTest::Schema::Node->position_column( 'position' );
+  TreeTest::Schema::Node->parent_column( 'parent_id' );
+}
 
+use TreeTest;
 my $tests = TreeTest::count_tests();
 plan tests => $tests;
 TreeTest::run_tests();