ruby-jmeter 2.0.3 → 2.0.4

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'Jsr223Listener'
+      testname = params.kind_of?(Array) ? 'Jsr223Listener' : (params[:name] || 'Jsr223Listener')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JSR223Listener guiclass="TestBeanGUI" testclass="JSR223Listener" testname="#{params[:name]}" enabled="true">
+<JSR223Listener guiclass="TestBeanGUI" testclass="JSR223Listener" testname="#{testname}" enabled="true">
   <stringProp name="cacheKey"/>
   <stringProp name="filename"/>
   <stringProp name="parameters"/>
@@ -22,7 +22,7 @@ module RubyJmeter
 </JSR223Listener>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'Jsr223Postprocessor'
+      testname = params.kind_of?(Array) ? 'Jsr223Postprocessor' : (params[:name] || 'Jsr223Postprocessor')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="#{params[:name]}" enabled="true">
+<JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="#{testname}" enabled="true">
   <stringProp name="cacheKey"/>
   <stringProp name="filename"/>
   <stringProp name="parameters"/>
@@ -22,7 +22,7 @@ module RubyJmeter
 </JSR223PostProcessor>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'Jsr223Preprocessor'
+      testname = params.kind_of?(Array) ? 'Jsr223Preprocessor' : (params[:name] || 'Jsr223Preprocessor')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="#{params[:name]}" enabled="true">
+<JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="#{testname}" enabled="true">
   <stringProp name="cacheKey"/>
   <stringProp name="filename"/>
   <stringProp name="parameters"/>
@@ -22,7 +22,7 @@ module RubyJmeter
 </JSR223PreProcessor>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'Jsr223Sampler'
+      testname = params.kind_of?(Array) ? 'Jsr223Sampler' : (params[:name] || 'Jsr223Sampler')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="#{params[:name]}" enabled="true">
+<JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="#{testname}" enabled="true">
   <stringProp name="cacheKey"/>
   <stringProp name="filename"/>
   <stringProp name="parameters"/>
@@ -22,7 +22,7 @@ module RubyJmeter
 </JSR223Sampler>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'Jsr223Timer'
+      testname = params.kind_of?(Array) ? 'Jsr223Timer' : (params[:name] || 'Jsr223Timer')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JSR223Timer guiclass="TestBeanGUI" testclass="JSR223Timer" testname="#{params[:name]}" enabled="true">
+<JSR223Timer guiclass="TestBeanGUI" testclass="JSR223Timer" testname="#{testname}" enabled="true">
   <stringProp name="cacheKey"/>
   <stringProp name="filename"/>
   <stringProp name="parameters"/>
@@ -22,7 +22,7 @@ module RubyJmeter
 </JSR223Timer>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'JunitRequest'
+      testname = params.kind_of?(Array) ? 'JunitRequest' : (params[:name] || 'JunitRequest')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JUnitSampler guiclass="JUnitTestSamplerGui" testclass="JUnitSampler" testname="#{params[:name]}" enabled="true">
+<JUnitSampler guiclass="JUnitTestSamplerGui" testclass="JUnitSampler" testname="#{testname}" enabled="true">
   <stringProp name="junitSampler.classname">test.RerunTest</stringProp>
   <stringProp name="junitsampler.constructorstring"/>
   <stringProp name="junitsampler.method">testRerun</stringProp>
@@ -30,7 +30,7 @@ module RubyJmeter
 </JUnitSampler>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,16 +11,16 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'KeystoreConfiguration'
+      testname = params.kind_of?(Array) ? 'KeystoreConfiguration' : (params[:name] || 'KeystoreConfiguration')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<KeystoreConfig guiclass="TestBeanGUI" testclass="KeystoreConfig" testname="#{params[:name]}" enabled="true">
+<KeystoreConfig guiclass="TestBeanGUI" testclass="KeystoreConfig" testname="#{testname}" enabled="true">
   <stringProp name="endIndex"/>
   <stringProp name="preload">True</stringProp>
   <stringProp name="startIndex"/>
 </KeystoreConfig>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'LdapExtendedRequest'
