ruby-jmeter 2.0.3 → 2.0.4

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

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'ForeachController'
+      testname = params.kind_of?(Array) ? 'ForeachController' : (params[:name] || 'ForeachController')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="#{params[:name]}" enabled="true">
+<ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="#{testname}" enabled="true">
   <stringProp name="ForeachController.inputVal"/>
   <stringProp name="ForeachController.returnVal"/>
   <boolProp name="ForeachController.useSeparator">true</boolProp>
@@ -22,7 +22,7 @@ module RubyJmeter
 </ForeachController>)
       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/ftp_request.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'FtpRequest'
+      testname = params.kind_of?(Array) ? 'FtpRequest' : (params[:name] || 'FtpRequest')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="#{params[:name]}" enabled="true">
+<FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="#{testname}" enabled="true">
   <stringProp name="FTPSampler.server"/>
   <stringProp name="FTPSampler.port"/>
   <stringProp name="FTPSampler.filename"/>
@@ -27,7 +27,7 @@ module RubyJmeter
 </FTPSampler>)
       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/ftp_request_defaults.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'FtpRequestDefaults'
+      testname = params.kind_of?(Array) ? 'FtpRequestDefaults' : (params[:name] || 'FtpRequestDefaults')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="#{params[:name]}" enabled="true">
+<ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="#{testname}" enabled="true">
   <stringProp name="FTPSampler.server"/>
   <stringProp name="FTPSampler.port"/>
   <stringProp name="FTPSampler.filename"/>
@@ -25,7 +25,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/gaussian_random_timer.rb

@@ -11,15 +11,15 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'GaussianRandomTimer'
+      testname = params.kind_of?(Array) ? 'GaussianRandomTimer' : (params[:name] || 'GaussianRandomTimer')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="#{params[:name]}" enabled="true">
+<GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="#{testname}" enabled="true">
   <stringProp name="ConstantTimer.delay">300</stringProp>
   <stringProp name="RandomTimer.range">100.0</stringProp>
 </GaussianRandomTimer>)
       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/generate_summary_results.rb

@@ -11,12 +11,12 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'GenerateSummaryResults'
+      testname = params.kind_of?(Array) ? 'GenerateSummaryResults' : (params[:name] || 'GenerateSummaryResults')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<Summariser guiclass="SummariserGui" testclass="Summariser" testname="#{params[:name]}" enabled="true"/>)
+<Summariser guiclass="SummariserGui" testclass="Summariser" 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/graph_results.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'GraphResults'
+      testname = params.kind_of?(Array) ? 'GraphResults' : (params[:name] || 'GraphResults')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="#{params[:name]}" enabled="true">
+<ResultCollector guiclass="GraphVisualizer" 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/html_assertion.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'HtmlAssertion'
+      testname = params.kind_of?(Array) ? 'HtmlAssertion' : (params[:name] || 'HtmlAssertion')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<HTMLAssertion guiclass="HTMLAssertionGui" testclass="HTMLAssertion" testname="#{params[:name]}" enabled="true">
+<HTMLAssertion guiclass="HTMLAssertionGui" testclass="HTMLAssertion" testname="#{testname}" enabled="true">
   <longProp name="html_assertion_error_threshold">0</longProp>
   <longProp name="html_assertion_warning_threshold">0</longProp>
   <stringProp name="html_assertion_doctype">omit</stringProp>
@@ -23,7 +23,7 @@ module RubyJmeter
 </HTMLAssertion>)
       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/html_link_parser.rb

@@ -11,12 +11,12 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'HtmlLinkParser'
+      testname = params.kind_of?(Array) ? 'HtmlLinkParser' : (params[:name] || 'HtmlLinkParser')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="#{params[:name]}" enabled="true"/>)
+<AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" 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/html_parameter_mask.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'HtmlParameterMask'
+      testname = params.kind_of?(Array) ? 'HtmlParameterMask' : (params[:name] || 'HtmlParameterMask')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ParamModifier guiclass="ParamModifierGui" testclass="ParamModifier" testname="#{params[:name]}" enabled="true">
+<ParamModifier guiclass="ParamModifierGui" testclass="ParamModifier" testname="#{testname}" enabled="true">
   <elementProp name="ParamModifier.mask" elementType="ParamMask">
     <stringProp name="ParamModifier.field_name"/>
     <stringProp name="ParamModifier.prefix"/>
