Merge pull request #258 from arangodb/bug-fix/added-server-license-method-for-tests

added getLicense method, fixed enterprise only test

Author: BCaxelbecker

ChangeLog.md

@@ -13,7 +13,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ### Added
 
-- add smartJoinAttribute and shardingStrategy
+- added smartJoinAttribute and shardingStrategy collection attributes
 
 ## [5.0.4] - 2019-18-01
 

src/main/java/com/arangodb/ArangoDB.java

@@ -711,7 +711,7 @@ public synchronized ArangoDB build() {
 	 * @throws ArangoDBException
 	 */
 	ServerRole getRole() throws ArangoDBException;
-
+	
 	/**
 	 * Create a new user. This user will not have access to any database. You need permission to the _system database in
 	 * order to execute this call.

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

@@ -60,6 +60,7 @@
 
 /**
  * @author Mark Vollmary
+ * @author Heiko Kernbach
  *
  */
 public class ArangoDBImpl extends InternalArangoDB<ArangoExecutorSync> implements ArangoDB {
@@ -193,7 +194,7 @@ public ArangoDBVersion getVersion() throws ArangoDBException {
 	public ServerRole getRole() throws ArangoDBException {
 		return executor.execute(getRoleRequest(), getRoleResponseDeserializer());
 	}
-
+	
 	@Override
 	public UserEntity createUser(final String user, final String passwd) throws ArangoDBException {
 		return executor.execute(createUserRequest(db().name(), user, passwd, new UserCreateOptions()),

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

@@ -46,15 +46,16 @@
 
 /**
  * @author Mark Vollmary
+ * @author Heiko Kernbach
  *
  */
 public abstract class InternalArangoDB<E extends ArangoExecutor> extends ArangoExecuteable<E> {
 
-	private static final String PATH_API_ADMIN_LOG = "/_admin/log";
-	private static final String PATH_API_ADMIN_LOG_LEVEL = "/_admin/log/level";
-	private static final String PATH_API_ROLE = "/_admin/server/role";
-	protected static final String PATH_ENDPOINTS = "/_api/cluster/endpoints";
-	private static final String PATH_API_USER = "/_api/user";
+	private static final String PATH_API_ADMIN_LOG = 		"/_admin/log";
+	private static final String PATH_API_ADMIN_LOG_LEVEL = 	"/_admin/log/level";
+	private static final String PATH_API_ROLE = 			"/_admin/server/role";
+	protected static final String PATH_ENDPOINTS = 			"/_api/cluster/endpoints";
+	private static final String PATH_API_USER = 			"/_api/user";
 
 	protected InternalArangoDB(final E executor, final ArangoSerializationFactory util, final ArangoContext context) {
 		super(executor, util, context);
@@ -72,7 +73,7 @@ public ServerRole deserialize(final Response response) throws VPackException {
 			}
 		};
 	}
-
+	
 	protected Request createDatabaseRequest(final String name) {
 		final Request request = request(ArangoRequestParam.SYSTEM, RequestType.POST,
 			InternalArangoDatabase.PATH_API_DATABASE);

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

@@ -172,16 +172,26 @@ public void createCollectionWithReplicationFactor() {
 
 	@Test
 	public void createSatelliteCollection() {
+
+		if (arangoDB.getVersion().getLicense() == ArangoDBVersion.License.COMMUNITY) {
+			LOG.info("Skip Test on COMMUNITY VERSION");
+			return;
+		}
+		
 		if (arangoDB.getRole() == ServerRole.SINGLE) {
+			LOG.info("Skip Test on SINGLE SERVER");
 			return;
 		}
+		
 		try {
-			final CollectionEntity result = db.createCollection(COLLECTION_NAME,
-				new CollectionCreateOptions().satellite(true));
+			
+			final CollectionEntity result = db.createCollection(COLLECTION_NAME, new CollectionCreateOptions().satellite(true));
+			
 			assertThat(result, is(notNullValue()));
 			assertThat(result.getId(), is(notNullValue()));
 			assertThat(db.collection(COLLECTION_NAME).getProperties().getReplicationFactor(), is(nullValue()));
 			assertThat(db.collection(COLLECTION_NAME).getProperties().getSatellite(), is(true));
+			
 		} finally {
 			db.collection(COLLECTION_NAME).drop();
 		}