ruby-jmeter 2.13.8 → 2.13.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01ab5cb50b02e20695b64b2e420a551117a9af6b
-  data.tar.gz: 4a844acbf379fd95132e773fd46b5dbdb2d317d3
+  metadata.gz: 4b08a9495536489abe43055bcaefb8b00ae1d688
+  data.tar.gz: 117ffddedc4e3fda6f25b9e2d2c77d7717672a8c
 SHA512:
-  metadata.gz: e242b7f6a1f74a4c0adbff263ff5a2d5ef7950aaee5218085bca02e632f6c8bae13ee62cdb2347a6b1a8a8495f09e65c604c26ff9b25c0faf07da6e10a6d01e6
-  data.tar.gz: 0dc1ce59b26da2c80fa14de8db4ad5db04a57cd2fb52104a1cf5e5230904bb5a08303924154e5d491ca1b4cf9b5cfbf2bd18a4c2077a48e4c99e018fffb91b06
+  metadata.gz: 9857ead6edff27a4ae5577d019d265ca11499777256a2ffd39b2f3f4f6c04f441dc129ca1507079ea1bf48fa6b8a0796502759ac922f562959c018dbcdf74b99
+  data.tar.gz: a7f89263182930d51b6388e99f2b6631f071c7aa2b3687251980410daac18812dc24050b353c4f0b83e348e6e137ca45a045dcfa47723efd09c9f638c3a0af90

data/examples/basic_header.rb

@@ -19,5 +19,12 @@ test do
       with_xhr
     end
   end
+  
+  post name: 'with_headers', ur: '/',
+    fill_in: {
+      js: true
+    } do
+      header [{ name: 'Cache-Control', value: 'no-cache'}]
+  end
 
 end.run(path: '/usr/share/jmeter-2.13/bin/', gui: true)

data/examples/real_redis_data_set_with_setup.rb

