ruby-jmeter 2.13.6 → 2.13.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aba397b4e80c6a55097ab98a90b1d4349a833c9
-  data.tar.gz: 380054d564616ec16f3f5e7c29d5c1ffb34df146
+  metadata.gz: 2fad51ef27a7e3737b320fbb418db4772ffe6300
+  data.tar.gz: 6b266bfbd9507a0b8f08259d80a110923ef74e0d
 SHA512:
-  metadata.gz: 085d457e7c39d09c50547b218000fd8656e1753a080f76b511f603be355be1168b0822b88d876e3e6b7027ae15d8d762dc1b450377a0d839a9ba8a0e5ac66134
-  data.tar.gz: 13e6162f551447c0806923bfb46755e6f027a04aa144099cec2265bf1b7c6e9ca85d6ba589f2d98e31cc447bb990c5e4dc132cf83b018ef6d0c8e9b1fa67504b
+  metadata.gz: 590dadd09d7a91119e24acb35af182950e127f4f47be0c4207c8b5b9a2af0655ad00b51ffaab2fa8035f4b034dc021c4666b96d861c941f100c141018aa3a386
+  data.tar.gz: 4b8110856c259925912c3b471f629656000539295ad0d6e137f79ab37419ab6a40d9798ae6144605c2d590cd429706e381c5f27c5ec454d00defa85fbad00ad8

data/examples/basic_ultimate_thread_group.rb

@@ -0,0 +1,38 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'ruby-jmeter'
+
+test do
+
+  defaults domain: 'example.com'
+
+  with_user_agent :chrome
+
+  header [
+    { name: 'Accept-Encoding', value: 'gzip,deflate,sdch' },
+    { name: 'Accept', value: 'text/javascript, text/html, application/xml, text/xml, */*' }
+  ]
+
+  ultimate [
+    {
+      start_threads: 200,
+      initial_delay: 0,
+      start_time: 30,
+      hold_time: 60,
+      stop_time: 5
+    },
+    {
+      start_threads: 200,
+      initial_delay: 60,
+      start_time: 30,
+      hold_time: 60,
+      stop_time: 5
+    }
+  ] do
+
+    random_timer 1000, 3000
+
+    get name: 'home', url: '/'
+
+  end
+
+end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)

data/lib/ruby-jmeter/dsl.rb

@@ -476,6 +476,27 @@ module RubyJmeter
 
     alias_method :step, :stepping_thread_group
 
+    def ultimate_thread_group(params = {}, &block)
+      node = RubyJmeter::Plugins::UltimateThreadGroup.new(params)
+
+      params.each_with_index do |group, index|
+        node.doc.at_xpath('//collectionProp') <<
+          Nokogiri::XML(<<-EOS.strip_heredoc).children
+            <collectionProp name="index">
+              <stringProp name="#{group[:start_threads]}">#{group[:start_threads]}</stringProp>
+              <stringProp name="#{group[:initial_delay]}">#{group[:initial_delay]}</stringProp>
+              <stringProp name="#{group[:start_time]}">#{group[:start_time]}</stringProp>
+              <stringProp name="#{group[:hold_time]}">#{group[:hold_time]}</stringProp>
+              <stringProp name="#{group[:stop_time]}">#{group[:stop_time]}</stringProp>
+            </collectionProp>
+          EOS
+      end
+
+      attach_node(node, &block)
+    end
+
+    alias_method :ultimate, :ultimate_thread_group
+
     def composite_graph(name, params = {}, &block)
       node = RubyJmeter::Plugins::CompositeGraph.new(name, params)
       attach_node(node, &block)

data/lib/ruby-jmeter/plugins/stepping_thread_group.rb

@@ -23,7 +23,7 @@ module RubyJmeter
             </elementProp>
           </kg.apc.jmeter.threads.SteppingThreadGroup>
         EOF
-        # update params
+        update params
       end
     end
   end

data/lib/ruby-jmeter/plugins/ultimate_thread_group.rb

