ruby-jmeter 2.1.7 → 2.11.0

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p448
+1.9.3-p484

data/README.md

@@ -1,8 +1,11 @@
 # RubyJmeter
 
+[![Build Status](https://travis-ci.org/flood-io/ruby-jmeter.png)](https://travis-ci.org/flood-io/ruby-jmeter)
+[![Code Climate](https://codeclimate.com/github/flood-io/ruby-jmeter.png)](https://codeclimate.com/github/flood-io/ruby-jmeter)
+
 Tired of using the JMeter GUI or looking at hairy XML files?
 
-This gem lets you write test plans for JMeter in your favourite text editor, and optionally run them on [flood.io](http://flood.io). 
+This gem lets you write test plans for JMeter in your favourite text editor, and optionally run them on [flood.io](http://flood.io).
 
 ## Installation
 
@@ -32,7 +35,7 @@ test do
 end.jmx
 ```
 
-So in this example, we just created a test plan, with 10 threads, each of which visited the search page at Google. 
+So in this example, we just created a test plan, with 10 threads, each of which visited the search page at Google.
 
 ### Generating a JMeter Test Plan (JMX)
 Note also how we called the `jmx` method of the test. Calling this method will write the contents of the JMeter test plan to file like this.
@@ -89,9 +92,9 @@ test do
     visit name: 'Google Search', url: 'http://google.com'
   end
 end.run(
-  path: '/usr/share/jmeter/bin/', 
-  file: 'jmeter.jmx', 
-  log: 'jmeter.log', 
+  path: '/usr/share/jmeter/bin/',
+  file: 'jmeter.jmx',
+  log: 'jmeter.log',
   jtl: 'results.jtl')
 ```
 
@@ -102,16 +105,16 @@ You can also execute JMeter test plans on flood.io using our API. To do so, you
 To execute the test on flood.io, call the `grid` method on the test and pass it the API token like this.
 
 ```ruby
-test do  
+test do
   threads count: 10 do
     visit name: 'Google Search', url: 'http://google.com'
-  end  
+  end
 end.grid('OxtZ-4v-v0koSz5Y0enEQQ')
 ```
 
 This will then provide you with a link to the live test results on flood.io like this.
 
-``` 
+```
 Results at: http://prod.flood.io/shared?testguid=73608030311611e2962f123141011033&run_id=339&tags=jmeter&domain=altentee.com&cluster=54.251.48.129&status=running&view=
 ```
 
@@ -148,7 +151,7 @@ threads count: 100
 threads count: 100, continue_forever: true
 threads count: 100, loops: 10
 threads count: 100, rampup: 30, duration: 60
-threads count: 100, scheduler: true, 
+threads count: 100, scheduler: true,
   start_time: Time.now.to_i * 1000,
   end_time:   (Time.now.to_i * 1000) + (3600 * 1000)
 ```
@@ -222,15 +225,15 @@ You can use the `visit` method to navigate to pages:
 ```ruby
 visit name: 'Google Search', url: 'http://google.com'
 visit name: 'Google Search', url: 'http://google.com'
-visit name: 'Google Search', url: 'http://google.com', 
-  method: 'POST', 
+visit name: 'Google Search', url: 'http://google.com',
+  method: 'POST',
   'DO_MULTIPART_POST': 'true'
 visit name: 'Google Search', url: 'http://google.com',
   use_keepalive: 'false'
-visit name: 'Google Search', url: 'http://google.com', 
+visit name: 'Google Search', url: 'http://google.com',
   connect_timeout: '1000',
   response_timeout: '60000'
-visit name: 'View Login', url: '/login', 
+visit name: 'View Login', url: '/login',
   protocol: "https",
   port: 443
 ```
@@ -287,10 +290,10 @@ visit name: "Altentee", url: "http://altentee.com" do
   extract regex: "content='(.+?)' name='csrf-token'", name: 'csrf-token'
   extract regex: 'value="(.+?)" name="JESSIONSID"', name: 'JSESSIONID'
   web_reg_save_param regex: 'value="(.+?)" name="VIEWSTATE"', name: 'VIEWSTATE'
-  extract name: 'username', regex: 'value="(.+?)", name="username"', 
+  extract name: 'username', regex: 'value="(.+?)", name="username"',
     default: 'Tim Koopmans',
     match_number: 1
-  extract name: 'shopping_item', regex: 'id="(.+?)" name="book"', 
+  extract name: 'shopping_item', regex: 'id="(.+?)" name="book"',
     match_number: 0 # random
 end
 ```
@@ -306,7 +309,7 @@ end
 ```
 
 
-This method takes 3 parameters: the matching rule, the test string, and an optional parameters hash. This is based on the [Response Assertion](http://jmeter.apache.org/usermanual/component_reference.html#Response_Assertion). 
+This method takes 3 parameters: the matching rule, the test string, and an optional parameters hash. This is based on the [Response Assertion](http://jmeter.apache.org/usermanual/component_reference.html#Response_Assertion).
 
 ```ruby
 visit "Altentee", "http://altentee.com" do

data/examples/basic_meta_fu.rb

@@ -0,0 +1,63 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'ruby-jmeter'
+
+class Test
+  def initialize options = {}
+    @users    = options[:users]
+    @ramp     = options[:ramp]
+    @duration = options[:duration]
+    @region   = options[:region] || 'ap-southeast-2'
+    @name     = options[:name]
+  end
+
+  def flood domain
+    @domain = domain
+    test_plan.grid ENV['FLOOD_IO_KEY'], region: @region, name: @name
+  end
+
+  def jmeter domain
+    @domain = domain
+    test_plan.run path: '/usr/share/jmeter/bin/', gui:true
+  end
+
+  def test_plan
+    test do
+      grab_dsl self
+      defaults domain: @domain,
+        protocol: 'http',
+        image_parser: true,
+        concurrentDwn: true,
+        concurrentPool: 4
+
+      cookies
+
+      plan
+    end
+  end
+
+  def plan
+    threads @users, {ramp_time: @ramp, duration: @duration, scheduler: true, continue_forever: true} do
+      random_timer 5000, 10000
+
+      transaction '01_GET_home_page' do
+        visit '/'
+      end
+    end
+  end
+
+  def grab_dsl dsl
+    @dsl = dsl
+  end
+
+  def method_missing method, *args, &block
+    @dsl.__send__ method, *args, &block
+  end
+end
+
+test = Test.new users:10, ramp: 30, duration: 30, name: 'Test Number 1'
+
+# test locally with JMeter
+test.jmeter 'google.com'
+
+# test distributed with flood
+# test.flood 'google.com'

data/examples/basic_preprocessor_user_parameters.rb

@@ -0,0 +1,21 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'ruby-jmeter'
+
+test do
+  # user parameters with multiple values
+  visit name: 'Home Page', url: 'http://google.com/' do
+    user_parameters names: ['name1', 'name2'],
+      thread_values: {
+        user_1: [
+          'value1',
+          'value2'
+        ],
+
+        user_2: [
+          'value1',
+          'value2'
+        ]
+      }
+  end
+# end.run(path: '/usr/share/jmeter/bin/', gui: true)
+end.out

data/lib/ruby-jmeter/dsl.rb

@@ -156,10 +156,10 @@ module RubyJmeter
       params[:url] = params[:key] if URI.parse(URI::encode(params[:key])).scheme
 
       params[:url] = if params[:host]
-        "http://#{params[:host]}:8080/#{params[:command]}/#{params[:key]}?type=text"
+        "http://#{params[:host]}/data/#{params[:command]}/#{params[:key]}?type=text"
       end
 
-      params[:url] = 'http://54.252.206.143:8080/' if params[:stub]
+      params[:url] = 'http://54.252.206.143/data/' if params[:stub]
 
       get name: '__testdata', url: params[:url] do
         extract name: params[:name],
@@ -252,6 +252,34 @@ module RubyJmeter
     ##
     # Other Elements
 
+    def user_parameters(params, &block)
+      if params.is_a?(Hash)
+        params['Argument.name'] = params[:name]
+      end
+
+      params[:names] = Nokogiri::XML::Builder.new do |b|
+        b.builder do
+          params[:names].each do |name|
+            b.stringProp name, name: name
+          end
+        end
+      end
+
+      params[:thread_values] = Nokogiri::XML::Builder.new do |b|
+        b.builder do
+          params[:thread_values].map do |user, values|
+            b.collectionProp name: user do
+              values.each_with_index.map do |value, index|
+                b.stringProp value, name: index
+              end
+            end
+          end
+        end
+      end
+
+      super
+    end
+
     alias_method :bsh_pre, :beanshell_preprocessor
 
     alias_method :bsh_post, :beanshell_postprocessor
@@ -284,7 +312,7 @@ module RubyJmeter
 
     def response_assertion(params={}, &block)
       params[:test_type] = parse_test_type(params)
-      params[:match] = params.values.first
+      params["0"] = params.values.first
       node = RubyJmeter::ResponseAssertion.new(params)
       node.doc.xpath("//stringProp[@name='Assertion.scope']").remove if
         params[:scope] == 'main' || params['scope'] == 'main'
@@ -405,7 +433,7 @@ module RubyJmeter
         response = RestClient.post "#{params[:endpoint] ? params[:endpoint] : 'https://api.flood.io'}/floods?auth_token=#{token}",
         {
           :flood => {
-            :tool => 'jmeter-2.9',
+            :tool => 'jmeter-2.11',
             :url => params[:url],
             :name => params[:name],
             :notes => params[:notes],

data/lib/ruby-jmeter/dsl/constant_throughput_timer.rb

@@ -14,7 +14,7 @@ module RubyJmeter
       testname = params.kind_of?(Array) ? 'ConstantThroughputTimer' : (params[:name] || 'ConstantThroughputTimer')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
 <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="#{testname}" enabled="true">
-  <stringProp name="calcMode">this thread only</stringProp>
+  <intProp name="calcMode">0</intProp>
   <doubleProp>
     <name>throughput</name>
     <value>0.0</value>

data/lib/ruby-jmeter/dsl/csv_data_set_config.rb

@@ -19,7 +19,7 @@ module RubyJmeter
   <stringProp name="filename"/>
   <boolProp name="quotedData">false</boolProp>
   <boolProp name="recycle">true</boolProp>
-  <stringProp name="shareMode">All threads</stringProp>
+  <stringProp name="shareMode">shareMode.all</stringProp>
   <boolProp name="stopThread">false</boolProp>
   <stringProp name="variableNames"/>
 </CSVDataSet>)

data/lib/ruby-jmeter/dsl/http_request.rb

@@ -29,9 +29,9 @@ module RubyJmeter
   <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
   <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
   <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+  <stringProp name="HTTPSampler.implementation"/>
   <boolProp name="HTTPSampler.monitor">false</boolProp>
   <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="HTTPSampler.implementation"/>
 </HTTPSamplerProxy>)
       EOS
       update params

data/lib/ruby-jmeter/dsl/http_request_defaults.rb

@@ -24,17 +24,11 @@ module RubyJmeter
   <stringProp name="HTTPSampler.protocol"/>
   <stringProp name="HTTPSampler.contentEncoding"/>
   <stringProp name="HTTPSampler.path">/</stringProp>
-  <stringProp name="HTTPSampler.method">GET</stringProp>
-  <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-  <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-  <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-  <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-  <boolProp name="HTTPSampler.monitor">false</boolProp>
-  <boolProp name="HTTPSampler.image_parser">false</boolProp>
-  <stringProp name="HTTPSampler.embedded_url_re"/>
-  <boolProp name="HTTPSampler.concurrentDwn">false</boolProp>
-  <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
   <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
+  <boolProp name="HTTPSampler.image_parser">true</boolProp>
+  <boolProp name="HTTPSampler.concurrentDwn">true</boolProp>
+  <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+  <stringProp name="HTTPSampler.embedded_url_re"> </stringProp>
 </ConfigTestElement>)
       EOS
       update params

data/lib/ruby-jmeter/dsl/if_controller.rb

@@ -16,7 +16,7 @@ module RubyJmeter
 <IfController guiclass="IfControllerPanel" testclass="IfController" testname="#{testname}" enabled="true">
   <stringProp name="IfController.condition"/>
   <boolProp name="IfController.evaluateAll">false</boolProp>
-  <boolProp name="IfController.useExpression">false</boolProp>
+  <boolProp name="IfController.useExpression">true</boolProp>
 </IfController>)
       EOS
       update params

data/lib/ruby-jmeter/dsl/jdbc_postprocessor.rb

@@ -21,6 +21,7 @@ module RubyJmeter
   <stringProp name="queryType">Select Statement</stringProp>
   <stringProp name="resultVariable"/>
   <stringProp name="variableNames"/>
+  <stringProp name="queryTimeout"/>
 </JDBCPostProcessor>)
       EOS
       update params

data/lib/ruby-jmeter/dsl/jdbc_preprocessor.rb

@@ -21,6 +21,7 @@ module RubyJmeter
   <stringProp name="queryType">Select Statement</stringProp>
   <stringProp name="resultVariable"/>
   <stringProp name="variableNames"/>
+  <stringProp name="queryTimeout"/>
 </JDBCPreProcessor>)
       EOS
       update params

data/lib/ruby-jmeter/dsl/jdbc_request.rb

@@ -21,6 +21,7 @@ module RubyJmeter
   <stringProp name="queryType">Select Statement</stringProp>
   <stringProp name="resultVariable"/>
   <stringProp name="variableNames"/>
+  <stringProp name="queryTimeout"/>
 </JDBCSampler>)
       EOS
       update params

data/lib/ruby-jmeter/dsl/jms_pointtopoint.rb

@@ -27,8 +27,14 @@ module RubyJmeter
   <elementProp name="JMSSampler.jndiProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{testname}" enabled="true">
     <collectionProp name="Arguments.arguments"/>
   </elementProp>
-  <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{testname}" enabled="true">
-    <collectionProp name="Arguments.arguments"/>
+  <elementProp name="arguments" elementType="JMSProperties">
+    <collectionProp name="JMSProperties.properties">
+      <elementProp name="" elementType="JMSProperty">
+        <stringProp name="JMSProperty.name"> </stringProp>
+        <stringProp name="JMSProperty.value"/>
+        <stringProp name="JMSProperty.type">java.lang.String</stringProp>
+      </elementProp>
+    </collectionProp>
   </elementProp>
 </JMSSampler>)
       EOS

data/lib/ruby-jmeter/dsl/jms_publisher.rb

@@ -28,8 +28,14 @@ module RubyJmeter
   <stringProp name="jms.config_msg_type">jms_text_message</stringProp>
   <stringProp name="jms.iterations">1</stringProp>
   <boolProp name="jms.authenticate">false</boolProp>
-  <elementProp name="jms.jmsProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{testname}" enabled="true">
-    <collectionProp name="Arguments.arguments"/>
+  <elementProp name="jms.jmsProperties" elementType="JMSProperties">
+    <collectionProp name="JMSProperties.properties">
+      <elementProp name="" elementType="JMSProperty">
+        <stringProp name="JMSProperty.name"> </stringProp>
+        <stringProp name="JMSProperty.value"/>
+        <stringProp name="JMSProperty.type">java.lang.String</stringProp>
+      </elementProp>
+    </collectionProp>
   </elementProp>
 </PublisherSampler>)
       EOS

data/lib/ruby-jmeter/dsl/keystore_configuration.rb

@@ -17,6 +17,7 @@ module RubyJmeter
   <stringProp name="endIndex"/>
   <stringProp name="preload">True</stringProp>
   <stringProp name="startIndex"/>
+  <stringProp name="clientCertAliasVarName"/>
 </KeystoreConfig>)
       EOS
       update params

data/lib/ruby-jmeter/dsl/ldap_request_defaults.rb

@@ -17,18 +17,17 @@ module RubyJmeter
   <stringProp name="servername"/>
   <stringProp name="port"/>
   <stringProp name="rootdn"/>
-  <boolProp name="user_defined">false</boolProp>
+  <boolProp name="user_defined">true</boolProp>
   <stringProp name="test">add</stringProp>
   <stringProp name="base_entry_dn"/>
   <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{testname}" enabled="true">
     <collectionProp name="Arguments.arguments">
-      <elementProp name="testguid" elementType="Argument">
-        <stringProp name="Argument.name"/>
-        <stringProp name="Argument.value"/>
+      <elementProp name=" " elementType="Argument">
+        <stringProp name="Argument.name"> </stringProp>
+        <stringProp name="Argument.value"> </stringProp>
         <stringProp name="Argument.metadata">=</stringProp>
       </elementProp>
     </collectionProp>
-    <stringProp name="TestPlan.comments"/>
   </elementProp>
 </ConfigTestElement>)
       EOS

data/lib/ruby-jmeter/dsl/loop_controller.rb

@@ -15,7 +15,7 @@ module RubyJmeter
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
 <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="#{testname}" enabled="true">
   <boolProp name="LoopController.continue_forever">true</boolProp>
-  <intProp name="LoopController.loops">1</intProp>
+  <stringProp name="LoopController.loops">1</stringProp>
 </LoopController>)
       EOS
       update params

data/lib/ruby-jmeter/dsl/response_assertion.rb

@@ -15,11 +15,11 @@ module RubyJmeter
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
 <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="#{testname}" enabled="true">
   <collectionProp name="Asserion.test_strings">
-    <stringProp name="match"/>
+    <stringProp name="0"/>
   </collectionProp>
   <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
   <boolProp name="Assertion.assume_success">false</boolProp>
-  <intProp name="Assertion.test_type">2</intProp>
+  <intProp name="Assertion.test_type">16</intProp>
   <stringProp name="Assertion.scope">all</stringProp>
 </ResponseAssertion>)
       EOS

data/lib/ruby-jmeter/dsl/thread_group.rb

@@ -17,7 +17,7 @@ module RubyJmeter
   <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
   <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="#{testname}" enabled="true">
     <boolProp name="LoopController.continue_forever">false</boolProp>
-    <intProp name="LoopController.loops">1</intProp>
+    <intProp name="LoopController.loops">-1</intProp>
   </elementProp>
   <stringProp name="ThreadGroup.num_threads">1</stringProp>
   <stringProp name="ThreadGroup.ramp_time">1</stringProp>

data/lib/ruby-jmeter/dsl/user_defined_variables.rb

@@ -15,13 +15,14 @@ module RubyJmeter
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
 <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="#{testname}" enabled="true">
   <collectionProp name="Arguments.arguments">
-    <elementProp name="testguid" elementType="Argument">
-      <stringProp name="Argument.name"/>
-      <stringProp name="Argument.value"/>
+    <elementProp name=" " elementType="Argument">
+      <stringProp name="Argument.name"> </stringProp>
+      <stringProp name="Argument.value"> </stringProp>
       <stringProp name="Argument.metadata">=</stringProp>
+      <stringProp name="Argument.desc"> </stringProp>
     </elementProp>
   </collectionProp>
-  <stringProp name="TestPlan.comments"/>
+  <stringProp name="TestPlan.comments"> </stringProp>
 </Arguments>)
       EOS
       update params

data/lib/ruby-jmeter/dsl/user_parameters.rb

@@ -15,8 +15,7 @@ module RubyJmeter
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
 <UserParameters guiclass="UserParametersGui" testclass="UserParameters" testname="#{testname}" enabled="true">
   <collectionProp name="UserParameters.names"/>
-  <collectionProp name="UserParameters.thread_values">
-    <collectionProp name="1"/>
+  <collectionProp name="UserParameters.thread_values"/>
   </collectionProp>
   <boolProp name="UserParameters.per_iteration">false</boolProp>
 </UserParameters>)

data/lib/ruby-jmeter/helpers/helper.rb

@@ -22,7 +22,12 @@ module RubyJmeter
       else
         params.each do |name, value|
           node = @doc.children.xpath("//*[contains(@name,\"#{name.to_s}\")]")
-          node.first.content = value unless node.empty?
+          if value.class == Nokogiri::XML::Builder
+            node.first << value.doc.at_xpath('//builder').children
+          else
+            node.first.content = value unless node.empty?
+          end
+
         end
       end
     end
@@ -37,10 +42,11 @@ module RubyJmeter
       elements = @doc.at_xpath("//collectionProp/elementProp")
       params.each_with_index do |param, index|
         param.each do |name, value|
+          next unless elements && elements.element_children
           element = elements.element_children.xpath("//*[contains(@name,\"#{name}\")]")
           element.last.content = value
         end
-        if index != params.size - 1
+        if index != params.size - 1 && elements
            @doc.at_xpath("//collectionProp") << elements.dup
         end
       end

data/lib/ruby-jmeter/idl.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="2.4" jmeter="2.9 r1437961">
+<jmeterTestPlan version="1.2" properties="2.6" jmeter="2.11 r1554548">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
       <stringProp name="TestPlan.comments"></stringProp>
@@ -27,7 +27,7 @@
         <stringProp name="filename"></stringProp>
         <boolProp name="quotedData">false</boolProp>
         <boolProp name="recycle">true</boolProp>
-        <stringProp name="shareMode">All threads</stringProp>
+        <stringProp name="shareMode">shareMode.all</stringProp>
         <boolProp name="stopThread">false</boolProp>
         <stringProp name="variableNames"></stringProp>
       </CSVDataSet>
@@ -86,17 +86,11 @@
         <stringProp name="HTTPSampler.protocol"></stringProp>
         <stringProp name="HTTPSampler.contentEncoding"></stringProp>
         <stringProp name="HTTPSampler.path">/</stringProp>
-        <stringProp name="HTTPSampler.method">GET</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <boolProp name="HTTPSampler.image_parser">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-        <boolProp name="HTTPSampler.concurrentDwn">false</boolProp>
-        <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
         <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
+        <boolProp name="HTTPSampler.image_parser">true</boolProp>
+        <boolProp name="HTTPSampler.concurrentDwn">true</boolProp>
+        <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+        <stringProp name="HTTPSampler.embedded_url_re"> </stringProp>
       </ConfigTestElement>
       <hashTree/>
       <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Request Defaults" enabled="true">
@@ -167,6 +161,7 @@
         <stringProp name="endIndex"></stringProp>
         <stringProp name="preload">True</stringProp>
         <stringProp name="startIndex"></stringProp>
+        <stringProp name="clientCertAliasVarName"></stringProp>
       </KeystoreConfig>
       <hashTree/>
       <ConfigTestElement guiclass="LdapExtConfigGui" testclass="ConfigTestElement" testname="LDAP Extended Request Defaults" enabled="true">
@@ -194,18 +189,17 @@
         <stringProp name="servername"></stringProp>
         <stringProp name="port"></stringProp>
         <stringProp name="rootdn"></stringProp>
-        <boolProp name="user_defined">false</boolProp>
+        <boolProp name="user_defined">true</boolProp>
         <stringProp name="test">add</stringProp>
         <stringProp name="base_entry_dn"></stringProp>
         <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
           <collectionProp name="Arguments.arguments">
-              <elementProp name="testguid" elementType="Argument">
-              <stringProp name="Argument.name"></stringProp>
-              <stringProp name="Argument.value"></stringProp>
+            <elementProp name=" " elementType="Argument">
+              <stringProp name="Argument.name"> </stringProp>
+              <stringProp name="Argument.value"> </stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
             </elementProp>
           </collectionProp>
-          <stringProp name="TestPlan.comments"></stringProp>
         </elementProp>
       </ConfigTestElement>
       <hashTree/>
@@ -237,20 +231,21 @@
       <hashTree/>
       <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
         <collectionProp name="Arguments.arguments">
-          <elementProp name="testguid" elementType="Argument">
-            <stringProp name="Argument.name"></stringProp>
-            <stringProp name="Argument.value"></stringProp>
+          <elementProp name=" " elementType="Argument">
+            <stringProp name="Argument.name"> </stringProp>
+            <stringProp name="Argument.value"> </stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
+            <stringProp name="Argument.desc"> </stringProp>
           </elementProp>
         </collectionProp>
-        <stringProp name="TestPlan.comments"></stringProp>
+        <stringProp name="TestPlan.comments"> </stringProp>
       </Arguments>
       <hashTree/>
       <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
-          <intProp name="LoopController.loops">1</intProp>
+          <intProp name="LoopController.loops">-1</intProp>
         </elementProp>
         <stringProp name="ThreadGroup.num_threads">1</stringProp>
         <stringProp name="ThreadGroup.ramp_time">1</stringProp>
@@ -271,7 +266,7 @@
         <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
           <stringProp name="IfController.condition"></stringProp>
           <boolProp name="IfController.evaluateAll">false</boolProp>
-          <boolProp name="IfController.useExpression">false</boolProp>
+          <boolProp name="IfController.useExpression">true</boolProp>
         </IfController>
         <hashTree/>
         <IncludeController guiclass="IncludeControllerGui" testclass="IncludeController" testname="Include Controller" enabled="true">
@@ -280,7 +275,7 @@
         <hashTree/>
         <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">true</boolProp>
-          <intProp name="LoopController.loops">1</intProp>
+          <stringProp name="LoopController.loops">1</stringProp>
         </LoopController>
         <hashTree/>
         <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true"/>
@@ -340,7 +335,7 @@
         </BSFTimer>
         <hashTree/>
         <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="Constant Throughput Timer" enabled="true">
-          <stringProp name="calcMode">this thread only</stringProp>
+          <intProp name="calcMode">0</intProp>
           <doubleProp>
             <name>throughput</name>
             <value>0.0</value>
@@ -422,6 +417,7 @@
           <stringProp name="queryType">Select Statement</stringProp>
           <stringProp name="resultVariable"></stringProp>
           <stringProp name="variableNames"></stringProp>
+          <stringProp name="queryTimeout"></stringProp>
         </JDBCPreProcessor>
         <hashTree/>
         <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="JSR223 PreProcessor" enabled="true">
@@ -442,6 +438,7 @@
           <collectionProp name="UserParameters.names"/>
           <collectionProp name="UserParameters.thread_values">
             <collectionProp name="1"/>
+            <collectionProp name="1"/>
           </collectionProp>
           <boolProp name="UserParameters.per_iteration">false</boolProp>
         </UserParameters>
@@ -528,7 +525,6 @@
           <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
           <boolProp name="HTTPSampler.monitor">false</boolProp>
           <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          <stringProp name="HTTPSampler.implementation"></stringProp>
         </HTTPSamplerProxy>
         <hashTree/>
         <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Java Request" enabled="true">
@@ -587,6 +583,7 @@
           <stringProp name="queryType">Select Statement</stringProp>
           <stringProp name="resultVariable"></stringProp>
           <stringProp name="variableNames"></stringProp>
+          <stringProp name="queryTimeout"></stringProp>
         </JDBCSampler>
         <hashTree/>
         <JMSSampler guiclass="JMSSamplerGui" testclass="JMSSampler" testname="JMS Point-to-Point" enabled="true">
@@ -603,8 +600,14 @@
           <elementProp name="JMSSampler.jndiProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
-          <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
+          <elementProp name="arguments" elementType="JMSProperties">
+            <collectionProp name="JMSProperties.properties">
+              <elementProp name="" elementType="JMSProperty">
+                <stringProp name="JMSProperty.name"> </stringProp>
+                <stringProp name="JMSProperty.value"></stringProp>
+                <stringProp name="JMSProperty.type">java.lang.String</stringProp>
+              </elementProp>
+            </collectionProp>
           </elementProp>
         </JMSSampler>
         <hashTree/>
@@ -623,8 +626,14 @@
           <stringProp name="jms.config_msg_type">jms_text_message</stringProp>
           <stringProp name="jms.iterations">1</stringProp>
           <boolProp name="jms.authenticate">false</boolProp>
-          <elementProp name="jms.jmsProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
+          <elementProp name="jms.jmsProperties" elementType="JMSProperties">
+            <collectionProp name="JMSProperties.properties">
+              <elementProp name="" elementType="JMSProperty">
+                <stringProp name="JMSProperty.name"> </stringProp>
+                <stringProp name="JMSProperty.value"></stringProp>
+                <stringProp name="JMSProperty.type">java.lang.String</stringProp>
+              </elementProp>
+            </collectionProp>
           </elementProp>
         </PublisherSampler>
         <hashTree/>
@@ -828,6 +837,7 @@
           <stringProp name="queryType">Select Statement</stringProp>
           <stringProp name="resultVariable"></stringProp>
           <stringProp name="variableNames"></stringProp>
+          <stringProp name="queryTimeout"></stringProp>
         </JDBCPostProcessor>
         <hashTree/>
         <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="JSR223 PostProcessor" enabled="true">
@@ -920,12 +930,12 @@
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
           <collectionProp name="Asserion.test_strings">
-              <stringProp name="match"></stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">2</intProp>
-            <stringProp name="Assertion.scope">all</stringProp>
+            <stringProp name="0"></stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">16</intProp>
+          <stringProp name="Assertion.scope">all</stringProp>
         </ResponseAssertion>
         <hashTree/>
         <SMIMEAssertion guiclass="SMIMEAssertionGui" testclass="SMIMEAssertion" testname="SMIME Assertion" enabled="true">

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = "2.1.7"
+  VERSION = "2.11.0"
 end

data/spec/dsl_spec.rb

@@ -65,7 +65,7 @@ describe "DSL" do
       end.to_doc
     end
 
-    let(:fragment) { doc.search("//ConfigTestElement").first }
+    let(:config_fragment) { doc.search("//ConfigTestElement").first }
     let(:sampler_fragment) { doc.search("//HTTPSamplerProxy").first }
 
     it 'should match on implementation' do
@@ -73,13 +73,13 @@ describe "DSL" do
     end
 
     it 'should match on defaults' do
-      fragment.search(".//stringProp[@name='HTTPSampler.domain']").text.should == 'example.com'
-      fragment.search(".//stringProp[@name='HTTPSampler.protocol']").text.should == 'https'
-      fragment.search(".//stringProp[@name='HTTPSampler.implementation']").text.should == 'HttpClient3.1'
-      fragment.search(".//boolProp[@name='HTTPSampler.image_parser']").text.should == 'true'
-      fragment.search(".//boolProp[@name='HTTPSampler.concurrentDwn']").text.should == 'true'
-      fragment.search(".//stringProp[@name='HTTPSampler.concurrentPool']").text.should == '5'
-      fragment.search(".//stringProp[@name='HTTPSampler.embedded_url_re']").text.should == 'http.+?example.com'
+      config_fragment.search(".//stringProp[@name='HTTPSampler.domain']").text.should == 'example.com'
+      config_fragment.search(".//stringProp[@name='HTTPSampler.protocol']").text.should == 'https'
+      config_fragment.search(".//stringProp[@name='HTTPSampler.implementation']").text.should == 'HttpClient3.1'
+      config_fragment.search(".//boolProp[@name='HTTPSampler.image_parser']").text.should == 'true'
+      config_fragment.search(".//boolProp[@name='HTTPSampler.concurrentDwn']").text.should == 'true'
+      config_fragment.search(".//stringProp[@name='HTTPSampler.concurrentPool']").text.should == '5'
+      config_fragment.search(".//stringProp[@name='HTTPSampler.embedded_url_re']").text.should == 'http.+?example.com'
     end
   end
 
@@ -295,6 +295,29 @@ describe "DSL" do
   end
 
 
+  describe 'get_with_parameterized_domain' do
+    let(:doc) do
+      test do
+        threads do
+          transaction name: "TC_01", parent: true, include_timers: true do
+            visit url: "/home?location=melbourne", domain: "${custom_domain}"
+          end
+        end
+      end.to_doc
+    end
+
+    let(:fragment) { doc.search("//HTTPSamplerProxy").first }
+
+    it 'should match on path' do
+      fragment.search(".//stringProp[@name='HTTPSampler.path']").text.should == '/home'
+    end
+
+    it 'should match on domain' do
+      fragment.search(".//stringProp[@name='HTTPSampler.domain']").text.should == '${custom_domain}'
+    end
+  end
+
+
   describe 'https' do
     let(:doc) do
       test do
@@ -314,6 +337,45 @@ describe "DSL" do
   end
 
 
+  describe 'user_parameters' do
+    let(:doc) do
+      test do
+        threads do
+          transaction name: "TC_02", parent: true, include_timers: true do
+            visit url: "/" do
+              user_parameters names: ['name1', 'name2'],
+                thread_values: {
+                  user_1: [
+                    'value1',
+                    'value2'
+                  ],
+
+                  user_2: [
+                    'value1',
+                    'value2'
+                  ]
+                }
+            end
+          end
+        end
+      end.to_doc
+    end
+
+    let(:names) { doc.search("//collectionProp[@name='UserParameters.names']").first }
+    let(:thread_values) { doc.search("//collectionProp[@name='UserParameters.thread_values']").first }
+
+    it 'should match on names' do
+      names.search(".//stringProp[@name='name1']").text.should == 'name1'
+      names.search(".//stringProp[@name='name2']").text.should == 'name2'
+    end
+
+    it 'should match on thread values' do
+      thread_values.search(".//stringProp[@name='0']").first.text.should == 'value1'
+      thread_values.search(".//stringProp[@name='1']").first.text.should == 'value2'
+    end
+  end
+
+
   describe 'xhr' do
     let(:doc) do
       test do
@@ -446,7 +508,7 @@ describe "DSL" do
     let(:fragment) { doc.search("//LoopController").first }
 
     it 'should match on Loops' do
-      fragment.search(".//intProp[@name='LoopController.loops']").text.should == '5'
+      fragment.search(".//stringProp[@name='LoopController.loops']").text.should == '5'
     end
   end
 
@@ -547,7 +609,7 @@ describe "DSL" do
       let(:fragment) { doc.search("//ResponseAssertion").first }
 
       it 'should match on match' do
-        fragment.search(".//stringProp[@name='match']").text.should == 'Welcome'
+        fragment.search(".//stringProp[@name='0']").text.should == 'Welcome'
       end
 
       it 'should match on scope' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -77,7 +77,9 @@ files:
 - examples/basic_header.rb
 - examples/basic_http_request_defaults.rb
 - examples/basic_ldap_ext.rb
+- examples/basic_meta_fu.rb
 - examples/basic_post.rb
+- examples/basic_preprocessor_user_parameters.rb
 - examples/basic_query_params.rb
 - examples/basic_run.rb
 - examples/basic_simple_data_writer.rb