diff --git a/utilities/load-testing/build.xml b/utilities/load-testing/build.xml
index dda65e75..0e86e5f4 100644
--- a/utilities/load-testing/build.xml
+++ b/utilities/load-testing/build.xml
@@ -63,8 +63,7 @@ report - Just summarize output from previously run tests.
-
+
@@ -76,12 +75,14 @@ report - Just summarize output from previously run tests.
-
+
-
+
+
+
+
@@ -118,7 +119,7 @@ report - Just summarize output from previously run tests.
-
+
@@ -183,4 +184,12 @@ report - Just summarize output from previously run tests.
+
+
+
+
+
+
diff --git a/utilities/load-testing/example.loadtesting.properties b/utilities/load-testing/example.loadtesting.properties
index 97eb597c..ec1634c5 100644
--- a/utilities/load-testing/example.loadtesting.properties
+++ b/utilities/load-testing/example.loadtesting.properties
@@ -9,12 +9,15 @@
#
# -----------------------------------------------------------------------------
+#
+# What test should we run?
+#
+test.name = SecondTests-rel-1-2
+
#
# The base install directory for JMeter, and some JARs required by XSLT
#
jmeter.home.dir = /Users/jeb228/Downloads/JMeter/jakarta-jmeter-2.4
-jmeter.serializer.jar = ${jmeter.home.dir}/lib/serializer-2.7.1.jar
-jmeter.xalan.jar = ${jmeter.home.dir}/lib/xalan-2.7.1.jar
#
# Where do we find the Vivo instance that we are testing?
@@ -22,3 +25,13 @@ jmeter.xalan.jar = ${jmeter.home.dir}/lib/xalan-2.7.1.jar
webapp.host = localhost
webapp.port = 8080
webapp.name = vivo
+
+#
+# Where is the data to test against?
+#
+data.dir = /eclipseVitroWorkspace/vivo/utilities/load-testing/tests
+
+#
+# What's the default namespace (URIs are expressed as local-name only)
+#
+default.namespace = http://vivo.cornell.edu/individual/
\ No newline at end of file
diff --git a/utilities/load-testing/tests/SecondTests-rel-1-2.jmx b/utilities/load-testing/tests/SecondTests-rel-1-2.jmx
index e2ea2948..75543c0f 100644
--- a/utilities/load-testing/tests/SecondTests-rel-1-2.jmx
+++ b/utilities/load-testing/tests/SecondTests-rel-1-2.jmx
@@ -9,32 +9,37 @@
WEBAPP_HOST
- ${__property(webapp.host, localhost)}
+ ${__property(webapp.host, , localhost)}
=
WEBAPP_PORT
- ${__property(webapp.port, 8080)}
+ ${__property(webapp.port, , 8080)}
=
WEBAPP_NAME
- ${__property(webapp.name, vivo)}
+ ${__property(webapp.name, , vivo)}
=
PERSON_URI_FILE
- ${__property(file.person.uris, PersonUris.csv)}
+ ${__property(file.person.uris, , PersonUris.csv)}
=
INFO_RESOURCE_URI_FILE
- ${__property(file.infoResource.uris, InfoResourceUris.csv)}
+ ${__property(file.infoResource.uris, , InfoResourceUris.csv)}
=
ITERATIONS
- ${__property(iterations, 10)}
+ ${__property(iterations, , 10)}
+ =
+
+
+ DEFAULT_NAMESPACE
+ ${__property(default.namespace, , http://vivo.mydomain.edu/individual/)}
=
@@ -307,6 +312,104 @@
+
+
+
+
+ false
+ PREFIX core: <http://vivoweb.org/ontology/core#> SELECT ?pubUri WHERE {<${DEFAULT_NAMESPACE}${PERSON_URI}> core:authorInAuthorship ?authorshipUri . ?authorshipUri core:linkedInformationResource ?pubUri .}
+ =
+ true
+ query
+
+
+
+
+
+
+
+
+
+ ${WEBAPP_NAME}/ajax/sparqlQuery
+ POST
+ true
+ false
+ true
+ false
+ false
+
+
+
+
+ ,
+ utf8
+ ${PERSON_URI_FILE}
+ false
+ true
+ All threads
+ false
+ PERSON_URI
+
+
+
+
+ pubUri
+
+ Assertion.response_data
+ false
+ 2
+
+
+
+
+
+
+
+ false
+ PREFIX core: <http://vivoweb.org/ontology/core#> SELECT ?grantUri WHERE {<${DEFAULT_NAMESPACE}${PERSON_URI}> <http://vivoweb.org/ontology/core#hasPrincipalInvestigatorRole> ?grantRole . ?grantRole core:roleIn ?grantUri .}
+ =
+ true
+ query
+
+
+
+
+
+
+
+
+
+ ${WEBAPP_NAME}/ajax/sparqlQuery
+ POST
+ true
+ false
+ true
+ false
+ false
+
+
+
+
+ ,
+ utf8
+ ${PERSON_URI_FILE}
+ false
+ true
+ All threads
+ false
+ PERSON_URI
+
+
+
+
+ grantUri
+
+ Assertion.response_data
+ false
+ 2
+
+
+