fixed expectations in analyzer tests

Author: rashtao

src/test/java/com/arangodb/ArangoSearchTest.java

@@ -189,7 +189,7 @@ public void createWithPrimarySort() {
         assertThat(info.getType(), is(ViewType.ARANGO_SEARCH));
         assertThat(db.arangoSearch(viewName).exists(), is(true));
 
-        if(isAtLeastVersion(3,7)){
+        if (isAtLeastVersion(3, 7)) {
             final ArangoSearchPropertiesEntity properties = view.getProperties();
             assertThat(properties.getPrimarySortCompression(), is(ArangoSearchCompression.none));
             Collection<StoredValue> retrievedStoredValues = properties.getStoredValues();
@@ -371,16 +371,16 @@ private void createGetAndDeleteTypedAnalyzer(SearchAnalyzer analyzer) {
     }
 
     private void compareProperties(Map<String, Object> actualProperties, Map<String, Object> expectedProperties) {
-        expectedProperties.forEach((key, value) -> {
-            Object expectedValue = actualProperties.get(key);
-            if (value instanceof Map) {
-                assertThat(expectedValue, notNullValue());
-                assertThat(expectedValue, instanceOf(Map.class));
-                compareProperties((Map) value, (Map) expectedValue);
-            } else if(value instanceof Number){
-                assertThat(Double.valueOf(value.toString()), is(Double.valueOf(expectedValue.toString())));
-            }else {
-                assertThat(value, is(expectedValue));
+        expectedProperties.forEach((key, expectedValue) -> {
+            Object actualValue = actualProperties.get(key);
+            if (expectedValue instanceof Map) {
+                assertThat(actualValue, notNullValue());
+                assertThat(actualValue, instanceOf(Map.class));
+                compareProperties((Map) actualValue, (Map) expectedValue);
+            } else if (expectedValue instanceof Number) {
+                assertThat(Double.valueOf(actualValue.toString()), is(Double.valueOf(expectedValue.toString())));
+            } else {
+                assertThat(actualValue, is(expectedValue));
             }
         });
     }
@@ -943,8 +943,8 @@ public void geoPointAnalyzer() {
         options.setMinLevel(8);
 
         GeoPointAnalyzerProperties properties = new GeoPointAnalyzerProperties();
-        properties.setLatitude(new String[]{"a", "b","c"});
-        properties.setLongitude(new String[]{"d", "e","f"});
+        properties.setLatitude(new String[]{"a", "b", "c"});
+        properties.setLongitude(new String[]{"d", "e", "f"});
         properties.setOptions(options);
 
         Set<AnalyzerFeature> features = new HashSet<>();

src/test/java/com/arangodb/async/ArangoSearchTest.java

@@ -307,14 +307,16 @@ private void createGetAndDeleteAnalyzer(AnalyzerEntity options) throws Execution
     }
 
     private void compareProperties(Map<String, Object> actualProperties, Map<String, Object> expectedProperties) {
-        expectedProperties.forEach((key, value) -> {
-            Object expectedValue = actualProperties.get(key);
-            if (value instanceof Map) {
-                assertThat(expectedValue, notNullValue());
-                assertThat(expectedValue, instanceOf(Map.class));
-                compareProperties((Map) value, (Map) expectedValue);
+        expectedProperties.forEach((key, expectedValue) -> {
+            Object actualValue = actualProperties.get(key);
+            if (expectedValue instanceof Map) {
+                assertThat(actualValue, notNullValue());
+                assertThat(actualValue, instanceOf(Map.class));
+                compareProperties((Map) actualValue, (Map) expectedValue);
+            } else if (expectedValue instanceof Number) {
+                assertThat(Double.valueOf(actualValue.toString()), is(Double.valueOf(expectedValue.toString())));
             } else {
-                assertThat(value, is(expectedValue));
+                assertThat(actualValue, is(expectedValue));
             }
         });
     }