@@ -25,7 +25,7 @@ module RubyJmeter
 </ParamModifier>)
       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/http_authorization_manager.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'HttpAuthorizationManager'
+      testname = params.kind_of?(Array) ? 'HttpAuthorizationManager' : (params[:name] || 'HttpAuthorizationManager')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="#{params[:name]}" enabled="true">
+<AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="#{testname}" enabled="true">
   <collectionProp name="AuthManager.auth_list">
     <elementProp name="" elementType="Authorization">
       <stringProp name="Authorization.url"/>
@@ -26,7 +26,7 @@ module RubyJmeter
 </AuthManager>)
       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/http_cache_manager.rb

@@ -11,15 +11,15 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'HttpCacheManager'
+      testname = params.kind_of?(Array) ? 'HttpCacheManager' : (params[:name] || 'HttpCacheManager')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<CacheManager guiclass="CacheManagerGui" testclass="CacheManager" testname="#{params[:name]}" enabled="true">
+<CacheManager guiclass="CacheManagerGui" testclass="CacheManager" testname="#{testname}" enabled="true">
   <boolProp name="clearEachIteration">false</boolProp>
   <boolProp name="useExpires">false</boolProp>
 </CacheManager>)
       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/http_cookie_manager.rb

@@ -11,16 +11,16 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'HttpCookieManager'
+      testname = params.kind_of?(Array) ? 'HttpCookieManager' : (params[:name] || 'HttpCookieManager')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="#{params[:name]}" enabled="true">
+<CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="#{testname}" enabled="true">
   <collectionProp name="CookieManager.cookies"/>
   <boolProp name="CookieManager.clearEachIteration">false</boolProp>
   <stringProp name="CookieManager.policy">default</stringProp>
 </CookieManager>)
       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/http_header_manager.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'HttpHeaderManager'
+      testname = params.kind_of?(Array) ? 'HttpHeaderManager' : (params[:name] || 'HttpHeaderManager')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="#{params[:name]}" enabled="true">
+<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="#{testname}" enabled="true">
   <collectionProp name="HeaderManager.headers">
     <elementProp name="" elementType="Header">
       <stringProp name="Header.name"/>
@@ -23,7 +23,7 @@ module RubyJmeter
 </HeaderManager>)
       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/http_request.rb

@@ -11,10 +11,10 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'HttpRequest'
+      testname = params.kind_of?(Array) ? 'HttpRequest' : (params[:name] || 'HttpRequest')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="#{params[:name]}" enabled="true">
-  <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="#{params[:name]}" enabled="true">
+<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="#{testname}" enabled="true">
+  <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="#{testname}" enabled="true">
     <collectionProp name="Arguments.arguments"/>
   </elementProp>
   <stringProp name="HTTPSampler.domain"/>
@@ -34,7 +34,7 @@ module RubyJmeter
 </HTTPSamplerProxy>)
       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/http_request_defaults.rb

@@ -11,10 +11,10 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'HttpRequestDefaults'
+      testname = params.kind_of?(Array) ? 'HttpRequestDefaults' : (params[:name] || 'HttpRequestDefaults')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="#{params[:name]}" enabled="true">
-  <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="#{params[:name]}" enabled="true">
+<ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="#{testname}" enabled="true">
+  <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="#{testname}" enabled="true">
     <collectionProp name="Arguments.arguments"/>
   </elementProp>
   <stringProp name="HTTPSampler.domain"/>
@@ -37,7 +37,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/http_url_rewriting_modifier.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'HttpUrlRewritingModifier'
+      testname = params.kind_of?(Array) ? 'HttpUrlRewritingModifier' : (params[:name] || 'HttpUrlRewritingModifier')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="#{params[:name]}" enabled="true">
+<URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="#{testname}" enabled="true">
   <stringProp name="argument_name"/>
   <boolProp name="path_extension">false</boolProp>
   <boolProp name="path_extension_no_equals">false</boolProp>
@@ -22,7 +22,7 @@ module RubyJmeter
 </URLRewritingModifier>)
       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/if_controller.rb

