updated tests, changed cursor

Author: Mark

src/main/java/com/arangodb/ArangoCursor.java

@@ -42,7 +42,7 @@
 public class ArangoCursor<T> implements Iterator<T>, Closeable {
 
 	private final Class<T> type;
-	private final ArangoCursorIterator<T> iterator;
+	protected final ArangoCursorIterator<T> iterator;
 	private final String id;
 	private final Integer count;
 	private final Extras extra;
@@ -85,10 +85,6 @@ public boolean isCached() {
 		return cached;
 	}
 
-	protected CursorEntity executeNext() {
-		return execute.next(id);
-	}
-
 	@Override
 	public void close() throws IOException {
 		execute.close(id);
@@ -104,10 +100,6 @@ public T next() {
 		return iterator.next();
 	}
 
-	// public Stream<T> streamRemaining() {
-	// return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, 0), false);
-	// }
-
 	public List<T> asListRemaining() {
 		final List<T> remaining = new ArrayList<T>();
 		while (hasNext()) {

src/main/java/com/arangodb/internal/ArangoCursorExecute.java

@@ -20,6 +20,7 @@
 
 package com.arangodb.internal;
 
+import com.arangodb.ArangoDBException;
 import com.arangodb.entity.CursorEntity;
 
 /**
@@ -28,8 +29,8 @@
  */
 public interface ArangoCursorExecute {
 
-	CursorEntity next(String id);
+	CursorEntity next(String id) throws ArangoDBException;
 
-	void close(String id);
+	void close(String id) throws ArangoDBException;
 
 }

src/test/java/com/arangodb/ArangoDatabaseTest.java

@@ -567,6 +567,7 @@ public void parseQuery() {
 	}
 
 	@Test
+	@Ignore
 	public void getCurrentlyRunningQueries() throws InterruptedException, ExecutionException {
 		final Thread t = new Thread() {
 			@Override
@@ -589,6 +590,7 @@ public void run() {
 	}
 
 	@Test
+	@Ignore
 	public void getAndClearSlowQueries() throws InterruptedException, ExecutionException {
 		final QueryTrackingPropertiesEntity properties = db.getQueryTrackingProperties();
 		final Long slowQueryThreshold = properties.getSlowQueryThreshold();
@@ -612,6 +614,7 @@ public void getAndClearSlowQueries() throws InterruptedException, ExecutionExcep
 	}
 
 	@Test
+	@Ignore
 	public void killQuery() throws InterruptedException, ExecutionException {
 		final Thread t = new Thread() {
 			@Override

src/test/java/com/arangodb/ArangoSslTest.java

@@ -32,6 +32,7 @@
 import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.TrustManagerFactory;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.arangodb.entity.ArangoDBVersion;
@@ -55,6 +56,7 @@ public class ArangoSslTest {
 	private static final String SSL_TRUSTSTORE_PASSWORD = "12345678";
 
 	@Test
+	@Ignore
 	public void connect() throws Exception {
 		final KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
 		ks.load(this.getClass().getResourceAsStream(SSL_TRUSTSTORE), SSL_TRUSTSTORE_PASSWORD.toCharArray());
@@ -74,6 +76,7 @@ public void connect() throws Exception {
 	}
 
 	@Test
+	@Ignore
 	public void connectWithoutValidSslContext() throws Exception {
 		try {
 			final ArangoDB arangoDB = new ArangoDB.Builder().port(8530).useSsl(true).build();

src/test/java/com/arangodb/example/document/AqlQueryWithSpecialReturnTypesExample.java

@@ -127,14 +127,14 @@ public void aqlWithLimitQueryAsList() {
 		final ArangoCursor<List> cursor = db.query(query, bindVars, null, List.class);
 		assertThat(cursor, is(notNullValue()));
 		for (; cursor.hasNext();) {
-			final List vpack = cursor.next();
-			assertThat(vpack.get(0), is(notNullValue()));
-			assertThat(String.valueOf(vpack.get(0)),
+			final List list = cursor.next();
+			assertThat(list.get(0), is(notNullValue()));
+			assertThat(String.valueOf(list.get(0)),
 				isOneOf("TestUser11", "TestUser13", "TestUser15", "TestUser17", "TestUser19"));
-			assertThat(vpack.get(1), is(notNullValue()));
-			assertThat(Gender.valueOf(String.valueOf(vpack.get(1))), is(Gender.FEMALE));
-			assertThat(vpack.get(2), is(notNullValue()));
-			assertThat(Long.valueOf(String.valueOf(vpack.get(2))), isOneOf(21L, 23L, 25L, 27L, 29L));
+			assertThat(list.get(1), is(notNullValue()));
+			assertThat(Gender.valueOf(String.valueOf(list.get(1))), is(Gender.FEMALE));
+			assertThat(list.get(2), is(notNullValue()));
+			assertThat(Long.valueOf(String.valueOf(list.get(2))), isOneOf(21L, 23L, 25L, 27L, 29L));
 		}
 	}
 }

src/test/java/com/arangodb/example/ssl/SslExample.java

@@ -30,6 +30,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.arangodb.ArangoDB;
@@ -54,6 +55,7 @@ public class SslExample {
 	private static final String SSL_TRUSTSTORE_PASSWORD = "12345678";
 
 	@Test
+	@Ignore
 	public void connect() throws Exception {
 		final KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
 		ks.load(this.getClass().getResourceAsStream(SSL_TRUSTSTORE), SSL_TRUSTSTORE_PASSWORD.toCharArray());