+      testname = params.kind_of?(Array) ? 'LdapExtendedRequest' : (params[:name] || 'LdapExtendedRequest')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<LDAPExtSampler guiclass="LdapExtTestSamplerGui" testclass="LDAPExtSampler" testname="#{params[:name]}" enabled="true">
+<LDAPExtSampler guiclass="LdapExtTestSamplerGui" testclass="LDAPExtSampler" testname="#{testname}" enabled="true">
   <stringProp name="servername"/>
   <stringProp name="port"/>
   <stringProp name="rootdn"/>
@@ -35,7 +35,7 @@ module RubyJmeter
 </LDAPExtSampler>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'LdapExtendedRequestDefaults'
+      testname = params.kind_of?(Array) ? 'LdapExtendedRequestDefaults' : (params[:name] || 'LdapExtendedRequestDefaults')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ConfigTestElement guiclass="LdapExtConfigGui" testclass="ConfigTestElement" testname="#{params[:name]}" enabled="true">
+<ConfigTestElement guiclass="LdapExtConfigGui" testclass="ConfigTestElement" testname="#{testname}" enabled="true">
   <stringProp name="servername"/>
   <stringProp name="port"/>
   <stringProp name="rootdn"/>
@@ -35,7 +35,7 @@ module RubyJmeter
 </ConfigTestElement>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,16 +11,16 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'LdapRequest'
+      testname = params.kind_of?(Array) ? 'LdapRequest' : (params[:name] || 'LdapRequest')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<LDAPSampler guiclass="LdapTestSamplerGui" testclass="LDAPSampler" testname="#{params[:name]}" enabled="true">
+<LDAPSampler guiclass="LdapTestSamplerGui" testclass="LDAPSampler" testname="#{testname}" enabled="true">
   <stringProp name="servername"/>
   <stringProp name="port"/>
   <stringProp name="rootdn"/>
   <boolProp name="user_defined">false</boolProp>
   <stringProp name="test">add</stringProp>
   <stringProp name="base_entry_dn"/>
-  <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{params[:name]}" enabled="true">
+  <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{testname}" enabled="true">
     <collectionProp name="Arguments.arguments"/>
   </elementProp>
   <stringProp name="ConfigTestElement.username"/>
@@ -28,7 +28,7 @@ module RubyJmeter
 </LDAPSampler>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,16 +11,16 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'LdapRequestDefaults'
+      testname = params.kind_of?(Array) ? 'LdapRequestDefaults' : (params[:name] || 'LdapRequestDefaults')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ConfigTestElement guiclass="LdapConfigGui" testclass="ConfigTestElement" testname="#{params[:name]}" enabled="true">
+<ConfigTestElement guiclass="LdapConfigGui" testclass="ConfigTestElement" testname="#{testname}" enabled="true">
   <stringProp name="servername"/>
   <stringProp name="port"/>
   <stringProp name="rootdn"/>
   <boolProp name="user_defined">false</boolProp>
   <stringProp name="test">add</stringProp>
   <stringProp name="base_entry_dn"/>
-  <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{params[:name]}" enabled="true">
+  <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"/>
@@ -33,7 +33,7 @@ module RubyJmeter
 </ConfigTestElement>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,15 +11,15 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'LoginConfigElement'
+      testname = params.kind_of?(Array) ? 'LoginConfigElement' : (params[:name] || 'LoginConfigElement')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ConfigTestElement guiclass="LoginConfigGui" testclass="ConfigTestElement" testname="#{params[:name]}" enabled="true">
+<ConfigTestElement guiclass="LoginConfigGui" testclass="ConfigTestElement" testname="#{testname}" enabled="true">
   <stringProp name="ConfigTestElement.username"/>
   <stringProp name="ConfigTestElement.password"/>
 </ConfigTestElement>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,15 +11,15 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'LoopController'
+      testname = params.kind_of?(Array) ? 'LoopController' : (params[:name] || 'LoopController')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="#{params[:name]}" enabled="true">
+<LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="#{testname}" enabled="true">
   <boolProp name="LoopController.continue_forever">true</boolProp>
   <stringProp name="LoopController.loops">1</stringProp>
 </LoopController>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'MailReaderSampler'