@@ -11,16 +11,16 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'IfController'
+      testname = params.kind_of?(Array) ? 'IfController' : (params[:name] || 'IfController')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<IfController guiclass="IfControllerPanel" testclass="IfController" testname="#{params[:name]}" enabled="true">
+<IfController guiclass="IfControllerPanel" testclass="IfController" testname="#{testname}" enabled="true">
   <stringProp name="IfController.condition"/>
   <boolProp name="IfController.evaluateAll">false</boolProp>
   <boolProp name="IfController.useExpression">false</boolProp>
 </IfController>)
       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/include_controller.rb

@@ -11,14 +11,14 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'IncludeController'
+      testname = params.kind_of?(Array) ? 'IncludeController' : (params[:name] || 'IncludeController')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<IncludeController guiclass="IncludeControllerGui" testclass="IncludeController" testname="#{params[:name]}" enabled="true">
+<IncludeController guiclass="IncludeControllerGui" testclass="IncludeController" testname="#{testname}" enabled="true">
   <stringProp name="IncludeController.includepath"/>
 </IncludeController>)
       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/java_request.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'JavaRequest'
+      testname = params.kind_of?(Array) ? 'JavaRequest' : (params[:name] || 'JavaRequest')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="#{params[:name]}" enabled="true">
+<JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="#{testname}" enabled="true">
   <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
     <collectionProp name="Arguments.arguments">
       <elementProp name="Sleep_Time" elementType="Argument">
@@ -62,7 +62,7 @@ module RubyJmeter
 </JavaSampler>)
       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/java_request_defaults.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'JavaRequestDefaults'
+      testname = params.kind_of?(Array) ? 'JavaRequestDefaults' : (params[:name] || 'JavaRequestDefaults')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="#{params[:name]}" enabled="true">
+<JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="#{testname}" enabled="true">
   <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
     <collectionProp name="Arguments.arguments">
       <elementProp name="Sleep_Time" elementType="Argument">
@@ -62,7 +62,7 @@ module RubyJmeter
 </JavaConfig>)
       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/jdbc_connection_configuration.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'JdbcConnectionConfiguration'
+      testname = params.kind_of?(Array) ? 'JdbcConnectionConfiguration' : (params[:name] || 'JdbcConnectionConfiguration')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JDBCDataSource guiclass="TestBeanGUI" testclass="JDBCDataSource" testname="#{params[:name]}" enabled="true">
+<JDBCDataSource guiclass="TestBeanGUI" testclass="JDBCDataSource" testname="#{testname}" enabled="true">
   <boolProp name="autocommit">true</boolProp>
   <stringProp name="checkQuery">Select 1</stringProp>
   <stringProp name="connectionAge">5000</stringProp>
@@ -30,7 +30,7 @@ module RubyJmeter
 </JDBCDataSource>)
       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/jdbc_postprocessor.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'JdbcPostprocessor'
+      testname = params.kind_of?(Array) ? 'JdbcPostprocessor' : (params[:name] || 'JdbcPostprocessor')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JDBCPostProcessor guiclass="TestBeanGUI" testclass="JDBCPostProcessor" testname="#{params[:name]}" enabled="true">
+<JDBCPostProcessor guiclass="TestBeanGUI" testclass="JDBCPostProcessor" testname="#{testname}" enabled="true">
   <stringProp name="dataSource"/>
   <stringProp name="query"/>
   <stringProp name="queryArguments"/>
@@ -24,7 +24,7 @@ module RubyJmeter
 </JDBCPostProcessor>)
       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/jdbc_preprocessor.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'JdbcPreprocessor'
+      testname = params.kind_of?(Array) ? 'JdbcPreprocessor' : (params[:name] || 'JdbcPreprocessor')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JDBCPreProcessor guiclass="TestBeanGUI" testclass="JDBCPreProcessor" testname="#{params[:name]}" enabled="true">
+<JDBCPreProcessor guiclass="TestBeanGUI" testclass="JDBCPreProcessor" testname="#{testname}" enabled="true">
   <stringProp name="dataSource"/>
   <stringProp name="query"/>
   <stringProp name="queryArguments"/>
@@ -24,7 +24,7 @@ module RubyJmeter
 </JDBCPreProcessor>)
       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/jdbc_request.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'JdbcRequest'