@@ -0,0 +1,21 @@
+module RubyJmeter
+  module Plugins
+    class UltimateThreadGroup
+      attr_accessor :doc
+      include Helper
+      def initialize(params={})
+        @doc = Nokogiri::XML(<<-EOF.strip_heredoc)
+          <kg.apc.jmeter.threads.UltimateThreadGroup guiclass="kg.apc.jmeter.threads.UltimateThreadGroupGui" testclass="kg.apc.jmeter.threads.UltimateThreadGroup" testname="jp@gc - Stepping Thread Group" enabled="true">
+           <collectionProp name="ultimatethreadgroupdata">
+           </collectionProp>
+           <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>
+           </elementProp>
+           <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+         </kg.apc.jmeter.threads.UltimateThreadGroup>
+        EOF
+      end
+    end
+  end
+end

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = '2.13.6'
+  VERSION = '2.13.7'
 end

data/spec/dsl_spec.rb

@@ -216,6 +216,56 @@ describe 'DSL' do
     end
   end
 
+  describe 'stepping thread group' do
+    let(:doc) do
+      test do
+        stepping_thread_group on_sample_error: 'startnextloop', total_threads: 100, initial_delay: 1, start_threads: 2, add_threads: 3, start_every: 4, stop_threads: 5, stop_every: 6, flight_time: 7, rampup: 8
+      end.to_doc
+    end
+
+    let(:fragment) { doc.search("//kg.apc.jmeter.threads.SteppingThreadGroup").first }
+    it 'should match on on_sample_error' do
+      puts fragment
+      fragment.search(".//stringProp[@name='ThreadGroup.on_sample_error']").text.should == 'startnextloop'
+    end
+
+    it 'should match on total_threads' do
+      fragment.search(".//stringProp[@name='ThreadGroup.num_threads']").text.should == '100'
+    end
+
+    it 'should match on initial_delay' do
+      fragment.search(".//stringProp[@name='Threads initial delay']").text.should == '1'
+    end
+
+    it 'should match on start_threads' do
+      fragment.search(".//stringProp[@name='Start users count']").text.should == '2'
+    end
+
+    it 'should match on add_threads' do
+      fragment.search(".//stringProp[@name='Start users count burst']").text.should == '3'
+    end
+
+    it 'should match on start_every' do
+      fragment.search(".//stringProp[@name='Start users period']").text.should == '4'
+    end
+
+    it 'should match on stop_threads' do
+      fragment.search(".//stringProp[@name='Stop users count']").text.should == '5'
+    end
+
+    it 'should match on stop_every' do
+      fragment.search(".//stringProp[@name='Stop users period']").text.should == '6'
+    end
+
+    it 'should match on flight_time' do
+      fragment.search(".//stringProp[@name='flighttime']").text.should == '7'
+    end
+
+    it 'should match on rampup' do
+      fragment.search(".//stringProp[@name='rampUp']").text.should == '8'
+    end
+  end
+
   describe 'thread groups old syntax' do
     let(:doc) do
       test do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.13.6
+  version: 2.13.7
 platform: ruby
 authors:
 - Tim Koopmans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -100,6 +100,7 @@ files:
 - examples/basic_thread_groups.rb
 - examples/basic_throughput_controller.rb
 - examples/basic_throughput_shaping_timer.rb
+- examples/basic_ultimate_thread_group.rb
 - examples/basic_user_defined_variables.rb
 - examples/demo.csv
 - examples/etsy_login_browse.rb
@@ -251,6 +252,7 @@ files:
 - lib/ruby-jmeter/plugins/response_times_percentiles.rb
 - lib/ruby-jmeter/plugins/stepping_thread_group.rb
 - lib/ruby-jmeter/plugins/transactions_per_second.rb
+- lib/ruby-jmeter/plugins/ultimate_thread_group.rb
 - lib/ruby-jmeter/plugins/variable_throughput_timer.rb
 - lib/ruby-jmeter/version.rb
 - ruby-jmeter.gemspec