ruby-jmeter 2.13.10 → 3.0.0

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

@@ -17,8 +17,6 @@ module RubyJmeter
   <stringProp name="ForeachController.inputVal"/>
   <stringProp name="ForeachController.returnVal"/>
   <boolProp name="ForeachController.useSeparator">true</boolProp>
-  #{'<stringProp name="ForeachController.startIndex"/>' if params[:startIndex]}
-  #{'<stringProp name="ForeachController.endIndex"/>' if params[:endIndex]}
 </ForeachController>)
       EOS
       update params

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

@@ -13,8 +13,8 @@ module RubyJmeter
     def initialize(params={})
       testname = params.kind_of?(Array) ? 'HtmlParameterMask' : (params[:name] || 'HtmlParameterMask')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ParamModifier guiclass="ParamModifierGui" testclass="ParamModifier" testname="#{testname}" enabled="true">
-  <elementProp name="ParamModifier.mask" elementType="ParamMask">
+<ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="#{testname}" enabled="true">
+  <elementProp name="ParamModifier.mask" elementType="ConfigTestElement">
     <stringProp name="ParamModifier.field_name"/>
     <stringProp name="ParamModifier.prefix"/>
     <longProp name="ParamModifier.lower_bound">0</longProp>
@@ -22,7 +22,7 @@ module RubyJmeter
     <longProp name="ParamModifier.increment">1</longProp>
     <stringProp name="ParamModifier.suffix"/>
   </elementProp>
-</ParamModifier>)
+</ConfigTestElement>)
       EOS
       update params
       update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]

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

@@ -29,10 +29,8 @@ 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="TestPlan.comments"/>
 </HTTPSamplerProxy>)
       EOS
       update params

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

@@ -28,7 +28,6 @@ module RubyJmeter
   <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"/>
 </ConfigTestElement>)
       EOS
       update params

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

@@ -37,6 +37,8 @@ module RubyJmeter
       </elementProp>
     </collectionProp>
   </elementProp>
+  <stringProp name="jms.expiration"/>
+  <stringProp name="jms.priority"/>
 </PublisherSampler>)
       EOS
       update params

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

@@ -20,9 +20,7 @@ module RubyJmeter
   <stringProp name="RegexExtractor.template"/>
   <stringProp name="RegexExtractor.default"/>
   <stringProp name="RegexExtractor.match_number"/>
-  #{"<stringProp name=\"Sample.scope\">params[:scope]</stringProp>" if params[:scope]}
-  #{"<stringProp name=\"Sample.scope\">variable</stringProp>" if params[:variable]}
-  #{"<stringProp name=\"Scope.variable\">params[:variable]</stringProp>" if params[:variable]}
+  <stringProp name="Sample.scope">all</stringProp>
 </RegexExtractor>)
       EOS
       update params

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

@@ -21,7 +21,6 @@ module RubyJmeter
   <boolProp name="Assertion.assume_success">false</boolProp>
   <intProp name="Assertion.test_type">16</intProp>
   <stringProp name="Assertion.scope">all</stringProp>
-  <stringProp name="Scope.variable"></stringProp>
 </ResponseAssertion>)
       EOS
       update params

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

@@ -13,7 +13,7 @@ module RubyJmeter
     def initialize(params={})
       testname = params.kind_of?(Array) ? 'TestFragment' : (params[:name] || 'TestFragment')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="#{testname}" enabled="false"/>)
+<TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="#{testname}" enabled="true"/>)
       EOS
       update params
       update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]

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

@@ -15,7 +15,9 @@ 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="UserParameters.thread_values">
+    <collectionProp name="1"/>
+    <collectionProp name="1"/>
   </collectionProp>
   <boolProp name="UserParameters.per_iteration">false</boolProp>
 </UserParameters>)

data/lib/ruby-jmeter/extend/assertions/response_assertion.rb

@@ -0,0 +1,36 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def response_assertion(params, &block)
+      params[:test_type] = parse_test_type(params)
+      params['0'] = params.values.first
+
+      if params[:json]
+        params[:EXPECTED_VALUE] = params[:value]
+        params[:JSON_PATH] = params[:json]
+        node = RubyJmeter::Plugins::JsonPathAssertion.new(params)
+      end
+
+      node ||= RubyJmeter::ResponseAssertion.new(params).tap do |node|
+        if params[:variable]
+          params['Scope.variable'] = params[:variable]
+          node.doc.xpath("//stringProp[@name='Assertion.scope']").first.content = 'variable'
+
+          node.doc.children.first.add_child (
+            Nokogiri::XML(<<-EOS.strip_heredoc).children
+              <stringProp name="Scope.variable">#{params[:variable]}</stringProp>
+            EOS
+          )
+        end
+
+        if params[:scope] == 'main'
+          node.doc.xpath("//stringProp[@name='Assertion.scope']").remove
+        end
+      end
+
+      attach_node(node, &block)
+    end
+
+    alias assert response_assertion
+    alias web_reg_find response_assertion
+  end
+end

