Skip to content

Commit d5fbda5

Browse files
committed
revert changing a test and use seconds instead of millis
- fixes: SIRI-920
1 parent 3d5aaa2 commit d5fbda5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/java/sirius/db/jdbc/Database.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ private void initialize() {
353353
ds.setMaxIdle(maxIdle);
354354
ds.setTestOnBorrow(testOnBorrow);
355355
ds.setValidationQuery(validationQuery);
356-
ds.setMaxWait(Duration.ofMillis(1000));
356+
ds.setMaxWait(Duration.ofSeconds(1));
357357
}
358358
}
359359

src/test/kotlin/sirius/db/testutil/MongoMocks.kt

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

99
package sirius.db.testutil
1010

11-
import org.mockito.Mockito.spy
11+
import io.mockk.spyk
1212
import sirius.db.mixing.types.BaseEntityRef
1313
import sirius.db.mongo.MongoEntity
1414
import sirius.db.mongo.types.MongoRef
@@ -23,7 +23,7 @@ class MongoMocks {
2323
* @param entity which is to be wrapped
2424
*/
2525
fun <E : MongoEntity> asMongoRef(entity: E): MongoRef<E> {
26-
val mongoRef = spy(MongoRef.on(entity.javaClass, BaseEntityRef.OnDelete.IGNORE))
26+
val mongoRef = spyk(MongoRef.on(entity.javaClass, BaseEntityRef.OnDelete.IGNORE))
2727
mongoRef.setValue(entity)
2828
return mongoRef
2929
}

0 commit comments

Comments
 (0)