Added changed message, new attributes from develop branch

Author: Ajit George

test-complete/src/test/java/com/marklogic/client/functionaltest/ConnectedRESTQA.java

@@ -1448,7 +1448,7 @@ public static void includeElementField(String dbName, String field_name, String
 		setDatabaseFieldProperties(dbName,field_name,"included-element",childNode);
 
 	}
-	public static void includeElementFieldWithWeight(String dbName, String field_name, String namespace, String elementName, double weight) throws Exception{
+	public static void includeElementFieldWithWeight(String dbName, String field_name, String namespace, String elementName, double weight, String attrNS_URI, String attr_localname, String attr_value) throws Exception{
 
 		ObjectMapper mapper = new ObjectMapper();
 		//			ObjectNode mainNode = mapper.createObjectNode();
@@ -1458,10 +1458,12 @@ public static void includeElementFieldWithWeight(String dbName, String field_nam
 		childNodeObject.put( "namespace-uri", namespace);
 		childNodeObject.put( "localname", elementName);
 		childNodeObject.put("weight", weight);
+		// These 3 are new fields that have been added as of 8.0.2 from 03/20/2015 in the Management API.
+		childNodeObject.put( "attribute-namespace-uri", attrNS_URI);
+		childNodeObject.put( "attribute-localname", attr_localname);
+		childNodeObject.put( "attribute-value", attr_value);				
 		arrNode.add(childNodeObject);
-		childNode.putArray("included-element").addAll(arrNode);
-		//			mainNode.put("included-elements", childNode);
-		//			System.out.println( childNode.toString());
+		childNode.putArray("included-element").addAll(arrNode);		
 		setDatabaseFieldProperties(dbName,field_name,"included-element",childNode);
 
 	}
@@ -1476,7 +1478,7 @@ public static void setupAppServicesConstraint(String dbName) throws Exception {
 		addRangeElementAttributeIndex(dbName, "decimal", "http://cloudbank.com", "price", "", "amt", "http://marklogic.com/collation/");
 		enableTrailingWildcardSearches(dbName);
 		addFieldExcludeRoot(dbName, "para");
-		includeElementFieldWithWeight(dbName, "para", "", "p", 5);
+		includeElementFieldWithWeight(dbName, "para", "", "p", 5,"","","");
 		addRangePathIndex(dbName, "string", "/Employee/fn", "http://marklogic.com/collation/", "ignore");
 		addRangePathIndex(dbName, "int", "/root/popularity", "", "ignore");
 		addRangePathIndex(dbName, "decimal", "//@amt", "", "ignore");

test-complete/src/test/java/com/marklogic/client/functionaltest/TestBiTemporal.java

@@ -136,6 +136,8 @@ public static void tearDownAfterClass() throws Exception {
 
     // Delete database first. Otherwise axis and collection cannot be deleted
     tearDownJavaRESTServer(dbName, fNames, restServerName);
+    deleteRESTUser("eval-user");
+    deleteUserRole("test-eval");
 
     // Temporal collection needs to be delete before temporal axis associated
     // with it can be deleted
@@ -1837,7 +1839,7 @@ public void testSystemTimeUsingInvalidTime() throws Exception {
       System.out.println(message);
       System.out.println(statusCode);
 
-      assertTrue("Error Message", message.equals("TEMPORAL-SYSTEMTIME-BACKWARDS"));
+      assertTrue("Error Message", message.equals("TEMPORAL-OPNOTAFTERLSQT"));
       assertTrue("Status code", (statusCode == 400));
     }
 

test-complete/src/test/java/com/marklogic/client/functionaltest/TestResponseTransform.java

@@ -196,7 +196,7 @@ public void testResponseTransformInvalid() throws IOException, ParserConfigurati
 			System.out.println(exception);
 		}
 
-		String expectedException = "Local message: search failed: Bad Request. Server Message: XDMP-MODNOTFOUND: (err:XQST0059) Module /marklogic.rest.transform/foo/assets/transform.xqy not found";
+		String expectedException = "Local message: search failed: Bad Request. Server Message: RESTAPI-INVALIDREQ: (err:FOER0000) Invalid request:  reason: Extension foo does not exist.";
 		assertTrue("exception is not thrown", exception.contains(expectedException));
 		//bug 22356
 		assertTrue("Value should be null", resultsHandle.get()==null);