+      testname = params.kind_of?(Array) ? 'JdbcRequest' : (params[:name] || 'JdbcRequest')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="#{params[:name]}" enabled="true">
+<JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="#{testname}" enabled="true">
   <stringProp name="dataSource"/>
   <stringProp name="query"/>
   <stringProp name="queryArguments"/>
@@ -24,7 +24,7 @@ module RubyJmeter
 </JDBCSampler>)
       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/jms_pointtopoint.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'JmsPointtopoint'
+      testname = params.kind_of?(Array) ? 'JmsPointtopoint' : (params[:name] || 'JmsPointtopoint')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JMSSampler guiclass="JMSSamplerGui" testclass="JMSSampler" testname="#{params[:name]}" enabled="true">
+<JMSSampler guiclass="JMSSamplerGui" testclass="JMSSampler" testname="#{testname}" enabled="true">
   <stringProp name="JMSSampler.queueconnectionfactory"/>
   <stringProp name="JMSSampler.SendQueue"/>
   <stringProp name="JMSSampler.ReceiveQueue"/>
@@ -24,16 +24,16 @@ module RubyJmeter
   <stringProp name="HTTPSamper.xml_data"/>
   <stringProp name="JMSSampler.initialContextFactory"/>
   <stringProp name="JMSSampler.contextProviderUrl"/>
-  <elementProp name="JMSSampler.jndiProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{params[:name]}" enabled="true">
+  <elementProp name="JMSSampler.jndiProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{testname}" enabled="true">
     <collectionProp name="Arguments.arguments"/>
   </elementProp>
-  <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>
 </JMSSampler>)
       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/jms_publisher.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'JmsPublisher'
+      testname = params.kind_of?(Array) ? 'JmsPublisher' : (params[:name] || 'JmsPublisher')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<PublisherSampler guiclass="JMSPublisherGui" testclass="PublisherSampler" testname="#{params[:name]}" enabled="true">
+<PublisherSampler guiclass="JMSPublisherGui" testclass="PublisherSampler" testname="#{testname}" enabled="true">
   <stringProp name="jms.jndi_properties">false</stringProp>
   <stringProp name="jms.initial_context_factory"/>
   <stringProp name="jms.provider_url"/>
@@ -28,13 +28,13 @@ module RubyJmeter
   <stringProp name="jms.config_msg_type">jms_text_message</stringProp>
   <stringProp name="jms.iterations">1</stringProp>
   <boolProp name="jms.authenticate">false</boolProp>
-  <elementProp name="jms.jmsProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{params[:name]}" enabled="true">
+  <elementProp name="jms.jmsProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="#{testname}" enabled="true">
     <collectionProp name="Arguments.arguments"/>
   </elementProp>
 </PublisherSampler>)
       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/jms_subscriber.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'JmsSubscriber'
+      testname = params.kind_of?(Array) ? 'JmsSubscriber' : (params[:name] || 'JmsSubscriber')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<SubscriberSampler guiclass="JMSSubscriberGui" testclass="SubscriberSampler" testname="#{params[:name]}" enabled="true">
+<SubscriberSampler guiclass="JMSSubscriberGui" testclass="SubscriberSampler" testname="#{testname}" enabled="true">
   <stringProp name="jms.jndi_properties">false</stringProp>
   <stringProp name="jms.initial_context_factory"/>
   <stringProp name="jms.provider_url"/>
@@ -28,7 +28,7 @@ module RubyJmeter
 </SubscriberSampler>)
       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_assertion.rb

@@ -11,9 +11,9 @@ module RubyJmeter
     include Helper
 
     def initialize(params={})
-      params[:name] ||= 'Jsr223Assertion'
+      testname = params.kind_of?(Array) ? 'Jsr223Assertion' : (params[:name] || 'Jsr223Assertion')
       @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
-<JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="#{params[:name]}" enabled="true">
+<JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="#{testname}" enabled="true">
   <stringProp name="scriptLanguage"/>
   <stringProp name="parameters"/>
   <stringProp name="filename"/>
@@ -22,7 +22,7 @@ module RubyJmeter
 </JSR223Assertion>)
       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