From 6c5ea5b3e0ee88946a8abc0990cbea98d430d481 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 6 Jan 2011 18:28:18 +0000
Subject: [PATCH] NIHVIVO-1129 Tweak the tests to pull Individual URIs from a
 file.

---
 utilities/load-testing/build.xml           | 7 +++++++
 utilities/load-testing/tests/firstTest.jmx | 9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/utilities/load-testing/build.xml b/utilities/load-testing/build.xml
index a239d60b..8c376b23 100644
--- a/utilities/load-testing/build.xml
+++ b/utilities/load-testing/build.xml
@@ -74,6 +74,9 @@ report   - Just summarize output from previously run tests.
 		<fail unless="webapp.name"
 		      message="${properties.file} must contain a value for webapp.name" />
 
+		<fail unless="file.uri.list"
+		      message="${properties.file} must contain a value for file.uri.list" />
+
 		<property name="webapp.url" value="http://${webapp.host}:${webapp.port}/${webapp.name}" />
 
 		<path id="xslt.classpath">
@@ -102,6 +105,9 @@ report   - Just summarize output from previously run tests.
 		</condition>
 		<fail unless="webapp.is.available" message="Webapp is not available at ${webapp.url}" />
 
+		<!-- Need to convert abstract paths to system-specific paths, or JMeter will call them relative paths -->
+		<property name="file.uri.list.location" location="${file.uri.list}" />
+
 		<jmeter jmeterhome="${jmeter.home.dir}"
 		        testplan="${tests.dir}/${test.name}.jmx"
 		        resultlogdir="${results.dir}">
@@ -109,6 +115,7 @@ report   - Just summarize output from previously run tests.
 			<property name="webapp.host" value="${webapp.host}" />
 			<property name="webapp.port" value="${webapp.port}" />
 			<property name="webapp.name" value="${webapp.name}" />
+			<property name="file.uri.list" value="${file.uri.list.location}" />
 
 			<!-- Set parameters for the output -->
 			<property name="jmeter.save.saveservice.output_format" value="xml" />
diff --git a/utilities/load-testing/tests/firstTest.jmx b/utilities/load-testing/tests/firstTest.jmx
index 3ce2a223..01638699 100644
--- a/utilities/load-testing/tests/firstTest.jmx
+++ b/utilities/load-testing/tests/firstTest.jmx
@@ -22,6 +22,11 @@
             <stringProp name="Argument.value">${__property(webapp.name, vivo)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="FILE_URI_LIST" elementType="Argument">
+            <stringProp name="Argument.name">FILE_URI_LIST</stringProp>
+            <stringProp name="Argument.value">${__property(file.uri.list, individualUris.csv)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="TestPlan.user_define_classpath"></stringProp>
@@ -31,7 +36,7 @@
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
-          <stringProp name="LoopController.loops">10</stringProp>
+          <stringProp name="LoopController.loops">50</stringProp>
         </elementProp>
         <stringProp name="ThreadGroup.num_threads">1</stringProp>
         <stringProp name="ThreadGroup.ramp_time">1</stringProp>
@@ -125,7 +130,7 @@
           <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="Individual URIs from CSV" enabled="true">
             <stringProp name="delimiter">,</stringProp>
             <stringProp name="fileEncoding">utf8</stringProp>
-            <stringProp name="filename">individualUris.csv</stringProp>
+            <stringProp name="filename">${FILE_URI_LIST}</stringProp>
             <boolProp name="quotedData">false</boolProp>
             <boolProp name="recycle">true</boolProp>
             <stringProp name="shareMode">Current thread group</stringProp>