perfsonar-dev - perfsonar: r2242 - in trunk/functional-testing/sqlma/src/sqlma: echo l2/MeasurmentArchiveStoreRequest l2/MetadataKeyRequest l2/SetupDataRequest
Subject: perfsonar development work
List archive
perfsonar: r2242 - in trunk/functional-testing/sqlma/src/sqlma: echo l2/MeasurmentArchiveStoreRequest l2/MetadataKeyRequest l2/SetupDataRequest
Chronological Thread
- From:
- To:
- Subject: perfsonar: r2242 - in trunk/functional-testing/sqlma/src/sqlma: echo l2/MeasurmentArchiveStoreRequest l2/MetadataKeyRequest l2/SetupDataRequest
- Date: Fri, 16 Mar 2007 03:41:08 -0400
Author: michalis
Date: 2007-03-16 03:41:07 -0400 (Fri, 16 Mar 2007)
New Revision: 2242
Removed:
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/MeasurementArchiveStoreRequests.java
Modified:
trunk/functional-testing/sqlma/src/sqlma/echo/EchoRequests.java
trunk/functional-testing/sqlma/src/sqlma/echo/EchoResponseParser.java
trunk/functional-testing/sqlma/src/sqlma/l2/MeasurmentArchiveStoreRequest/MeasurementArchiveStoreResponseParser.java
trunk/functional-testing/sqlma/src/sqlma/l2/MetadataKeyRequest/KeyRetrievalRequests.java
trunk/functional-testing/sqlma/src/sqlma/l2/MetadataKeyRequest/KeyRetrievalResponseParser.java
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataKeyRequests.java
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataKeyResponseParser.java
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataRequests.java
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataResponseParser.java
Log:
Some changes to the code
Modified: trunk/functional-testing/sqlma/src/sqlma/echo/EchoRequests.java
===================================================================
--- trunk/functional-testing/sqlma/src/sqlma/echo/EchoRequests.java
2007-03-15 20:18:47 UTC (rev 2241)
+++ trunk/functional-testing/sqlma/src/sqlma/echo/EchoRequests.java
2007-03-16 07:41:07 UTC (rev 2242)
@@ -152,7 +152,7 @@
switch (testCase) {
// A valid echo request
case 1:
- Element eventType = createEventType("echo");
+ Element eventType =
createEventType("http://schemas.perfsonar.net/tools/admin/echo/2.0";);
Element metadata = createMetadata("meta");
metadata.addContent(eventType);
doc.getRootElement().addContent(metadata);
@@ -181,7 +181,7 @@
break;
// A request with no metadata id.
case 5:
- eventType = createEventType("echo");
+ eventType =
createEventType("http://schemas.perfsonar.net/tools/admin/echo/2.0";);
metadata = createMetadata("");
metadata.addContent(eventType);
doc.getRootElement().addContent(metadata);
@@ -191,7 +191,7 @@
// as
// the metadata id attribute value.
case 6:
- eventType = createEventType("echo");
+ eventType =
createEventType("http://schemas.perfsonar.net/tools/admin/echo/2.0";);
metadata = createMetadata("meta1");
metadata.addContent(eventType);
doc.getRootElement().addContent(metadata);
@@ -199,7 +199,7 @@
break;
// A request with no metadata id attribute.
case 7:
- eventType = createEventType("echo");
+ eventType =
createEventType("http://schemas.perfsonar.net/tools/admin/echo/2.0";);
metadata = createMetadata("meta");
metadata.removeAttribute("id");
metadata.addContent(eventType);
@@ -208,7 +208,7 @@
break;
// A request without data.
case 8:
- eventType = createEventType("echo");
+ eventType =
createEventType("http://schemas.perfsonar.net/tools/admin/echo/2.0";);
metadata = createMetadata("meta1");
metadata.addContent(eventType);
doc.getRootElement().addContent(metadata);
@@ -219,7 +219,7 @@
break;
// A request where the type attribute has a wrong value
case 10:
- eventType = createEventType("echo");
+ eventType =
createEventType("http://schemas.perfsonar.net/tools/admin/echo/2.0";);
metadata = createMetadata("meta");
metadata.addContent(eventType);
doc.getRootElement().addContent(metadata);
@@ -228,7 +228,7 @@
break;
// A request where the type attribute is empty.
case 11:
- eventType = createEventType("echo");
+ eventType =
createEventType("http://schemas.perfsonar.net/tools/admin/echo/2.0";);
metadata = createMetadata("meta");
metadata.addContent(eventType);
doc.getRootElement().addContent(metadata);
@@ -237,7 +237,7 @@
break;
// A request with no type attribute
case 12:
- eventType = createEventType("echo");
+ eventType =
createEventType("http://schemas.perfsonar.net/tools/admin/echo/2.0";);
metadata = createMetadata("meta");
metadata.addContent(eventType);
doc.getRootElement().addContent(metadata);
@@ -246,7 +246,7 @@
break;
// A request with no metadataIdRef value.
case 13:
- eventType = createEventType("echo");
+ eventType =
createEventType("http://schemas.perfsonar.net/tools/admin/echo/2.0";);
metadata = createMetadata("meta");
metadata.addContent(eventType);
doc.getRootElement().addContent(metadata);
@@ -254,7 +254,7 @@
break;
// A request with no metadataIdRef
case 14:
- eventType = createEventType("echo");
+ eventType =
createEventType("http://schemas.perfsonar.net/tools/admin/echo/2.0";);
metadata = createMetadata("meta");
metadata.addContent(eventType);
doc.getRootElement().addContent(metadata);
@@ -267,7 +267,7 @@
nmwg = Namespace.getNamespace("nmwg",
"http://ggf.org/ns/nmwg/base/foo/2.0/";);
- eventType = createEventType("echo");
+ eventType =
createEventType("http://schemas.perfsonar.net/tools/admin/echo/2.0";);
metadata = createMetadata("meta");
metadata.addContent(eventType);
doc.getRootElement().addContent(metadata);
Modified:
trunk/functional-testing/sqlma/src/sqlma/echo/EchoResponseParser.java
===================================================================
--- trunk/functional-testing/sqlma/src/sqlma/echo/EchoResponseParser.java
2007-03-15 20:18:47 UTC (rev 2241)
+++ trunk/functional-testing/sqlma/src/sqlma/echo/EchoResponseParser.java
2007-03-16 07:41:07 UTC (rev 2242)
@@ -3,24 +3,21 @@
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
-import java.sql.SQLException;
import java.util.Iterator;
import java.util.LinkedList;
-import java.util.List;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-
import org.jdom.Attribute;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.Namespace;
import org.jdom.input.DOMBuilder;
import org.xml.sax.SAXException;
-import org.xmldb.api.base.XMLDBException;
+
/**
* Class for parsing and validating respnses from echo requests
*
@@ -298,15 +295,15 @@
// A case with no event type. An error response is
expected.
case 2:
parserLogWrite(testCase);
- return commonCheckCase(response,
"error.common.parse_error");
+ return commonCheckCase(response, "error.echo");
// A case with a wrong event type. An error resquest
is expected.
case 3:
parserLogWrite(testCase);
- return commonCheckCase(response,
"error.common.parse_error");
+ return commonCheckCase(response, "error.request");
// A case with no event type element. An error
response is expected.
case 4:
parserLogWrite(testCase);
- return commonCheckCase(response,
"error.common.parse_error");
+ return commonCheckCase(response, "error.request");
// A case with no metadata id.. An error response is
expected.
case 5:
parserLogWrite(testCase);
Modified:
trunk/functional-testing/sqlma/src/sqlma/l2/MeasurmentArchiveStoreRequest/MeasurementArchiveStoreResponseParser.java
===================================================================
---
trunk/functional-testing/sqlma/src/sqlma/l2/MeasurmentArchiveStoreRequest/MeasurementArchiveStoreResponseParser.java
2007-03-15 20:18:47 UTC (rev 2241)
+++
trunk/functional-testing/sqlma/src/sqlma/l2/MeasurmentArchiveStoreRequest/MeasurementArchiveStoreResponseParser.java
2007-03-16 07:41:07 UTC (rev 2242)
@@ -56,9 +56,9 @@
private static final int NUMBER_OF_TEST_CASES = 2;
- private static final int NUMBER_OF_SUB_CASE_1 = 10;
+ private static final int NUMBER_OF_SUB_CASE_1 = 9;
- private static final int NUMBER_OF_SUB_CASE_2 = 86;
+ private static final int NUMBER_OF_SUB_CASE_2 = 85;
private static final int TOTAL_NUMBER_OF_TESTS = NUMBER_OF_SUB_CASE_1
+ NUMBER_OF_SUB_CASE_2;
@@ -72,9 +72,9 @@
private xmlDBClient xmlClient = null;
private SQLMAFunctionalTestsUtilities utilities;
-
- private String xmlFile;
+ private String xmlFile;
+
//
-----------------------------------------------------------------------
// constructors
@@ -179,7 +179,7 @@
}
// Initializing parsing utilities
utilities = new SQLMAFunctionalTestsUtilities(null, null);
- xmlFile=xmlDBInitFile;
+ xmlFile = xmlDBInitFile;
}
@@ -383,8 +383,8 @@
}
if (results != null) {
for (int i = 0; i <
4; i++) {
- //
System.out.println(data[i] + " " +
- //
results[i]);
+
//System.out.println(data[i] + " " +
+
//results[i]);
if
(!data[i].equals(results[i])) {
sqlResult = false;
}
@@ -568,8 +568,10 @@
}
if (result != null) {
if
(result.equals("false")) {
-
parserLogWrite(true, 2);
xmlResult = true;
+ } else {
+
System.out.println(result);
+
xmlResult = false;
}
} else {
xmlResult =
false;
@@ -1008,7 +1010,7 @@
time += subTestCase * 1000;
return commonCheckCase_2(response,
"PSNC-DFN-MUE-Link-1001",
time.toString(),
"domain_link",
-
"error.ma.sql.db_connection.ibatis");
+ "error.ma.query");
// A case with request where the event type
element does not
// exist at all. An error response is
expected.
case 13:
@@ -1016,7 +1018,7 @@
time += subTestCase * 1000;
return commonCheckCase_2(response,
"PSNC-DFN-MUE-Link-1001",
time.toString(),
"domain_link",
-
"error.ma.sql.db_connection.ibatis");
+ "error.ma.query");
// A case request where the type attribute
has a value other
// than
// MeasurmentArchiveStore Request. An error
response is expected
@@ -1121,21 +1123,21 @@
time += subTestCase * 1000;
parserLogWrite(testCase, subTestCase);
return commonCheckCase_3(response,
-
"error.ma.sql.db_connection.ibatis", time.toString());
+ "error.ma.query",
time.toString());
// A case where where the parameters element
is missing. An
// error response is expected
case 26:
time += subTestCase * 1000;
parserLogWrite(testCase, subTestCase);
return commonCheckCase_3(response,
-
"error.ma.sql.db_connection.ibatis", time.toString());
+ "error.ma.query",
time.toString());
// A case here the parameter elements are
missing. An error
// response is expected.
case 27:
time += subTestCase * 1000;
parserLogWrite(testCase, subTestCase);
return commonCheckCase_3(response,
-
"error.ma.sql.db_connection.ibatis", time.toString());
+ "error.ma.query",
time.toString());
// A case where the ibatis config parameter
has an invalid
// value. An error response is expected.
case 28:
@@ -1186,7 +1188,7 @@
time += subTestCase * 1000;
return commonCheckCase_2(response,
"DFN-Link-1234", time
.toString(), "domain_link",
-
"error.ma.sql.db_connection.ibatis");
+ "error.ma.query");
// A case where the path id parameter element
is missing. An
// error response is expecetd
case 35:
@@ -1201,7 +1203,7 @@
time += subTestCase * 1000;
return commonCheckCase_2(response,
"DFN-Link-1234", time
.toString(), "domain_link",
-
"error.ma.sql.db_connection.ibatis");
+ "error.ma.query");
// A case where the path id parameter name
attribute has an
// invalid value. An error response is
expected.
case 37:
@@ -1596,7 +1598,7 @@
data[2] = "PSNC";
data[3] = time.toString();
return commonCheckCase_1(response, data,
"domain_link");
- // A case here the state oper element is
missing, A success
+ // A case here the state oper element is
missing, An error
// response is expected
case 83:
parserLogWrite(testCase, subTestCase);
@@ -1780,7 +1782,7 @@
parserLogWrite(true, i, j, 0);
success++;
} else {
-
parserLogWrite(false, 1, j, 0);
+
parserLogWrite(false, i, j, 0);
fail++;
failed.add("Test d_" + i + "_" + j + "\n");
}
Modified:
trunk/functional-testing/sqlma/src/sqlma/l2/MetadataKeyRequest/KeyRetrievalRequests.java
===================================================================
---
trunk/functional-testing/sqlma/src/sqlma/l2/MetadataKeyRequest/KeyRetrievalRequests.java
2007-03-15 20:18:47 UTC (rev 2241)
+++
trunk/functional-testing/sqlma/src/sqlma/l2/MetadataKeyRequest/KeyRetrievalRequests.java
2007-03-16 07:41:07 UTC (rev 2242)
@@ -130,7 +130,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -161,7 +161,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -184,7 +184,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -205,7 +205,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -238,7 +238,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -263,7 +263,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -332,7 +332,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -345,7 +345,7 @@
parameterSettings_now[1] = "now";
Element metadata =
utilities.createMetadata("meta4", utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "meta3");
doc.getRootElement().addContent(metadata);
@@ -379,7 +379,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -401,7 +401,7 @@
"logical", "Path.Status")));
metadata = utilities.createMetadata("meta4",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "meta3");
doc.getRootElement().addContent(metadata);
@@ -424,7 +424,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -446,7 +446,7 @@
"logical", "Path.Status")));
metadata = utilities.createMetadata("meta4",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "meta3");
doc.getRootElement().addContent(metadata);
@@ -476,7 +476,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -504,7 +504,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -534,7 +534,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -553,7 +553,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -573,7 +573,7 @@
// A request were the namespace is other than nmwg
case 1:
- nmwg = Namespace.getNamespace("nmwg",
+ utilities.nmwg =
Namespace.getNamespace("nmwg",
"http://ggf.org/ns/foo-nmwg/base/2.0/";);
doc.getRootElement().addContent(
@@ -586,17 +586,17 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
- nmwg = Namespace.getNamespace("nmwg",
+ utilities.nmwg =
Namespace.getNamespace("nmwg",
"http://ggf.org/ns/nmwg/base/2.0/";);
break;
// A request where the nmwgtopo3 is invalid
case 2:
- nmtl2 = Namespace.getNamespace("nmtl2",
+ utilities.nmtl2 =
Namespace.getNamespace("nmtl2",
"http://ggf.org/ns/nmwg/foo-topology/l2/3.0/";);
doc.getRootElement().addContent(
@@ -609,17 +609,17 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2",utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
- nmtl2 = Namespace.getNamespace("nmtl2",
+ utilities.nmtl2 =
Namespace.getNamespace("nmtl2",
"http://ggf.org/ns/nmwg/topology/l2/3.0/";);
break;
// A request where the select namespace is invalid
case 3:
- select = Namespace.getNamespace("select",
+ utilities.select =
Namespace.getNamespace("select",
"http://ggf.org/ns/nmwg/ops/foo-select/2.0/";);
doc.getRootElement().addContent(
@@ -632,11 +632,11 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
- select = Namespace.getNamespace("select",
+ utilities.select =
Namespace.getNamespace("select",
"http://ggf.org/ns/nmwg/ops/select/2.0/";);
break;
@@ -653,7 +653,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -673,7 +673,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -691,7 +691,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -709,7 +709,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -727,7 +727,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("",
utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -746,7 +746,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -761,7 +761,7 @@
parameterSettings_now[1] = "now";
Element metadata =
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.removeAttribute("id");
doc.getRootElement().addContent(metadata);
doc.getRootElement().addContent(
@@ -780,7 +780,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -796,7 +796,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -814,7 +814,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -833,7 +833,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -851,7 +851,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -866,7 +866,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -883,7 +883,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -899,7 +899,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -934,7 +934,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -951,7 +951,7 @@
parameterSettings_now[1] = "now";
metadata = utilities.createMetadata("meta2",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.removeChild("eventType", nmwg);
doc.getRootElement().addContent(metadata);
doc.getRootElement().addContent(
@@ -970,7 +970,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1029,7 +1029,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1071,7 +1071,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1112,7 +1112,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1154,7 +1154,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1194,7 +1194,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1235,7 +1235,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1272,7 +1272,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1309,7 +1309,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1346,7 +1346,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1365,7 +1365,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1386,7 +1386,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1407,7 +1407,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1425,7 +1425,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1446,7 +1446,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1467,7 +1467,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1485,7 +1485,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1505,7 +1505,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1525,7 +1525,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1542,7 +1542,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1562,7 +1562,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1582,7 +1582,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1602,7 +1602,7 @@
metadata = utilities.createMetadata("meta2",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "meta4");
doc.getRootElement().addContent(metadata);
@@ -1624,7 +1624,7 @@
metadata = utilities.createMetadata("meta2",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "");
doc.getRootElement().addContent(metadata);
@@ -1647,7 +1647,7 @@
metadata = utilities.createMetadata("meta2",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).removeAttribute(
"metadataIdRef");
doc.getRootElement().addContent(metadata);
@@ -1671,7 +1671,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
break;
@@ -1691,7 +1691,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(utilities.createData("data1", ""));
break;
@@ -1711,7 +1711,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"no_meta"));
@@ -1732,7 +1732,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
Element data = utilities.createData("data1",
"");
data.removeAttribute("metadataIdRef");
doc.getRootElement().addContent(data);
@@ -1775,7 +1775,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1816,7 +1816,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1856,7 +1856,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1896,7 +1896,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1936,7 +1936,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1963,7 +1963,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1990,7 +1990,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -2017,7 +2017,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -2044,7 +2044,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -2062,7 +2062,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -2080,7 +2080,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
Modified:
trunk/functional-testing/sqlma/src/sqlma/l2/MetadataKeyRequest/KeyRetrievalResponseParser.java
===================================================================
---
trunk/functional-testing/sqlma/src/sqlma/l2/MetadataKeyRequest/KeyRetrievalResponseParser.java
2007-03-15 20:18:47 UTC (rev 2241)
+++
trunk/functional-testing/sqlma/src/sqlma/l2/MetadataKeyRequest/KeyRetrievalResponseParser.java
2007-03-16 07:41:07 UTC (rev 2242)
@@ -1184,56 +1184,8 @@
// A valid response is expected.
case 2:
parserLogWrite(testCase, subTestCase);
- nodeList.add(this.node_dfn_mue);
- nodeList.add(this.node_psnc_pl);
- nodeList.add(this.node_psnc_pl2);
- nodeList.add(this.node_dfn_mue);
- linkList.add(this.link_psnc_dfn_mue_003);
- linkList.add(this.link_psnc2_dfn_mue_004);
- boolean link3 = false;
- boolean link4 = false;
- if
(utilities.nodeChecker(utilities.retrieveNodes(response),
- nodeList)) {
- if (utilities.linkChecker(utilities
-
.retrieveLinkes(response), linkList)) {
-
- List keyList =
response.getRootElement().getChildren(
- "data", nmwg);
- Iterator keyIt =
keyList.iterator();
- while (keyIt.hasNext()) {
- Element data =
(Element) keyIt.next();
-
- if
(utilities.checkKey(data, "PSNC-2-DFN-MUE-004",
-
"PSNC-2-DFN-MUE-Link-1002",
-
ibatisConfig_InterDomain)) {
- if
(utilities.checkTimeNow(data, "time", "now")) {
- link4
= true;
- }
- }
- if
(utilities.checkKey(data,
-
"md-link-PSNC-DFN-MUE-003",
-
"PSNC-DFN-MUE-Link-1001",
-
ibatisConfig_Domain)) {
- if
(utilities.checkTimeNow(data, "time", "now")) {
- link3
= true;
- }
- }
- }
- if (link3 && link4) {
- parserLogWrite(true,
1);
- return true;
- } else {
- parserLogWrite(false,
2);
- return false;
- }
- } else {
- parserLogWrite(false, 1);
- return false;
- }
- } else {
- parserLogWrite(false, 0);
- return false;
- }
+ return commonCheckCase_1(response,
+
"warning.ma.metadata_configuration");
// A case where both nodes are non existing.
// An error response is expected
case 3:
@@ -2037,12 +1989,8 @@
// from the node element. A valid response is
expected
case 52:
parserLogWrite(testCase, subTestCase);
- nodeList.clear();
- linkList.clear();
- nodeList.add(this.node_psnc_pl);
- linkList.add(this.link_psnc_dfn_mue_003);
- return commonCheckCase_2(response, nodeList,
linkList, "time",
- "now");
+ return commonCheckCase_1(response,
+
"warning.ma.metadata_configuration");
// A case where only the country element
exist in the node
// element a valid response is expected.
case 53:
@@ -2346,7 +2294,7 @@
parserLogWrite(true, i, j, 0);
success++;
} else {
-
parserLogWrite(false, 1, j, 0);
+
parserLogWrite(false, i, j, 0);
fail++;
failed.add("Test a_" + i + "_" + j + "\n");
}
Deleted:
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/MeasurementArchiveStoreRequests.java
Modified:
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataKeyRequests.java
===================================================================
---
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataKeyRequests.java
2007-03-15 20:18:47 UTC (rev 2241)
+++
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataKeyRequests.java
2007-03-16 07:41:07 UTC (rev 2242)
@@ -106,7 +106,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -138,7 +138,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -161,7 +161,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -182,7 +182,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -215,7 +215,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -240,7 +240,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -309,7 +309,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -322,7 +322,7 @@
parameterSettings_now[1] = "now";
Element metadata =
utilities.createMetadata("meta4", utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "meta3");
doc.getRootElement().addContent(metadata);
@@ -356,7 +356,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -378,7 +378,7 @@
"logical", "Path.Status")));
metadata = utilities.createMetadata("meta4",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "meta3");
doc.getRootElement().addContent(metadata);
@@ -401,7 +401,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -423,7 +423,7 @@
"logical", "Path.Status")));
metadata = utilities.createMetadata("meta4",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "meta3");
doc.getRootElement().addContent(metadata);
@@ -453,7 +453,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -481,7 +481,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -511,7 +511,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -530,7 +530,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -550,7 +550,7 @@
// A request were the namespace is other than nmwg
case 1:
- nmwg = Namespace.getNamespace("nmwg",
+ utilities.nmwg =
Namespace.getNamespace("nmwg",
"http://ggf.org/ns/foo-nmwg/base/2.0/";);
doc.getRootElement().addContent(
@@ -563,17 +563,17 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
- nmwg = Namespace.getNamespace("nmwg",
+ utilities.nmwg =
Namespace.getNamespace("nmwg",
"http://ggf.org/ns/nmwg/base/2.0/";);
break;
// A request where the nmwgtopo3 is invalid
case 2:
- nmtl2 = Namespace.getNamespace("nmtl2",
+ utilities.nmtl2 =
Namespace.getNamespace("nmtl2",
"http://ggf.org/ns/nmwg/foo-topology/l2/3.0/";);
doc.getRootElement().addContent(
@@ -586,17 +586,17 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
- nmtl2 = Namespace.getNamespace("nmtl2",
+ utilities.nmtl2 =
Namespace.getNamespace("nmtl2",
"http://ggf.org/ns/nmwg/topology/l2/3.0/";);
break;
// A request where the select namespace is invalid
case 3:
- select = Namespace.getNamespace("select",
+ utilities.select =
Namespace.getNamespace("select",
"http://ggf.org/ns/nmwg/ops/foo-select/2.0/";);
doc.getRootElement().addContent(
@@ -609,11 +609,11 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
- select = Namespace.getNamespace("select",
+ utilities.select =
Namespace.getNamespace("select",
"http://ggf.org/ns/nmwg/ops/select/2.0/";);
break;
@@ -630,7 +630,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -650,7 +650,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -668,7 +668,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -686,7 +686,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -704,7 +704,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("",
utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -723,7 +723,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -738,7 +738,7 @@
parameterSettings_now[1] = "now";
Element metadata =
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.removeAttribute("id");
doc.getRootElement().addContent(metadata);
doc.getRootElement().addContent(
@@ -757,7 +757,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -773,7 +773,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -791,7 +791,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -810,7 +810,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -828,7 +828,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -843,7 +843,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -860,7 +860,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -876,7 +876,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -911,7 +911,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -947,7 +947,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1006,7 +1006,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1048,7 +1048,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1089,7 +1089,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1131,7 +1131,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1171,7 +1171,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1212,7 +1212,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1249,7 +1249,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1286,7 +1286,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1323,7 +1323,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1342,7 +1342,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1363,7 +1363,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1384,7 +1384,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1402,7 +1402,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1423,7 +1423,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1444,7 +1444,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1462,7 +1462,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1482,7 +1482,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1502,7 +1502,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1519,7 +1519,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1539,7 +1539,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1559,7 +1559,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1579,7 +1579,7 @@
metadata = utilities.createMetadata("meta2",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "meta4");
doc.getRootElement().addContent(metadata);
@@ -1601,7 +1601,7 @@
metadata = utilities.createMetadata("meta2",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "");
doc.getRootElement().addContent(metadata);
@@ -1624,7 +1624,7 @@
metadata = utilities.createMetadata("meta2",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).removeAttribute(
"metadataIdRef");
doc.getRootElement().addContent(metadata);
@@ -1648,7 +1648,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
break;
@@ -1668,7 +1668,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(utilities.createData("data1", ""));
break;
@@ -1688,7 +1688,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"no_meta"));
@@ -1709,7 +1709,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
Element data = utilities.createData("data1",
"");
data.removeAttribute("metadataIdRef");
doc.getRootElement().addContent(data);
@@ -1752,7 +1752,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1793,7 +1793,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1833,7 +1833,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1873,7 +1873,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1913,7 +1913,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1940,7 +1940,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1967,7 +1967,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1994,7 +1994,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -2021,7 +2021,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -2039,7 +2039,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -2057,7 +2057,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
Modified:
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataKeyResponseParser.java
===================================================================
---
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataKeyResponseParser.java
2007-03-15 20:18:47 UTC (rev 2241)
+++
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataKeyResponseParser.java
2007-03-16 07:41:07 UTC (rev 2242)
@@ -1174,14 +1174,8 @@
// A valid response is expected.
case 2:
parserLogWrite(testCase, subTestCase);
- nodeList.clear();
- linkList.clear();
- nodeList.add(this.node_dfn_mue);
- linkList.add(this.link_psnc_dfn_mue_003);
- linkList.add(this.link_psnc2_dfn_mue_004);
- linkList.add(this.link_lrz_sara_deisa_001);
- linkList.add(this.link_lrz_sara_deisa_002);
- return commonCheckCase_2(response, nodeList,
linkList);
+ return commonCheckCase_5(response,
+
"warning.ma.metadata_configuration");
// A case where both nodes are non existing.
// An error response is expected
case 3:
@@ -1303,12 +1297,12 @@
// reposne is expected
case 16:
parserLogWrite(testCase, subTestCase);
- return commonCheckCase_5(response,
"warning.common.no_metadata");
+ return commonCheckCase_5(response,
"error.ma.query");
// A request where the global name element
doesn't exist. An
// error response is expected.
case 17:
parserLogWrite(testCase, subTestCase);
- return commonCheckCase_5(response,
"warning.common.no_metadata");
+ return commonCheckCase_5(response,
"error.ma.query");
// A request where the event type element of
the first metadata
// element hasn no value. An error response
is expected.
case 18:
@@ -1338,7 +1332,7 @@
// element has an invalid value. An error
response is expected.
case 23:
parserLogWrite(testCase, subTestCase);
- return commonCheckCase_5(response,
"error.ma.query");
+ return commonCheckCase_5(response,
"warning.common.no_metadata");
// A case where the type attribute(name
element) of the first
// node element has no value. A valid
response is expected.
@@ -1391,7 +1385,7 @@
// error response is expected
case 33:
parserLogWrite(testCase, subTestCase);
- return commonCheckCase_5(response,
"error.ma.query");
+ return commonCheckCase_5(response,
"error.sqlma.db_connection");
// A case where the time parameter is not
'startTime'. A valid
// response is expected
case 34:
@@ -1422,7 +1416,7 @@
// response is expected.
case 39:
parserLogWrite(testCase, subTestCase);
- return commonCheckCase_5(response,
"error.ma.query");
+ return commonCheckCase_5(response,
"error.sqlma.db_connection");
// A case where the time specification is
empty(startTime).An
// error response is expected.
@@ -1439,7 +1433,7 @@
// value.An error response is expected
case 42:
parserLogWrite(testCase, subTestCase);
- return commonCheckCase_5(response,
"error.ma.query");
+ return commonCheckCase_5(response,
"error.sqlma.db_connection");
// A request where the time specification is
// invalid(startTime).A valid response is
expected
@@ -1489,90 +1483,21 @@
// A case where country,city,name and
institution are missing
// from the node element. A valid response is
expected
case 52:
- nodeList.clear();
- linkList.clear();
parserLogWrite(testCase, subTestCase);
- Hashtable results = new Hashtable();
- nodeList.add(this.node_psnc_pl);
- linkList.add(this.link_psnc_dfn_mue_003);
- boolean meta = false;
- boolean result = false;
- if
(utilities.nodeChecker(utilities.retrieveNodes(response),
- nodeList)) {
- if (utilities.linkChecker(utilities
-
.retrieveLinkes(response), linkList)) {
- parserLogWrite(true, 0);
- meta = true;
-
- } else {
- parserLogWrite(false, 0);
- meta = false;
- }
- } else {
- parserLogWrite(false, 1);
- meta = false;
- }
- results = utilities.retrieveResults(response);
-
- String[] resResults = (String[]) results
-
.get("PSNC-DFN-MUE-Link-1001");
- String[] queryResults = null;
- Hashtable resultTable = null;
- try {
- resultTable = client.executeNowQuery(
-
"PSNC-DFN-MUE-Link-1001", "domain_link");
- if (!resultTable.isEmpty()) {
- queryResults = (String[])
resultTable
-
.get("PSNC-DFN-MUE-Link-1001");
- }
-
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- if (resultTable != null) {
- if (resResults != null) {
- if (queryResults != null) {
-
- if (utilities
-
.checkResults(resResults, queryResults)) {
-
parserLogWrite(true, 1);
- result = true;
- } else {
-
parserLogWrite(false, 2);
- result =
false;
- }
- } else {
- parserLogWrite(false,
2);
- result = false;
- }
- } else {
- if (queryResults == null) {
- parserLogWrite(true,
1);
- result = true;
- } else {
- //
System.out.println("data");
- parserLogWrite(false,
2);
- result = false;
- }
- }
- } else {
- parserLogWrite(false, 3);
- }
- return (meta && result);
+ return commonCheckCase_5(response,
"warning.ma.metadata_configuration");
// A case where only the country element
exist in the node
// element a valid response is expected.
case 53:
parserLogWrite(testCase, subTestCase);
nodeList.clear();
linkList.clear();
- results = new Hashtable();
+ Hashtable results = new Hashtable();
nodeList.add(this.node_dfn_mue);
nodeList.add(this.node_psnc_pl);
nodeList.add(this.node_dfn_lrz);
linkList.add(this.link_psnc_dfn_mue_003);
- meta = false;
- result = false;
+ boolean meta = false;
+ boolean result = false;
if
(utilities.nodeChecker(utilities.retrieveNodes(response),
nodeList)) {
if (utilities.linkChecker(utilities
@@ -1590,9 +1515,9 @@
}
results = utilities.retrieveResults(response);
- resResults = (String[])
results.get("PSNC-DFN-MUE-Link-1001");
- queryResults = null;
- resultTable = null;
+ String[] resResults = (String[])
results.get("PSNC-DFN-MUE-Link-1001");
+ String[] queryResults = null;
+ Hashtable resultTable = null;
try {
resultTable = client.executeNowQuery(
"PSNC-DFN-MUE-Link-1001", "domain_link");
@@ -1830,7 +1755,7 @@
parserLogWrite(true, i, j, 0);
success++;
} else {
-
parserLogWrite(false, 1, j, 0);
+
parserLogWrite(false, i, j, 0);
fail++;
failed.add("Test b_" + i + "_" + j + "\n");
}
@@ -1933,7 +1858,7 @@
else {
System.out.println("Wrong input. Needed parameters
are:");
System.out
- .println("[Input Directory][Database
Address][Database][Password][Configuration File][Validation Log][Parser
Log]");
+ .println("[Input Directory][Database
Address][Username][Password][Configuration File][Validation Log][Parser
Log]");
}
}
Modified:
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataRequests.java
===================================================================
---
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataRequests.java
2007-03-15 20:18:47 UTC (rev 2241)
+++
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataRequests.java
2007-03-16 07:41:07 UTC (rev 2242)
@@ -1,4 +1,4 @@
-package sqlma.l2.SetupDataRequest;
+ package sqlma.l2.SetupDataRequest;
import java.io.File;
import java.io.FileNotFoundException;
@@ -112,7 +112,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -139,7 +139,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -186,7 +186,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -215,7 +215,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -247,7 +247,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -277,7 +277,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -341,7 +341,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -360,7 +360,7 @@
Element metadata =
utilities.createMetadata("meta4", utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "meta3");
doc.getRootElement().addContent(metadata);
@@ -392,7 +392,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -411,7 +411,7 @@
metadata = utilities.createMetadata("meta3",
utilities
.createMetadataElements_Time(parameterSettings_frame,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "meta3");
doc.getRootElement().addContent(metadata);
@@ -437,7 +437,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
Element key = new Element("key", nmwg);
Element parameters = new
Element("parameters", nmwg);
@@ -483,7 +483,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -513,7 +513,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -541,7 +541,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -567,7 +567,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -593,7 +593,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -620,7 +620,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -646,7 +646,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("",
utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -663,7 +663,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("",
utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -682,7 +682,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("",
utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -700,7 +700,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -725,7 +725,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -750,7 +750,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -768,7 +768,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -792,7 +792,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -816,7 +816,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -835,7 +835,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -854,7 +854,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -873,7 +873,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -894,7 +894,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -916,7 +916,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -937,7 +937,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -959,7 +959,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -980,7 +980,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1002,7 +1002,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1023,7 +1023,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1045,7 +1045,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1067,7 +1067,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1093,7 +1093,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1121,7 +1121,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1150,7 +1150,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1176,7 +1176,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
break;
@@ -1205,7 +1205,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1234,7 +1234,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1260,7 +1260,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1288,7 +1288,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1316,7 +1316,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1342,7 +1342,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1370,7 +1370,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1398,7 +1398,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_frame, "select")));
+
parameterSettings_frame, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"meta2"));
@@ -1425,7 +1425,7 @@
metadata = utilities.createMetadata("meta2",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "meta4");
doc.getRootElement().addContent(metadata);
@@ -1455,7 +1455,7 @@
metadata = utilities.createMetadata("meta2",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).setAttribute(
"metadataIdRef", "");
doc.getRootElement().addContent(metadata);
@@ -1484,7 +1484,7 @@
metadata = utilities.createMetadata("meta2",
utilities
.createMetadataElements_Time(parameterSettings_now,
- "select"));
+
"http://ggf.org/ns/nmwg/ops/select/2.0";));
metadata.getChild("subject",
select).removeAttribute(
"metadataIdRef");
doc.getRootElement().addContent(metadata);
@@ -1514,7 +1514,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
break;
@@ -1541,7 +1541,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
""));
@@ -1568,7 +1568,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
doc.getRootElement().addContent(
utilities.createData("data1",
"no_meta"));
@@ -1596,7 +1596,7 @@
doc.getRootElement().addContent(
utilities.createMetadata("meta2", utilities
.createMetadataElements_Time(
-
parameterSettings_now, "select")));
+
parameterSettings_now, "http://ggf.org/ns/nmwg/ops/select/2.0";)));
Element data = utilities.createData("data1",
"");
data.removeAttribute("metadataIdRef");
doc.getRootElement().addContent(data);
Modified:
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataResponseParser.java
===================================================================
---
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataResponseParser.java
2007-03-15 20:18:47 UTC (rev 2241)
+++
trunk/functional-testing/sqlma/src/sqlma/l2/SetupDataRequest/SetupDataResponseParser.java
2007-03-16 07:41:07 UTC (rev 2242)
@@ -59,7 +59,7 @@
private static final int NUMBER_OF_TEST_CASES = 2;
- private static final int NUMBER_OF_SUB_CASE_1 = 13;
+ private static final int NUMBER_OF_SUB_CASE_1 = 12;
private static final int NUMBER_OF_SUB_CASE_2 = 46;
@@ -1456,11 +1456,11 @@
// getting the results from the request
results = utilities.retrieveResults(response,
links);
- if (results == null) {
+ if (results.isEmpty()) {
parserLogWrite(true, 1);
result = true;
} else {
- // System.out.println("data");
+ System.out.println(results.size());
parserLogWrite(false, 2);
result = false;
@@ -2021,7 +2021,7 @@
// expected
case 41:
parserLogWrite(testCase, subTestCase);
- return commonCheckCase_4(response,
"warning.common.no_metadata");
+ return commonCheckCase_4(response,
"error.ma.query");
// A response from arequest where the
metadataIdRef of the
// second metadata element is missing. An
error response is
// expected.
- perfsonar: r2242 - in trunk/functional-testing/sqlma/src/sqlma: echo l2/MeasurmentArchiveStoreRequest l2/MetadataKeyRequest l2/SetupDataRequest, svnlog, 03/16/2007
Archive powered by MHonArc 2.6.16.