X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F89dbicadmin.t;h=53930c2c46002c17fa5cbe8dbdd22c66d5dce264;hb=ff1234ad5a7e8074d1d6006f55f5a2add8a23fb7;hp=229ade71ce07bab7d9c1a0dde654172d53ef2af9;hpb=2f3f9d21d595529c001e99f526df59e899b84f7a;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/89dbicadmin.t b/t/89dbicadmin.t
index 229ade7..53930c2 100644
--- a/t/89dbicadmin.t
+++ b/t/89dbicadmin.t
@@ -21,7 +21,6 @@ my $tests_per_run = 5;
 
 plan tests => $tests_per_run * @json_backends;
 
-use JSON::Any;
 for my $js (@json_backends) {
 
     eval {JSON::Any->import ($js) };
@@ -38,25 +37,53 @@ sub test_dbicadmin {
     my $schema = DBICTest->init_schema( sqlite_use_file => 1 );  # reinit a fresh db for every run
 
     my $employees = $schema->resultset('Employee');
-    my @cmd = ($^X, qw|script/dbicadmin --quiet --schema=DBICTest::Schema --class=Employee --tlibs|, q|--connect=["dbi:SQLite:dbname=t/var/DBIxClass.db","","",{"AutoCommit":1}]|, qw|--force --tlibs|);
 
-    system(@cmd, qw|--op=insert --set={"name":"Matt"}|);
-    ok( ($employees->count()==1), 'insert count' );
+    system( _prepare_system_args( qw|--op=insert --set={"name":"Matt"}| ) );
+    ok( ($employees->count()==1), "$ENV{JSON_ANY_ORDER}: insert count" );
 
     my $employee = $employees->find(1);
-    ok( ($employee->name() eq 'Matt'), 'insert valid' );
+    ok( ($employee->name() eq 'Matt'), "$ENV{JSON_ANY_ORDER}: insert valid" );
 
-    system(@cmd, qw|--op=update --set={"name":"Trout"}|);
+    system( _prepare_system_args( qw|--op=update --set={"name":"Trout"}| ) );
     $employee = $employees->find(1);
-    ok( ($employee->name() eq 'Trout'), 'update' );
+    ok( ($employee->name() eq 'Trout'), "$ENV{JSON_ANY_ORDER}: update" );
 
-    system(@cmd, qw|--op=insert --set={"name":"Aran"}|);
+    system( _prepare_system_args( qw|--op=insert --set={"name":"Aran"}| ) );
 
-    open(my $fh, "-|", @cmd, qw|--op=select --attrs={"order_by":"name"}|) or die $!;
-    my $data = do { local $/; <$fh> };
-    close($fh);
-    ok( ($data=~/Aran.*Trout/s), 'select with attrs' );
+    SKIP: {
+        skip ("MSWin32 doesn't support -| either", 1) if $^O eq 'MSWin32';
+
+        open(my $fh, "-|",  _prepare_system_args( qw|--op=select --attrs={"order_by":"name"}| ) ) or die $!;
+        my $data = do { local $/; <$fh> };
+        close($fh);
+        ok( ($data=~/Aran.*Trout/s), "$ENV{JSON_ANY_ORDER}: select with attrs" );
+    }
+
+    system( _prepare_system_args( qw|--op=delete --where={"name":"Trout"}| ) );
+    ok( ($employees->count()==1), "$ENV{JSON_ANY_ORDER}: delete" );
+}
+
+# Why do we need this crap? Apparently MSWin32 can not pass through quotes properly
+# (sometimes it will and sometimes not, depending on what compiler was used to build
+# perl). So we go the extra mile to escape all the quotes. We can't also use ' instead
+# of ", because JSON::XS (proudly) does not support "malformed JSON" as the author
+# calls it. Bleh.
+#
+sub _prepare_system_args {
+    my $perl = $^X;
+    my @args = (
+        qw|script/dbicadmin --quiet --schema=DBICTest::Schema --class=Employee --tlibs|,
+        q|--connect=["dbi:SQLite:dbname=t/var/DBIxClass.db","","",{"AutoCommit":1}]|,
+        qw|--force --tlibs|,
+        @_,
+    );
+
+    if ( $^O eq 'MSWin32' ) {
+        $perl = qq|"$perl"|;    # execution will fail if $^X contains paths
+        for (@args) {
+            $_ =~ s/"/\\"/g;
+        }
+    }
 
-    system(@cmd, qw|--op=delete --where={"name":"Trout"}|);
-    ok( ($employees->count()==1), 'delete' );
+    return ($perl, @args);
 }