aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGavriel Fleischer <flocsy@gmail.com>2019-02-17 21:53:54 +0200
committerGavriel Fleischer <flocsy@gmail.com>2019-02-17 21:53:54 +0200
commitc82be0541481955a0832948574244f31757f7067 (patch)
tree824cac46369de9c5233fa672911440f195208c32 /src
parent074b1c302dcd6671737d44c69aa83d0fdd179168 (diff)
downloadtrackermap-server-c82be0541481955a0832948574244f31757f7067.tar.gz
trackermap-server-c82be0541481955a0832948574244f31757f7067.tar.bz2
trackermap-server-c82be0541481955a0832948574244f31757f7067.zip
moved MockMediaManager to BaseTest
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/Context.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index b0db90416..d679842cd 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -508,16 +508,13 @@ public final class Context {
Context.getConfig().getBoolean("event.overspeed.preferLowest"));
}
- public static void init(IdentityManager testIdentityManager) {
+ public static void init(IdentityManager testIdentityManager, MediaManager testMediaManager) {
config = new Config();
objectMapper = new ObjectMapper();
objectMapper.registerModule(new JSR353Module());
client = ClientBuilder.newClient().register(new ObjectMapperContextResolver());
identityManager = testIdentityManager;
- }
-
- public static void initMediaManager(MediaManager mediaManager) {
- Context.mediaManager = mediaManager;
+ mediaManager = testMediaManager;
}
public static <T extends BaseModel> BaseObjectManager<T> getManager(Class<T> clazz) {