Skip to content

Commit 96fb12c

Browse files
author
a-brandt
committed
changed logging
1 parent fe35750 commit 96fb12c

9 files changed

+885
-873
lines changed

‎src/main/java/com/arangodb/ArangoConfigure.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void loadProperties(String propertyPath) {
139139
in = getClass().getResourceAsStream(propertyPath);
140140
if (in != null) {
141141

142-
logger.info("load property: file={}", propertyPath);
142+
logger.debug("load property: file={}", propertyPath);
143143

144144
Properties prop = new Properties();
145145
prop.load(in);

‎src/test/java/com/arangodb/ArangoDriverAdminTest.java

Lines changed: 119 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import static org.junit.Assert.fail;
2626

2727
import org.junit.Test;
28+
import org.slf4j.Logger;
29+
import org.slf4j.LoggerFactory;
2830

2931
import com.arangodb.entity.AdminLogEntity;
3032
import com.arangodb.entity.ArangoUnixTime;
@@ -40,161 +42,161 @@
4042
*/
4143
public class ArangoDriverAdminTest extends BaseTest {
4244

43-
public ArangoDriverAdminTest(ArangoConfigure configure, ArangoDriver driver) {
44-
super(configure, driver);
45-
}
45+
private static Logger logger = LoggerFactory.getLogger(ArangoDriverAdminTest.class);
4646

47-
@Test
48-
public void test_version() throws ArangoException {
47+
public ArangoDriverAdminTest(ArangoConfigure configure, ArangoDriver driver) {
48+
super(configure, driver);
49+
}
4950

50-
ArangoVersion version = driver.getVersion();
51-
assertThat(version.getServer(), is("arango"));
52-
assertThat(version.getVersion(), startsWith("2."));
51+
@Test
52+
public void test_version() throws ArangoException {
5353

54-
}
54+
ArangoVersion version = driver.getVersion();
55+
assertThat(version.getServer(), is("arango"));
56+
assertThat(version.getVersion(), startsWith("2."));
5557

56-
@Test
57-
public void test_time() throws ArangoException {
58+
}
5859

59-
ArangoUnixTime time = driver.getTime();
60-
assertThat(time.getSecond(), is(not(0)));
61-
assertThat(time.getMicrosecond(), is(not(0)));
60+
@Test
61+
public void test_time() throws ArangoException {
6262

63-
System.out.println("unixtime=" + time.getSecond());
64-
System.out.println("unixtime_micros=" + time.getMicrosecond());
65-
System.out.println("unixtime_millis=" + time.getTimeMillis());
63+
ArangoUnixTime time = driver.getTime();
64+
assertThat(time.getSecond(), is(not(0)));
65+
assertThat(time.getMicrosecond(), is(not(0)));
6666

67-
}
67+
logger.debug("unixtime=" + time.getSecond());
68+
logger.debug("unixtime_micros=" + time.getMicrosecond());
69+
logger.debug("unixtime_millis=" + time.getTimeMillis());
6870

69-
@Test
70-
public void test_log_all() throws ArangoException {
71+
}
7172

72-
AdminLogEntity entity = driver.getServerLog(null, null, null, null, null, null, null);
73+
@Test
74+
public void test_log_all() throws ArangoException {
7375

74-
assertThat(entity, is(notNullValue()));
75-
assertThat(entity.getTotalAmount(), is(not(0)));
76-
assertThat(entity.getLogs().size(), is(entity.getTotalAmount()));
76+
AdminLogEntity entity = driver.getServerLog(null, null, null, null, null, null, null);
7777

78-
// debug
79-
for (AdminLogEntity.LogEntry log : entity.getLogs()) {
80-
System.out
81-
.printf("%d\t%d\t%tF %<tT\t%s%n", log.getLid(), log.getLevel(), log.getTimestamp(), log.getText());
82-
}
78+
assertThat(entity, is(notNullValue()));
79+
assertThat(entity.getTotalAmount(), is(not(0)));
80+
assertThat(entity.getLogs().size(), is(entity.getTotalAmount()));
8381

84-
}
82+
// debug
83+
for (AdminLogEntity.LogEntry log : entity.getLogs()) {
84+
logger.debug("%d\t%d\t%tF %<tT\t%s%n", log.getLid(), log.getLevel(), log.getTimestamp(), log.getText());
85+
}
8586

86-
@Test
87-
public void test_log_text() throws ArangoException {
87+
}
8888

89-
AdminLogEntity entity = driver.getServerLog(null, null, null, null, null, null, "Fun");
89+
@Test
90+
public void test_log_text() throws ArangoException {
9091

91-
assertThat(entity, is(notNullValue()));
92-
// debug
93-
for (AdminLogEntity.LogEntry log : entity.getLogs()) {
94-
System.out
95-
.printf("%d\t%d\t%tF %<tT\t%s%n", log.getLid(), log.getLevel(), log.getTimestamp(), log.getText());
96-
}
92+
AdminLogEntity entity = driver.getServerLog(null, null, null, null, null, null, "Fun");
9793

98-
}
94+
assertThat(entity, is(notNullValue()));
95+
// debug
96+
for (AdminLogEntity.LogEntry log : entity.getLogs()) {
97+
logger.debug("%d\t%d\t%tF %<tT\t%s%n", log.getLid(), log.getLevel(), log.getTimestamp(), log.getText());
98+
}
9999

100-
// TODO テスト増やす
100+
}
101101

102-
@Test
103-
public void test_statistics() throws ArangoException {
102+
// TODO テスト増やす
104103

105-
StatisticsEntity stat = driver.getStatistics();
104+
@Test
105+
public void test_statistics() throws ArangoException {
106106

107-
// debug
108-
Gson gson = new Gson();
109-
assertNotNull(gson.toJson(stat));
110-
assertNotNull(gson.toJson(stat.getSystem()));
111-
assertNotNull(gson.toJson(stat.getClient()));
112-
assertNotNull(gson.toJson(stat.getServer()));
107+
StatisticsEntity stat = driver.getStatistics();
113108

114-
}
109+
// debug
110+
Gson gson = new Gson();
111+
assertNotNull(gson.toJson(stat));
112+
assertNotNull(gson.toJson(stat.getSystem()));
113+
assertNotNull(gson.toJson(stat.getClient()));
114+
assertNotNull(gson.toJson(stat.getServer()));
115115

116-
@Test
117-
public void test_statistics_description() throws ArangoException {
116+
}
118117

119-
StatisticsDescriptionEntity desc = driver.getStatisticsDescription();
118+
@Test
119+
public void test_statistics_description() throws ArangoException {
120120

121-
// debug
122-
Gson gson = new Gson();
123-
assertNotNull(gson.toJson(desc));
124-
assertNotNull(gson.toJson(desc.getGroups()));
125-
assertNotNull(gson.toJson(desc.getFigures()));
126-
}
121+
StatisticsDescriptionEntity desc = driver.getStatisticsDescription();
127122

128-
@Test
129-
public void test_reload_routing() throws ArangoException {
123+
// debug
124+
Gson gson = new Gson();
125+
assertNotNull(gson.toJson(desc));
126+
assertNotNull(gson.toJson(desc.getGroups()));
127+
assertNotNull(gson.toJson(desc.getFigures()));
128+
}
130129

131-
DefaultEntity entity = driver.reloadRouting();
132-
assertThat(entity.getStatusCode(), is(200));
133-
assertThat(entity.isError(), is(false));
130+
@Test
131+
public void test_reload_routing() throws ArangoException {
134132

135-
}
133+
DefaultEntity entity = driver.reloadRouting();
134+
assertThat(entity.getStatusCode(), is(200));
135+
assertThat(entity.isError(), is(false));
136136

137-
@Test
138-
public void test_execute_do_nothing() throws ArangoException {
137+
}
139138

140-
DefaultEntity entity = driver.executeScript("");
141-
assertThat(entity.isError(), is(false));
142-
assertThat(entity.getCode(), is(200));
143-
assertThat(entity.getStatusCode(), is(200));
139+
@Test
140+
public void test_execute_do_nothing() throws ArangoException {
144141

145-
}
142+
DefaultEntity entity = driver.executeScript("");
143+
assertThat(entity.isError(), is(false));
144+
assertThat(entity.getCode(), is(200));
145+
assertThat(entity.getStatusCode(), is(200));
146146

147-
@Test
148-
public void test_execute() throws ArangoException {
147+
}
149148

150-
DefaultEntity entity = driver.executeScript("var db = require(\"internal\").db; cols = db._collections();\n"
151-
+ "len = cols.length;\n");
152-
assertThat(entity.isError(), is(false));
153-
assertThat(entity.getCode(), is(200));
154-
assertThat(entity.getStatusCode(), is(200));
149+
@Test
150+
public void test_execute() throws ArangoException {
155151

156-
}
152+
DefaultEntity entity = driver.executeScript(
153+
"var db = require(\"internal\").db; cols = db._collections();\n" + "len = cols.length;\n");
154+
assertThat(entity.isError(), is(false));
155+
assertThat(entity.getCode(), is(200));
156+
assertThat(entity.getStatusCode(), is(200));
157157

158-
@Test
159-
public void test_execute_delete_collection() throws ArangoException {
158+
}
160159

161-
DefaultEntity entity1 = driver.executeScript("var db = require(\"internal\").db; db._drop(\""
162-
+ "col-execute-delete-test" + "\")");
163-
assertThat(entity1.isError(), is(false));
164-
assertThat(entity1.getCode(), is(200));
165-
assertThat(entity1.getStatusCode(), is(200));
160+
@Test
161+
public void test_execute_delete_collection() throws ArangoException {
166162

167-
driver.createCollection("col-execute-delete-test");
168-
driver.getCollection("col-execute-delete-test");
163+
DefaultEntity entity1 = driver
164+
.executeScript("var db = require(\"internal\").db; db._drop(\"" + "col-execute-delete-test" + "\")");
165+
assertThat(entity1.isError(), is(false));
166+
assertThat(entity1.getCode(), is(200));
167+
assertThat(entity1.getStatusCode(), is(200));
169168

170-
DefaultEntity entity2 = driver.executeScript("var db = require(\"internal\").db; db._drop(\""
171-
+ "col-execute-delete-test" + "\")");
172-
assertThat(entity2.isError(), is(false));
173-
assertThat(entity2.getCode(), is(200));
174-
assertThat(entity2.getStatusCode(), is(200));
175-
176-
try {
177-
driver.getCollection("col-execute-delete-test");
178-
fail();
179-
} catch (ArangoException e) {
180-
assertThat(e.getCode(), is(404));
181-
assertThat(e.getErrorNumber(), is(1203));
182-
}
183-
}
169+
driver.createCollection("col-execute-delete-test");
170+
driver.getCollection("col-execute-delete-test");
184171

185-
@Test
186-
public void test_execute_error() throws ArangoException {
187-
try {
188-
driver.executeScript("xxx");
189-
fail();
190-
} catch (ArangoException e) {
191-
String t = "Internal Server Error: JavaScript exception in file 'undefined' at 1,14: ReferenceError: xxx is not defined\n"
192-
+ "!(function() {xxx}());\n" + "! ^\n"
193-
+ "stacktrace: ReferenceError: xxx is not defined\n";
194-
assertThat(e.getErrorMessage(), startsWith(t));
195-
assertThat(e.getEntity().getStatusCode(), is(500));
196-
}
172+
DefaultEntity entity2 = driver
173+
.executeScript("var db = require(\"internal\").db; db._drop(\"" + "col-execute-delete-test" + "\")");
174+
assertThat(entity2.isError(), is(false));
175+
assertThat(entity2.getCode(), is(200));
176+
assertThat(entity2.getStatusCode(), is(200));
197177

198-
}
178+
try {
179+
driver.getCollection("col-execute-delete-test");
180+
fail();
181+
} catch (ArangoException e) {
182+
assertThat(e.getCode(), is(404));
183+
assertThat(e.getErrorNumber(), is(1203));
184+
}
185+
}
186+
187+
@Test
188+
public void test_execute_error() throws ArangoException {
189+
try {
190+
driver.executeScript("xxx");
191+
fail();
192+
} catch (ArangoException e) {
193+
String t = "Internal Server Error: JavaScript exception in file 'undefined' at 1,14: ReferenceError: xxx is not defined\n"
194+
+ "!(function() {xxx}());\n" + "! ^\n"
195+
+ "stacktrace: ReferenceError: xxx is not defined\n";
196+
assertThat(e.getErrorMessage(), startsWith(t));
197+
assertThat(e.getEntity().getStatusCode(), is(500));
198+
}
199+
200+
}
199201

200202
}

‎src/test/java/com/arangodb/ArangoDriverDocumentCursorTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
import org.junit.Before;
2727
import org.junit.Test;
28+
import org.slf4j.Logger;
29+
import org.slf4j.LoggerFactory;
2830

2931
import com.arangodb.entity.DocumentEntity;
3032
import com.arangodb.util.AqlQueryOptions;
@@ -37,6 +39,8 @@
3739
*/
3840
public class ArangoDriverDocumentCursorTest extends BaseTest {
3941

42+
private static Logger logger = LoggerFactory.getLogger(ArangoDriverDocumentCursorTest.class);
43+
4044
public ArangoDriverDocumentCursorTest(ArangoConfigure configure, ArangoDriver driver) {
4145
super(configure, driver);
4246
}
@@ -69,7 +73,8 @@ private AqlQueryOptions getAqlQueryOptions(Boolean count, Integer batchSize, Boo
6973
public void test1_WithIterator() throws ArangoException {
7074

7175
// String query =
72-
// "SELECT t FROM unit_test_query_test t WHERE t.age >= @age@ order by t.age";
76+
// "SELECT t FROM unit_test_query_test t WHERE t.age >= @age@ order by
77+
// t.age";
7378
String query = "FOR t IN unit_test_query_test FILTER t.age >= @age SORT t.age RETURN t";
7479
Map<String, Object> bindVars = new MapBuilder().put("age", 90).get();
7580

@@ -322,7 +327,7 @@ public void test8_CursorResult_as_List() throws ArangoException {
322327
assertThat(get1, is(user));
323328

324329
for (Object obj : list) {
325-
System.out.println("value " + obj);
330+
logger.debug("value " + obj);
326331
}
327332
count++;
328333
}

‎src/test/java/com/arangodb/ArangoDriverDocumentKeyTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@ public void test_document_key_string() throws ArangoException {
106106
assertThat(doc2.getEntity().get("s1"), is(nullValue())); // s1 is not
107107
// contains.
108108
assertThat((String) doc2.getEntity().get("_key"), is("s1"));
109-
110-
System.out.println(doc2.getEntity());
111-
112109
}
113110

114111
@Test

0 commit comments

Comments
 (0)