@@ -0,0 +1,123 @@
+################################################################################
+# This is an example of how to use a Redis data set with CSV data.
+# The test plan defines a setup thread group with a JSR223 sampler (scripted in
+# Groovy), which pre-populates Redis with the data used for the actual test.
+# The test itself simply calls a REST API with data seeded from Redis.
+#
+# The redis key is "test_data" and the format of the CSV data is:
+#   user_id,start_date,end_date
+#
+# Requires:
+#  JMeter (recommended version: 2.13 or later)
+#  jmeter-plugins extras with libs (this gives us the redis data set config)
+#  Groovy 2.4 or later (put the groovy-all jar into $JMETER_HOME/lib)
+################################################################################
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'ruby-jmeter'
+
+# For redis dataset config.
+redis_host = 'localhost'
+redis_port = 6379
+redis_key = 'test_data'
+num_records = 1000 # how many rows of test data to generate
+
+# for HTTP request defaults
+protocol = 'http'
+host = 'localhost'
+port = 8080
+
+# JMeter test plan begins here.
+test do
+
+  # Setup the data set we will use to run the tests.
+  setup_thread_group name: 'Redis Fill',
+    loops: 1 do
+    jsr223_sampler name: 'redis fill',
+      scriptLanguage: 'groovy',
+      cacheKey: 'prefill_user_ids',
+      script: <<-EOS.strip_heredoc
+import redis.clients.jedis.JedisPoolConfig;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.Jedis;
+
+import java.util.Random;
+import java.util.Date;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+JedisPoolConfig config = new JedisPoolConfig();
+JedisPool pool = new JedisPool(config, "#{redis_host}", #{redis_port});
+Jedis jedis = null;
+try {
+    jedis = pool.getResource();
+
+    //delete old data, if it exists
+    jedis.del("#{redis_key}");
+
+    // Create a list of the last 90 days. We will seed our test data from this.
+    Date now = new Date();
+    Date oldest = now - 90;
+    Range days = oldest..now;
+
+    Random random = new Random();
+    DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+
+    /*
+     * Generate CSV data in the form of:
+     *   user_id,start_date,end_date
+     */
+    for (int i = 1; i <= #{num_records}; i++) {
+        Date day = days[random.nextInt(days.size())]
+        String data = [i, df.format(day), df.format(day)].join(',')
+        jedis.sadd("#{redis_key}", data);
+    }
+}finally {
+    if(jedis != null) {
+        pool.returnResource(jedis);
+    }
+}
+        EOS
+  end
+
+  # Defines a thread group. We allow certain parameters to be passed in
+  # as system properties.
+  threads name: 'Test Scenario - REST API query',
+    count: '${__P(threads,1)}',
+    rampup: '${__P(rampup,600)}',
+    duration: '${__P(duration, 600)}' do
+
+    # HTTP request defaults
+    defaults domain: host, # default domain if not specified in URL
+      protocol: protocol, # default protocol if not specified in URL
+      port: port,
+      download_resources: false # download images/CSS/JS (no)
+
+    cookies # om nom nom
+
+    cache clear_each_iteration: true # each thread iteration mimics a new user with an empty browser cache
+
+    with_gzip # add HTTP request headers to allow GZIP compression. Most sites support this nowadays.
+
+    # Test data. Note how the variableNames match the variables used by the
+    # sampler below.
+    redis_data_set 'test data',
+      redisKey: redis_key,
+      host: redis_host,
+      port: redis_port,
+      variableNames: 'user_id,start_date,end_date'
+
+    # User workflow begins here.
+    visit name: 'REST API query',
+      url: '/rest/query',
+      always_encode: true,
+      fill_in: {
+        'user_id' => '${user_id}',
+        'start' => '${start_date}',
+        'end' => '${end_date}'
+      }
+  end
+
+  response_time_graph
+  view_results_tree
+end.jmx(file: 'real_redis_data_set_with_setup.jmx')

data/lib/ruby-jmeter/dsl.rb

@@ -519,6 +519,11 @@ module RubyJmeter
 
     alias_method :loadosophia, :loadosophia_uploader
 
+    def redis_data_set(params = {}, &block)
+      node = RubyJmeter::Plugins::RedisDataSet.new(params)
+      attach_node(node, &block)
+    end
+
 
 
     # API Methods

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

@@ -0,0 +1,39 @@
+module RubyJmeter
+  module Plugins
+    class RedisDataSet
+      attr_accessor :doc
+      include Helper
+      def initialize(params={})
+        testname = params.kind_of?(Array) ? 'Redis Data Set Config' : (params[:name] || 'Redis Data Set Config')
+        params[:getMode] ||= "1" unless params[:remove] == true
+        @doc = Nokogiri::XML(<<-XML.strip_heredoc)
+          <kg.apc.jmeter.config.redis.RedisDataSet guiclass="TestBeanGUI" testclass="kg.apc.jmeter.config.redis.RedisDataSet" testname="#{testname}" enabled="true">
+            <stringProp name="database">0</stringProp>
+            <stringProp name="delimiter">,</stringProp>
+            <intProp name="getMode">0</intProp>
+            <stringProp name="host"></stringProp
+            <intProp name="maxActive">20</intProp>
+            <intProp name="maxIdle">10</intProp>
+            <longProp name="maxWait">30000</longProp>
+            <longProp name="minEvictableIdleTimeMillis">60000</longProp>
+            <intProp name="minIdle">0</intProp>
+            <intProp name="numTestsPerEvictionRun">0</intProp>
+            <stringProp name="password"></stringProp>
+            <stringProp name="port">6379</stringProp>
+            <stringProp name="redisKey"></stringProp>
+            <longProp name="softMinEvictableIdleTimeMillis">60000</longProp>
+            <boolProp name="testOnBorrow">false</boolProp>
+            <boolProp name="testOnReturn">false</boolProp>
+            <boolProp name="testWhileIdle">false</boolProp>
+            <longProp name="timeBetweenEvictionRunsMillis">30000</longProp>
+            <stringProp name="timeout">2000</stringProp>
+            <stringProp name="variableNames"></stringProp>
+            <intProp name="whenExhaustedAction">2</intProp>
+          </kg.apc.jmeter.config.redis.RedisDataSet>
+        XML
+        update params
+        update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
+      end
+    end
+  end
+end

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = '2.13.8'
+  VERSION = '2.13.9'
 end

data/spec/dsl_spec.rb

@@ -1101,4 +1101,57 @@ describe 'DSL' do
         metric_connections.search("//stringProp[@name='']").first.text.should == '1.1.1.1'
       end
     end
+
+    describe 'redis data set' do
+      describe 'random keep' do
+        let(:doc) do
+          test do
+            threads do
+              redis_data_set name: 'redis data set name',
+                host: 'the_host',
+                port: 1234
+
+            end
+          end.to_doc
+        end
+
+        let(:fragment) { doc.search("//kg.apc.jmeter.config.redis.RedisDataSet").first }
+
+        it 'should have a name' do
+          fragment.attributes['testname'].value.should == 'redis data set name'
+        end
+
+        it 'should be configured for random keep' do
+          fragment.search("//intProp[@name='getMode']").text.should == '1'
+        end
+
+        it 'should point to the host' do
+          fragment.search("//stringProp[@name='host']").text.should == 'the_host'
+        end
+
+        it 'should configure a port' do
+          fragment.search("//stringProp[@name='port']").text.should == '1234'
+        end
+      end
+
+      describe 'random remove' do
+        let(:doc) do
+          test do
+            threads do
+              redis_data_set remove: true
+            end
+          end.to_doc
+        end
+
+        let(:fragment) { doc.search("//kg.apc.jmeter.config.redis.RedisDataSet").first }
+
+        it 'should have a default name' do
+          fragment.attributes['testname'].value.should == 'Redis Data Set Config'
+        end
+
+        it 'should be configured for random remove' do
+          fragment.search("//intProp[@name='getMode']").text.should == '0'
+        end
+      end
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.13.8
+  version: 2.13.9
 platform: ruby
 authors:
 - Tim Koopmans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -109,6 +109,7 @@ files:
 - examples/real_flood_test_data.rb
 - examples/real_immi.gov.au_visa.rb
 - examples/real_page_objects.rb
+- examples/real_redis_data_set_with_setup.rb
 - examples/real_user_objects_github.rb
 - lib/ruby-jmeter.rb
 - lib/ruby-jmeter/DSL.md
@@ -248,6 +249,7 @@ files:
 - lib/ruby-jmeter/plugins/latencies_over_time.rb
 - lib/ruby-jmeter/plugins/loadosophia_uploader.rb
 - lib/ruby-jmeter/plugins/perfmon_collector.rb
+- lib/ruby-jmeter/plugins/redis_data_set.rb
 - lib/ruby-jmeter/plugins/response_codes_per_second.rb
 - lib/ruby-jmeter/plugins/response_times_distribution.rb
 - lib/ruby-jmeter/plugins/response_times_over_time.rb