more work on components, base classes, and resultset_components - still broken in...

[dbsrgits/DBIx-Class-Schema-Loader.git] / t / lib / dbixcsl_common_tests.pm

diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm
index 32c9076..b89ba30 100644 (file)
--- a/t/lib/dbixcsl_common_tests.pm
+++ b/t/lib/dbixcsl_common_tests.pm
@@ -54,8 +54,8 @@ sub run_tests {
         additional_classes      => 'TestAdditional',
         additional_base_classes => 'TestAdditionalBase',
         left_base_classes       => [ qw/TestLeftBase/ ],
-       components              => [ qw/TestComponent/ ],
-       resultset_components    => [ qw/TestRSComponent/ ],
+        components              => [ qw/TestComponent/ ],
+        resultset_components    => [ qw/TestRSComponent/ ],
         debug                   => $debug,
     );
 
@@ -87,56 +87,56 @@ sub run_tests {
 
     {
         my ($skip_tab, $skip_tabo, $skip_taba, $skip_cmeth,
-           $skip_rsmeth, $skip_tcomp, $skip_trscomp);
+            $skip_rsmeth, $skip_tcomp, $skip_trscomp);
 
         can_ok( $class1, 'test_additional_base' ) or $skip_tab = 1;
         can_ok( $class1, 'test_additional_base_override' ) or $skip_tabo = 1;
         can_ok( $class1, 'test_additional_base_additional' ) or $skip_taba = 1;
-       can_ok( $class1, 'dbix_class_testcomponent' ) or $skip_tcomp = 1;
-       can_ok( $class1, 'dbix_class_testrscomponent' ) or $skip_trscomp = 1;
+        can_ok( $class1, 'dbix_class_testcomponent' ) or $skip_tcomp = 1;
+        can_ok( $rsobj1, 'dbix_class_testrscomponent' ) or $skip_trscomp = 1;
         can_ok( $class1, 'loader_test1_classmeth' ) or $skip_cmeth = 1;
         can_ok( $rsobj1, 'loader_test1_rsmeth' ) or $skip_rsmeth = 1;
 
         SKIP: {
-           skip "Pre-requisite test failed", 1 if $skip_tab;
+            skip "Pre-requisite test failed", 1 if $skip_tab;
             is( $class1->test_additional_base, "test_additional_base",
                 "Additional Base method" );
-       }
+        }
 
         SKIP: {
-           skip "Pre-requisite test failed", 1 if $skip_tabo;
+            skip "Pre-requisite test failed", 1 if $skip_tabo;
             is( $class1->test_additional_base_override,
-               "test_left_base_override",
+                "test_left_base_override",
                 "Left Base overrides Additional Base method" );
         }
 
         SKIP: {
-           skip "Pre-requisite test failed", 1 if $skip_taba;
+            skip "Pre-requisite test failed", 1 if $skip_taba;
             is( $class1->test_additional_base_additional, "test_additional",
                 "Additional Base can use Additional package method" );
         }
 
-       SKIP: {
-           skip "Pre-requisite test failed", 1 if $skip_tcomp;
+        SKIP: {
+            skip "Pre-requisite test failed", 1 if $skip_tcomp;
             is( $class1->dbix_class_testcomponent,
-               'dbix_class_testcomponent works' );
-       }
+                'dbix_class_testcomponent works' );
+        }
 
-       SKIP: {
-           skip "Pre-requisite test failed", 1 if $skip_trscomp;
+        SKIP: {
+            skip "Pre-requisite test failed", 1 if $skip_trscomp;
             is( $rsobj1->dbix_class_testrscomponent,
-               'dbix_class_testrscomponent works' );
-       }
+                'dbix_class_testrscomponent works' );
+        }
 
-       SKIP: {
-           skip "Pre-requisite test failed", 1 if $skip_cmeth;
+        SKIP: {
+            skip "Pre-requisite test failed", 1 if $skip_cmeth;
             is( $class1->loader_test1_classmeth, 'all is well' );
-       }
+        }
 
-       SKIP: {
-           skip "Pre-requisite test failed", 1 if $skip_rsmeth;
+        SKIP: {
+            skip "Pre-requisite test failed", 1 if $skip_rsmeth;
             is( $rsobj1->loader_test1_rsmeth, 'all is still well' );
-       }
+        }
     }
 
 
@@ -191,9 +191,9 @@ sub run_tests {
         my $obj4 = $rsobj4->find(123);
         isa_ok( $obj4->fkid, $class3);
 
-       my $obj3 = $rsobj3->find(1);
-       my $rs_rel4 = $obj3->search_related('loader_test4s');
-       isa_ok( $rs_rel4->first, $class4);
+        my $obj3 = $rsobj3->find(1);
+        my $rs_rel4 = $obj3->search_related('loader_test4s');
+        isa_ok( $rs_rel4->first, $class4);
 
         # fk def in comments should not be parsed
         my $obj5 = $rsobj5->find( id1 => 1, id2 => 1 );