data/lib/ruby-jmeter/extend/config_elements/header_manager.rb

@@ -0,0 +1,13 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def http_header_manager(params, &block)
+      if params.is_a?(Hash)
+        params['Header.name'] = params[:name]
+      end
+
+      super
+    end
+
+    alias header http_header_manager
+  end
+end

data/lib/ruby-jmeter/extend/config_elements/http_cache_manager.rb

@@ -0,0 +1,11 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def http_cache_manager(params = {}, &block)
+      params[:clearEachIteration] = true if params.keys.include? :clear_each_iteration
+
+      super
+    end
+
+    alias cache http_cache_manager
+  end
+end

data/lib/ruby-jmeter/extend/config_elements/http_cookie_manager.rb

@@ -0,0 +1,11 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def http_cookie_manager(params = {}, &block)
+      params[:clearEachIteration] = true if params.keys.include? :clear_each_iteration
+
+      super
+    end
+
+    alias cookies http_cookie_manager
+  end
+end

data/lib/ruby-jmeter/extend/config_elements/http_request_defaults.rb

@@ -0,0 +1,28 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def http_request_defaults(params = {}, &block)
+      params[:image_parser] = true if params.keys.include? :download_resources
+      params[:concurrentDwn] = true if params.keys.include? :use_concurrent_pool
+      params[:concurrentPool] = params[:use_concurrent_pool] if params.keys.include? :use_concurrent_pool
+
+      node = RubyJmeter::HttpRequestDefaults.new(params).tap do |node|
+        node.doc.children.first.add_child (
+          Nokogiri::XML(<<-EOS.strip_heredoc).children
+            <stringProp name="HTTPSampler.embedded_url_re">#{params[:urls_must_match]}</stringProp>
+          EOS
+        ) if params[:urls_must_match]
+
+        node.doc.children.first.add_child (
+          Nokogiri::XML(<<-EOS.strip_heredoc).children
+            <boolProp name="HTTPSampler.md5">true</stringProp>
+          EOS
+        ) if params[:md5]
+
+      end
+
+      attach_node(node, &block)
+    end
+
+    alias defaults http_request_defaults
+  end
+end

data/lib/ruby-jmeter/extend/config_elements/user_defined_variables.rb

@@ -0,0 +1,13 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def user_defined_variables(params, &block)
+      if params.is_a?(Hash)
+        params['Argument.name'] = params[:name]
+      end
+
+      super
+    end
+
+    alias variables user_defined_variables
+  end
+end

data/lib/ruby-jmeter/extend/config_elements/user_parameters.rb

@@ -0,0 +1,31 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def user_parameters(params, &block)
+      params['Argument.name'] = params[:name] if params.is_a?(Hash)
+
+      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 parameters user_parameters
+  end
+end

data/lib/ruby-jmeter/extend/controllers/foreach_controller.rb

@@ -0,0 +1,25 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def foreach_controller(params = {}, &block)
+      node = RubyJmeter::ForeachController.new(params).tap do |node|
+        if params[:start_index]
+          params[:startIndex] = params[:start_index]
+          node.doc.children.first.add_child (
+            Nokogiri::XML(<<-EOS.strip_heredoc).children
+              <stringProp name="ForeachController.startIndex"/>
+            EOS
+          )
+        end
+
+        if params[:end_index]
+          params[:endIndex] = params[:end_index]
+          node.doc.children.first.add_child (
+            Nokogiri::XML(<<-EOS.strip_heredoc).children
+              <stringProp name="ForeachController.endIndex"/>
+            EOS
+          )
+        end
+      end
+    end
+  end
+end

data/lib/ruby-jmeter/extend/controllers/loop_controller.rb

@@ -0,0 +1,11 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def loop_controller(params, &block)
+      params[:loops] = params[:count] || 1
+
+      super
+    end
+
+    alias loops loop_controller
+  end
+end

data/lib/ruby-jmeter/extend/controllers/module_controller.rb

