gridinit-jmeter 1.0.0.pre → 1.0.1.pre

data/examples/basic_throughput_controller.rb

@@ -0,0 +1,14 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'gridinit-jmeter'
+
+test do
+  threads count: 100 do
+
+    think_time 5000,5000
+
+    throughput_controller percent: 100 do
+      transaction name: "TC_01", parent: true, include_timers: true
+    end
+        
+  end
+end.run(path: '/usr/share/jmeter/bin/', gui: true)

data/lib/gridinit-jmeter/dsl.rb

@@ -179,6 +179,12 @@ module Gridinit
 
       alias_method :Loop, :loop_controller
 
+      def throughput_controller(params, &block)
+        params[:style] = 1 if params[:percent]
+        params[:maxThroughput] = params[:total] || params[:percent] || 1
+        super
+      end
+
       alias_method :Throughput, :throughput_controller
 
       alias_method :Switch, :switch_controller
@@ -205,11 +211,6 @@ module Gridinit
       ##
       # Other Elements
 
-      def beanshell_preprocessor(params, &block)
-        params[:script] = "<![CDATA[#{params[:script]}]]>"
-        super
-      end
-
       alias_method :bsh_pre, :beanshell_preprocessor
 
       def extract(params, &block)

data/lib/gridinit-jmeter/version.rb

@@ -1,5 +1,5 @@
 module Gridinit
   module Jmeter
-    VERSION = "1.0.0.pre"
+    VERSION = "1.0.1.pre"
   end
 end

data/spec/dsl_spec.rb

@@ -125,6 +125,30 @@ describe "DSL" do
   end
 
 
+  describe 'throughput controller' do
+    let(:doc) do
+      test do
+        threads do
+          throughput_controller percent: 100 do
+            transaction name: "TC_01", parent: true, include_timers: true
+          end
+        end
+      end.to_doc
+    end
+
+    let(:fragment) { doc.search("//ThroughputController").first }
+
+    it 'should match on maxThroughput' do
+      # puts doc.to_xml indent: 2
+      fragment.search(".//intProp[@name='ThroughputController.maxThroughput']").text.should == '100'
+    end
+
+    it 'should match on style' do
+      fragment.search(".//intProp[@name='ThroughputController.style']").text.should == '1'
+    end
+  end
+
+
   describe 'visit' do
     let(:doc) do
       test do
@@ -405,7 +429,6 @@ describe "DSL" do
       let(:fragment) { doc.search("//ResponseAssertion").first }
 
       it 'should match on scope' do
-        puts doc.to_xml indent: 2
         fragment.search(".//stringProp[@name='Assertion.scope']").text.should == ""
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridinit-jmeter
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.1.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -73,6 +73,7 @@ files:
 - examples/basic_post.rb
 - examples/basic_query_params.rb
 - examples/basic_think_time.rb
+- examples/basic_throughput_controller.rb
 - examples/basic_throughput_shaping_timer.rb
 - examples/etsy_login_browse.rb
 - gridinit-jmeter.gemspec