Merge remote-tracking branch 'origin/newRegressionTests' into dev

Author: sravanr

test-complete/src/test/java/com/marklogic/javaclient/ArtifactIndexedOnStringSub.java

@@ -0,0 +1,22 @@
+package com.marklogic.javaclient;
+
+import com.marklogic.client.pojo.annotation.PathIndexProperty;
+import com.marklogic.client.pojo.annotation.PathIndexProperty.ScalarType;
+
+/* This class is used to test range path index creation, when the Annotation is
+ * in the super class and sub class adds an additional annotation entry.
+ * 
+ * Used to test annotation in a hierarchy. 
+ */
+public class ArtifactIndexedOnStringSub extends ArtifactIndexedOnString {
+	@PathIndexProperty(scalarType = ScalarType.DOUBLE)
+	public double artifactWeight;
+
+	public double getArtifactWeight() {
+		return artifactWeight;
+	}
+
+	public ArtifactIndexedOnStringSub setArtifactWeight(double artifactWeight) {
+		this.artifactWeight = artifactWeight; return this;
+	}
+}

test-complete/src/test/java/com/marklogic/javaclient/ArtifactIndexedUnSupportedDataType.java

@@ -0,0 +1,41 @@
+package com.marklogic.javaclient;
+
+import com.marklogic.client.pojo.annotation.Id;
+import com.marklogic.client.pojo.annotation.PathIndexProperty;
+import com.marklogic.client.pojo.annotation.PathIndexProperty.ScalarType;
+
+public class ArtifactIndexedUnSupportedDataType {
+	@Id
+    public long id;
+    private String name;
+    
+    //Note: Any Type other than supported ones in ScalarType class will have compile issues.
+    @PathIndexProperty(scalarType = ScalarType.STRING)
+    public Company manufacturer;
+    private int inventory;
+  
+    public long getId() {
+        return id;
+    }
+    public ArtifactIndexedUnSupportedDataType setId(long id) {
+        this.id= id; return this;
+    }
+    public String getName() {
+        return name;
+    }
+    public ArtifactIndexedUnSupportedDataType setName(String name) {
+        this.name = name; return this;
+    }
+    public Company getManufacturer() {
+        return manufacturer;
+    }
+    public ArtifactIndexedUnSupportedDataType setManufacturer(Company manufacturer) {
+        this.manufacturer= manufacturer; return this;
+    }
+    public int getInventory() {
+        return inventory;
+    }
+    public ArtifactIndexedUnSupportedDataType setInventory(int inventory) {
+        this.inventory= inventory; return this;
+    }
+}

test-complete/src/test/java/com/marklogic/javaclient/ArtifactMultipleIndexedOnInt.java

@@ -0,0 +1,22 @@
+package com.marklogic.javaclient;
+
+import com.marklogic.client.pojo.annotation.PathIndexProperty;
+import com.marklogic.client.pojo.annotation.PathIndexProperty.ScalarType;
+/* This class is used to test range path index creation, when the Annotation is
+ * in the super class and also in sub class on the same class property with same data type.
+ * 
+ * Used to test annotation with collisions in a hierarchy. 
+ */
+
+public class ArtifactMultipleIndexedOnInt extends ArtifactIndexedOnInt {
+	@PathIndexProperty(scalarType = ScalarType.INT)
+	private int inventory;
+
+	public int getInventory() {
+		return inventory;
+	}
+
+	public ArtifactMultipleIndexedOnInt setInventory(int inventory) {
+		this.inventory = inventory; return this;
+	}
+}

test-complete/src/test/java/com/marklogic/javaclient/ConnectedRESTQA.java

@@ -91,8 +91,8 @@ public static String getBootStrapHostFromML() {
 		if(!jnode.isNull()){
 
 			if(jnode.has(propName)){
-//				System.out.println(jnode.withArray(propName).get(0).asText());
-			return jnode.withArray(propName).get(0).asText();
+			System.out.println("Bootstrap Host: " + jnode.withArray(propName).get(0).get("bootstrap-host-name").asText());
+			return jnode.withArray(propName).get(0).get("bootstrap-host-name").asText();
 			}
 			else{
 				System.out.println("Missing "+propName+" field from properties end point so sending java conanical host name\n"+jnode.toString());
@@ -1580,6 +1580,56 @@ else if (respEntity != null) {
 
 	}
 
+	/*
+	 * Create a temporal collection
+	 * @dbName Database Name
+	 * @collectionName Collection Name (name of temporal collection that needs to be created)
+	 * @systemAxisName Name of System axis
+	 * @validAxisName Name of Valid axis
+	 */
+	public static void updateTemporalCollectionForLSQT(String dbName, String collectionName, boolean enable) 
+			throws Exception
+	{
+		ObjectMapper mapper = new ObjectMapper();
+		ObjectNode rootNode = mapper.createObjectNode();
+		rootNode.put( "lsqt-enabled", enable);
+
+		System.out.println(rootNode.toString());
+
+
+		DefaultHttpClient client = new DefaultHttpClient();
+		client.getCredentialsProvider().setCredentials(
+				new AuthScope("localhost", 8002),
+				new UsernamePasswordCredentials("admin", "admin"));
+
+		HttpPut put = new HttpPut("http://localhost:8002/manage/v2/databases/"+ dbName + "/temporal/collections/lsqt/properties?collection=" + collectionName);
+
+		put.addHeader("Content-type", "application/json");
+		put.addHeader("accept", "application/json");
+		put.setEntity(new StringEntity(rootNode.toString()));
+
+		HttpResponse response = client.execute(put);
+		HttpEntity respEntity = response.getEntity();
+		if( response.getStatusLine().getStatusCode() == 400)
+		{
+			HttpEntity entity = response.getEntity();
+			String responseString = EntityUtils.toString(entity, "UTF-8");
+			System.out.println(responseString);
+		}
+		else if (respEntity != null) {
+			// EntityUtils to get the response content
+			String content =  EntityUtils.toString(respEntity);
+			System.out.println(content);
+			
+			System.out.println("Temporal collection: " + collectionName + " created");
+			System.out.println("==============================================================");
+		}
+		else {
+			System.out.println("No Proper Response");
+		}
+
+	}
+
 	/*
 	 * Delete a temporal collection
 	 * @dbName Database Name