aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuhong Yin2012-01-24 07:28:02 (EST)
committerMichael Fiedler2012-01-24 09:29:02 (EST)
commitfc6575394d3ef33e1971738979f6296de76cace6 (patch)
tree19d4b8a838dfd861de3db86f3ba8b75629d518b6
parentc7526ce159b6458c73d4c18cbce275a9f5fb62cf (diff)
downloadorg.eclipse.lyo.testsuite-fc6575394d3ef33e1971738979f6296de76cace6.zip
org.eclipse.lyo.testsuite-fc6575394d3ef33e1971738979f6296de76cace6.tar.gz
org.eclipse.lyo.testsuite-fc6575394d3ef33e1971738979f6296de76cace6.tar.bz2
Bug 369452 - ServiceProviderRdfXmlTests and TestsBase do not honor the
runOnlyOnce test property
-rw-r--r--org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderRdfXmlTests.java7
-rw-r--r--org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/TestsBase.java5
2 files changed, 9 insertions, 3 deletions
diff --git a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderRdfXmlTests.java b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderRdfXmlTests.java
index d083f0c..bfdaad5 100644
--- a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderRdfXmlTests.java
+++ b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderRdfXmlTests.java
@@ -107,8 +107,11 @@ public class ServiceProviderRdfXmlTests extends TestsBase {
ArrayList<String> serviceURLs = TestsBase.getServiceProviderURLsUsingRdfXml(base, false);
for (String serviceURL : serviceURLs) {
- data.add(new Object[] {serviceURL});
- }
+ data.add(new Object[] {serviceURL});
+ if (onlyOnce)
+ return data;
+ }
+
return data;
}
diff --git a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/TestsBase.java b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/TestsBase.java
index acf38af..b6b7133 100644
--- a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/TestsBase.java
+++ b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/TestsBase.java
@@ -198,7 +198,10 @@ public class TestsBase {
XPathConstants.NODESET);
for (int i = 0; i < sps.getLength(); i++) {
if (!sps.item(i).getNodeValue().equals(base) || sps.getLength() == 1) {
- data.add(sps.item(i).getNodeValue());
+ data.add(sps.item(i).getNodeValue());
+ if (onlyOnce)
+ return data;
+
if (dontGoDeep)
return data;
}