Skip to content

Commit e921d39

Browse files
committed
fixed java 8 tests
1 parent 24d79a1 commit e921d39

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

driver/src/main/java/com/arangodb/internal/config/FileConfigPropertiesProvider.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.arangodb.ArangoDBException;
44
import com.arangodb.config.ConfigPropertiesProvider;
55

6-
import java.io.IOException;
76
import java.io.InputStream;
87
import java.util.Properties;
98

@@ -38,8 +37,8 @@ private Properties initProperties(String fileName) {
3837
Properties p = new Properties();
3938
try (InputStream is = FileConfigPropertiesProvider.class.getResourceAsStream(fileName)) {
4039
p.load(is);
41-
} catch (IOException e) {
42-
throw new ArangoDBException(e);
40+
} catch (Exception e) {
41+
throw new ArangoDBException("Got exception while reading properties file " + fileName, e);
4342
}
4443
return p;
4544
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<dependency>
149149
<groupId>ch.qos.logback</groupId>
150150
<artifactId>logback-classic</artifactId>
151-
<version>1.4.5</version>
151+
<version>1.3.5</version>
152152
</dependency>
153153
<dependency>
154154
<groupId>org.assertj</groupId>

shaded-integration-tests/src/test/jackson/java/arch/BaseTest.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,32 @@
44
import com.arangodb.ContentType;
55
import com.arangodb.DbName;
66
import com.arangodb.Protocol;
7+
import com.arangodb.internal.config.FileConfigPropertiesProvider;
78
import org.junit.jupiter.params.provider.Arguments;
89

910
import java.util.Arrays;
1011
import java.util.stream.Stream;
1112

1213
public class BaseTest {
1314
protected static final DbName TEST_DB = DbName.of("java_driver_integration_tests");
14-
protected static final String HOST = "172.28.0.1";
15-
protected static final int PORT = 8529;
16-
protected static final String PASSWD = "test";
1715

1816
protected static ArangoDB createAdb() {
1917
return new ArangoDB.Builder()
20-
.host(HOST, PORT)
21-
.password(PASSWD)
18+
.loadProperties(new FileConfigPropertiesProvider())
2219
.build();
2320
}
2421

2522
protected static ArangoDB createAdb(ContentType contentType) {
2623
Protocol protocol = contentType == ContentType.VPACK ? Protocol.HTTP2_VPACK : Protocol.HTTP2_JSON;
2724
return new ArangoDB.Builder()
28-
.host(HOST, PORT)
29-
.password(PASSWD)
25+
.loadProperties(new FileConfigPropertiesProvider())
3026
.useProtocol(protocol)
3127
.build();
3228
}
3329

3430
protected static ArangoDB createAdb(Protocol protocol) {
3531
return new ArangoDB.Builder()
36-
.host(HOST, PORT)
37-
.password(PASSWD)
32+
.loadProperties(new FileConfigPropertiesProvider())
3833
.useProtocol(protocol)
3934
.build();
4035
}
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
arangodb.hosts=172.28.0.1:8529
22
arangodb.acquireHostList=true
33
arangodb.password=test
4-
arangodb.timeout=30000
5-
arangodb.metrics.responseQueueTimeSamples=20

0 commit comments

Comments
 (0)