Fixes tests to assume orthogonality between query keywords/params

diff --git a/t/aggregate/live_engine_request_parameters.t b/t/aggregate/live_engine_request_parameters.t
index c7b4611..aecdf11 100644 (file)
--- a/t/aggregate/live_engine_request_parameters.t
+++ b/t/aggregate/live_engine_request_parameters.t
@@ -115,14 +115,21 @@ use HTTP::Request::Common;
 {
     my $creq;
     
-    my $parameters = {
+    my $body_parameters = {
         a     => 1,
         blank => '',
     };
+    my $query_parameters = {
+      'query string' => undef
+    };
+    my $parameters = {
+      %$body_parameters,
+      %$query_parameters
+    };
 
     my $request = POST(
         'http://localhost/dump/request/a/b?query+string',
-        'Content'      => $parameters,
+        'Content'      => $body_parameters,
         'Content-Type' => 'application/x-www-form-urlencoded'
     );
     
@@ -130,6 +137,8 @@ use HTTP::Request::Common;
     ok( eval '$creq = ' . $response->content, 'Unserialize Catalyst::Request' );
     is( $creq->uri->query, 'query+string', 'Catalyst::Request POST query_string' );
     is( $creq->query_keywords, 'query string', 'Catalyst::Request query_keywords' );
+    is( $creq->query_parameters, $query_parameters, 'Catalyst::Request query_parameters' );
+    is( $creq->body_parameters, $body_parameters, 'Catalyst::Request body_parameters' );
     is_deeply( $creq->parameters, $parameters, 'Catalyst::Request parameters' );
     
     ok( $response = request('http://localhost/dump/request/a/b?x=1&y=1&z=1'), 'Request' );

diff --git a/t/query_keywords_and_parameters.t b/t/query_keywords_and_parameters.t
index 29e0093..27e598b 100644 (file)
--- a/t/query_keywords_and_parameters.t
+++ b/t/query_keywords_and_parameters.t
@@ -42,7 +42,7 @@ use Catalyst::Test 'MyApp';
 
   my ($res, $c) = ctx_request($req);
 
-  is $c->req->query_keywords, '', 'query_keywords is not defined with empty query string';
+  ok !defined $c->req->query_keywords, 'query_keywords is not defined when ? with empty query string';
   is_deeply $c->req->query_parameters, {}, 'query_parameters defined, but empty with empty query string';
 }