Return-Path: Delivered-To: apmail-incubator-deltacloud-commits-archive@minotaur.apache.org Received: (qmail 84329 invoked from network); 11 Mar 2011 11:45:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Mar 2011 11:45:19 -0000 Received: (qmail 60884 invoked by uid 500); 11 Mar 2011 11:45:19 -0000 Delivered-To: apmail-incubator-deltacloud-commits-archive@incubator.apache.org Received: (qmail 60862 invoked by uid 500); 11 Mar 2011 11:45:19 -0000 Mailing-List: contact deltacloud-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: deltacloud-dev@incubator.apache.org Delivered-To: mailing list deltacloud-commits@incubator.apache.org Received: (qmail 60855 invoked by uid 99); 11 Mar 2011 11:45:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Mar 2011 11:45:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Mar 2011 11:45:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0B5E02388A38; Fri, 11 Mar 2011 11:44:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1080537 - in /incubator/deltacloud/trunk/server: lib/sinatra/rack_matrix_params.rb tests/drivers/mock/api_test.rb Date: Fri, 11 Mar 2011 11:44:54 -0000 To: deltacloud-commits@incubator.apache.org From: mfojtik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110311114454.0B5E02388A38@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mfojtik Date: Fri Mar 11 11:44:53 2011 New Revision: 1080537 URL: http://svn.apache.org/viewvc?rev=1080537&view=rev Log: Added unit tests for matrix params and driver switching Modified: incubator/deltacloud/trunk/server/lib/sinatra/rack_matrix_params.rb incubator/deltacloud/trunk/server/tests/drivers/mock/api_test.rb Modified: incubator/deltacloud/trunk/server/lib/sinatra/rack_matrix_params.rb URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/sinatra/rack_matrix_params.rb?rev=1080537&r1=1080536&r2=1080537&view=diff ============================================================================== --- incubator/deltacloud/trunk/server/lib/sinatra/rack_matrix_params.rb (original) +++ incubator/deltacloud/trunk/server/lib/sinatra/rack_matrix_params.rb Fri Mar 11 11:44:53 2011 @@ -40,8 +40,8 @@ module Rack # regular
parameters. def call(env) - # Return if this header is not set properly (Rack::Test case...) - return @app.call(env) unless env['REQUEST_URI'] + # Copy PATH_INFO to REQUEST_URI if Rack::Test + env['REQUEST_URI'] = env['PATH_INFO'] if env['rack.test'] # Split URI to components and then extract ;var=value pairs uri_components = env['REQUEST_URI'].split('/') Modified: incubator/deltacloud/trunk/server/tests/drivers/mock/api_test.rb URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/tests/drivers/mock/api_test.rb?rev=1080537&r1=1080536&r2=1080537&view=diff ============================================================================== --- incubator/deltacloud/trunk/server/tests/drivers/mock/api_test.rb (original) +++ incubator/deltacloud/trunk/server/tests/drivers/mock/api_test.rb Fri Mar 11 11:44:53 2011 @@ -89,5 +89,16 @@ module DeltacloudUnitTest (last_xml_response/'api/drivers/driver[@id=ec2]/entrypoints/entrypoint').first.text.should_not == "" end + def test_it_supports_matrix_params + do_xml_request "/api;driver=ec2" + last_response.status.should == 200 + (last_xml_response/'api').first[:driver].should == 'ec2' + do_xml_request "/api;driver=mock" + (last_xml_response/'api').first[:driver].should == 'mock' + do_xml_request "/api;driver=ec2/hardware_profiles" + (last_xml_response/'hardware_profiles/hardware_profile/@id').map {|n| n.to_s}.include?('m1.small').should == true + last_response.status.should == 200 + end + end end