+      testname = params.kind_of?(Array) ? 'MailReaderSampler' : (params[:name] || 'MailReaderSampler')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<MailReaderSampler guiclass="MailReaderSamplerGui" testclass="MailReaderSampler" testname="#{params[:name]}" enabled="true">
+<MailReaderSampler guiclass="MailReaderSamplerGui" testclass="MailReaderSampler" testname="#{testname}" enabled="true">
   <stringProp name="host_type">pop3</stringProp>
   <stringProp name="folder">INBOX</stringProp>
   <stringProp name="host"/>
@@ -30,7 +30,7 @@ module RubyJmeter
 </MailReaderSampler>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'MailerVisualizer'
+      testname = params.kind_of?(Array) ? 'MailerVisualizer' : (params[:name] || 'MailerVisualizer')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<MailerResultCollector guiclass="MailerVisualizer" testclass="MailerResultCollector" testname="#{params[:name]}" enabled="true">
+<MailerResultCollector guiclass="MailerVisualizer" testclass="MailerResultCollector" testname="#{testname}" enabled="true">
   <boolProp name="ResultCollector.error_logging">false</boolProp>
   <objProp>
     <name>saveConfig</name>
@@ -57,7 +57,7 @@ module RubyJmeter
 </MailerResultCollector>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,14 +11,14 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'Md5hexAssertion'
+      testname = params.kind_of?(Array) ? 'Md5hexAssertion' : (params[:name] || 'Md5hexAssertion')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<MD5HexAssertion guiclass="MD5HexAssertionGUI" testclass="MD5HexAssertion" testname="#{params[:name]}" enabled="true">
+<MD5HexAssertion guiclass="MD5HexAssertionGUI" testclass="MD5HexAssertion" testname="#{testname}" enabled="true">
   <stringProp name="MD5HexAssertion.size"/>
 </MD5HexAssertion>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,12 +11,12 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'ModuleController'
+      testname = params.kind_of?(Array) ? 'ModuleController' : (params[:name] || 'ModuleController')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="#{params[:name]}" enabled="true"/>)
+<ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="#{testname}" enabled="true"/>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'MonitorResults'
+      testname = params.kind_of?(Array) ? 'MonitorResults' : (params[:name] || 'MonitorResults')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ResultCollector guiclass="MonitorHealthVisualizer" testclass="ResultCollector" testname="#{params[:name]}" enabled="true">
+<ResultCollector guiclass="MonitorHealthVisualizer" testclass="ResultCollector" testname="#{testname}" enabled="true">
   <boolProp name="ResultCollector.error_logging">false</boolProp>
   <objProp>
     <name>saveConfig</name>
@@ -48,7 +48,7 @@ module RubyJmeter
 </ResultCollector>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,12 +11,12 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'OnceOnlyController'
+      testname = params.kind_of?(Array) ? 'OnceOnlyController' : (params[:name] || 'OnceOnlyController')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="#{params[:name]}" enabled="true"/>)
+<OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="#{testname}" enabled="true"/>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,23 +11,23 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'OsProcessSampler'
+      testname = params.kind_of?(Array) ? 'OsProcessSampler' : (params[:name] || 'OsProcessSampler')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="#{params[:name]}" enabled="true">
+<SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="#{testname}" enabled="true">
   <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
   <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
   <stringProp name="SystemSampler.command"/>
-  <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{params[:name]}" enabled="true">
+  <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{testname}" enabled="true">
     <collectionProp name="Arguments.arguments"/>
   </elementProp>
-  <elementProp name="SystemSampler.environment" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{params[:name]}" enabled="true">
+  <elementProp name="SystemSampler.environment" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{testname}" enabled="true">
     <collectionProp name="Arguments.arguments"/>
   </elementProp>
   <stringProp name="SystemSampler.directory"/>
 </SystemSampler>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,15 +11,15 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'PoissonRandomTimer'
+      testname = params.kind_of?(Array) ? 'PoissonRandomTimer' : (params[:name] || 'PoissonRandomTimer')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<PoissonRandomTimer guiclass="PoissonRandomTimerGui" testclass="PoissonRandomTimer" testname="#{params[:name]}" enabled="true">
+<PoissonRandomTimer guiclass="PoissonRandomTimerGui" testclass="PoissonRandomTimer" testname="#{testname}" enabled="true">
   <stringProp name="ConstantTimer.delay">300</stringProp>
   <stringProp name="RandomTimer.range">100</stringProp>
 </PoissonRandomTimer>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,14 +11,14 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'RandomController'