@@ -0,0 +1,23 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def module_controller(params, &block)
+      node = RubyJmeter::ModuleController.new(params)
+
+      if params[:test_fragment]
+        params[:test_fragment].kind_of?(String) &&
+        params[:test_fragment].split('/')
+      elsif params[:node_path]
+        params[:node_path]
+      else
+        []
+      end.each_with_index do |node_name, index|
+        node.doc.at_xpath('//collectionProp') <<
+          Nokogiri::XML(<<-EOS.strip_heredoc).children
+            <stringProp name="node_#{index}">#{node_name}</stringProp>
+          EOS
+      end
+
+      attach_node(node, &block)
+    end
+  end
+end

data/lib/ruby-jmeter/extend/controllers/throughput_controller.rb

@@ -0,0 +1,15 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def throughput_controller(params = {}, &block)
+      params[:style] = 1 if params[:percent]
+      params[:maxThroughput] = params[:total] || params[:percent] || 1
+
+      node = RubyJmeter::ThroughputController.new(params)
+      node.doc.xpath(".//FloatProperty/value").first.content = params[:maxThroughput].to_f
+
+      attach_node(node, &block)
+    end
+
+    alias throughput throughput_controller
+  end
+end

data/lib/ruby-jmeter/extend/controllers/transaction_controller.rb

@@ -0,0 +1,14 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def transaction_controller(*args, &block)
+      params = args.shift || {}
+      params = { name: params }.merge(args.shift || {}) if params.class == String
+      params[:parent] = params[:parent] || false
+      params[:includeTimers] = params[:include_timers] || false
+      node = RubyJmeter::TransactionController.new(params)
+      attach_node(node, &block)
+    end
+
+    alias transaction transaction_controller
+  end
+end

data/lib/ruby-jmeter/extend/misc/aliases.rb

@@ -0,0 +1,21 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    alias auth http_authorization_manager
+    alias soap soapxmlrpc_request
+    alias ldap ldap_request
+    alias ldap_ext ldap_extended_request
+    alias ldap_extended ldap_extended_request
+    alias If if_controller
+    alias Switch switch_controller
+    alias While while_controller
+    alias Interleave random_controller
+    alias Random_order random_order_controller
+    alias Simple simple_controller
+    alias Once once_only_controller
+    alias view_results view_results_tree
+    alias log simple_data_writer
+    alias response_graph response_time_graph
+    alias bsh_pre beanshell_preprocessor
+    alias bsh_post beanshell_postprocessor
+  end
+end

data/lib/ruby-jmeter/extend/misc/exists.rb

@@ -0,0 +1,13 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def exists(variable, &block)
+      params ||= {}
+      params[:condition] = "\"${#{variable}}\" != \"\\${#{variable}}\""
+      params[:useExpression] = false
+      params[:name] = "if ${#{variable}}"
+      node = RubyJmeter::IfController.new(params)
+
+      attach_node(node, &block)
+    end
+  end
+end

data/lib/ruby-jmeter/extend/misc/flood.rb

@@ -0,0 +1,48 @@
+module RubyJmeter
+  class ExtendedDSL < DSL
+    def flood(token, params = {})
+      RestClient.proxy = params[:proxy] if params[:proxy]
+      begin
+        file = Tempfile.new(['ruby-jmeter', '.jmx'])
+        file.write(doc.to_xml(indent: 2))
+        file.rewind
+
+        flood_files = {
+          file: File.new("#{file.path}", 'rb')
+        }
+
+        if params[:files]
+          flood_files.merge!(Hash[params[:files].map.with_index { |value, index| [index, File.new(value, 'rb')] }])
+          params.delete(:files)
+        end
+
+        response = RestClient.post "#{params[:endpoint] ? params[:endpoint] : 'https://api.flood.io'}/floods?auth_token=#{token}",
+        {
+          flood: {
+            tool: 'jmeter',
+            name: params[:name],
+            notes: params[:notes],
+            tag_list: params[:tag_list],
+            threads: params[:threads],
+            rampup: params[:rampup],
+            duration: params[:duration],
+            override_parameters: params[:override_parameters],
+            started: params[:started],
+            stopped: params[:stopped]
+          },
+          flood_files: flood_files,
+          region: params[:region],
+          multipart: true,
+          content_type: 'application/octet-stream'
+        }.merge(params)
+        if response.code == 201
+          logger.info 'Flood results at: #{JSON.parse(response)["permalink"]}'
+        else
+          logger.fatal "Sorry there was an error: #{JSON.parse(response)["error"]}"
+        end
+      rescue => e
+        logger.fatal "Sorry there was an error: #{JSON.parse(e.response)["error"]}"
+      end
+    end
+  end
+end