+      testname = params.kind_of?(Array) ? 'RandomController' : (params[:name] || 'RandomController')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<RandomController guiclass="RandomControlGui" testclass="RandomController" testname="#{params[:name]}" enabled="true">
+<RandomController guiclass="RandomControlGui" testclass="RandomController" testname="#{testname}" enabled="true">
   <intProp name="InterleaveControl.style">1</intProp>
 </RandomController>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,12 +11,12 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'RandomOrderController'
+      testname = params.kind_of?(Array) ? 'RandomOrderController' : (params[:name] || 'RandomOrderController')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<RandomOrderController guiclass="RandomOrderControllerGui" testclass="RandomOrderController" testname="#{params[:name]}" enabled="true"/>)
+<RandomOrderController guiclass="RandomOrderControllerGui" testclass="RandomOrderController" testname="#{testname}" enabled="true"/>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'RandomVariable'
+      testname = params.kind_of?(Array) ? 'RandomVariable' : (params[:name] || 'RandomVariable')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="#{params[:name]}" enabled="true">
+<RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="#{testname}" enabled="true">
   <stringProp name="maximumValue"/>
   <stringProp name="minimumValue">1</stringProp>
   <stringProp name="outputFormat"/>
@@ -23,7 +23,7 @@ module RubyJmeter
 </RandomVariableConfig>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,12 +11,12 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'RecordingController'
+      testname = params.kind_of?(Array) ? 'RecordingController' : (params[:name] || 'RecordingController')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<RecordingController guiclass="RecordController" testclass="RecordingController" testname="#{params[:name]}" enabled="true"/>)
+<RecordingController guiclass="RecordController" testclass="RecordingController" testname="#{testname}" enabled="true"/>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,16 +11,16 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'RegexUserParameters'
+      testname = params.kind_of?(Array) ? 'RegexUserParameters' : (params[:name] || 'RegexUserParameters')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<RegExUserParameters guiclass="RegExUserParametersGui" testclass="RegExUserParameters" testname="#{params[:name]}" enabled="true">
+<RegExUserParameters guiclass="RegExUserParametersGui" testclass="RegExUserParameters" testname="#{testname}" enabled="true">
   <stringProp name="RegExUserParameters.regex_ref_name"/>
   <stringProp name="RegExUserParameters.param_names_gr_nr"/>
   <stringProp name="RegExUserParameters.param_values_gr_nr"/>
 </RegExUserParameters>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'RegularExpressionExtractor'
+      testname = params.kind_of?(Array) ? 'RegularExpressionExtractor' : (params[:name] || 'RegularExpressionExtractor')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="#{params[:name]}" enabled="true">
+<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="#{testname}" enabled="true">
   <stringProp name="RegexExtractor.useHeaders">false</stringProp>
   <stringProp name="RegexExtractor.refname"/>
   <stringProp name="RegexExtractor.regex"/>
@@ -24,7 +24,7 @@ module RubyJmeter
 </RegexExtractor>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'ResponseAssertion'
+      testname = params.kind_of?(Array) ? 'ResponseAssertion' : (params[:name] || 'ResponseAssertion')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="#{params[:name]}" enabled="true">
+<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="#{testname}" enabled="true">
   <collectionProp name="Asserion.test_strings">
     <stringProp name="match"/>
   </collectionProp>
@@ -24,7 +24,7 @@ module RubyJmeter
 </ResponseAssertion>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end
 

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'ResponseTimeGraph'
+      testname = params.kind_of?(Array) ? 'ResponseTimeGraph' : (params[:name] || 'ResponseTimeGraph')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ResultCollector guiclass="RespTimeGraphVisualizer" testclass="ResultCollector" testname="#{params[:name]}" enabled="true">
+<ResultCollector guiclass="RespTimeGraphVisualizer" testclass="ResultCollector" testname="#{testname}" enabled="true">
   <boolProp name="ResultCollector.error_logging">false</boolProp>
   <objProp>
     <name>saveConfig</name>
@@ -48,7 +48,7 @@ module RubyJmeter
 </ResultCollector>)
       EOS
       update params
-      update_at_xpath params if params[:update_at_xpath]
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
     end
   end