From c82be0541481955a0832948574244f31757f7067 Mon Sep 17 00:00:00 2001 From: Gavriel Fleischer Date: Sun, 17 Feb 2019 21:53:54 +0200 Subject: moved MockMediaManager to BaseTest --- test/org/traccar/BaseTest.java | 29 ++++++++++++++++++++-- .../traccar/protocol/WatchProtocolDecoderTest.java | 23 +---------------- 2 files changed, 28 insertions(+), 24 deletions(-) (limited to 'test/org/traccar') diff --git a/test/org/traccar/BaseTest.java b/test/org/traccar/BaseTest.java index fb1b5de8f..0b2c616ce 100644 --- a/test/org/traccar/BaseTest.java +++ b/test/org/traccar/BaseTest.java @@ -1,9 +1,34 @@ package org.traccar; +import io.netty.buffer.ByteBuf; +import org.traccar.database.MediaManager; + +import java.util.HashMap; +import java.util.Map; + public class BaseTest { - + + public static class MockMediaManager extends MediaManager { + Map files = new HashMap<>(); + + MockMediaManager() { + super(""); + } + + @Override + public String writeFile(String uniqueId, ByteBuf buf, String extension) { + String fileName = uniqueId + "/mock." + extension; + files.put(fileName, buf); + return fileName; + } + + public ByteBuf readFile(String fileName) { + return files.get(fileName); + } + } + static { - Context.init(new TestIdentityManager()); + Context.init(new TestIdentityManager(), new MockMediaManager()); } } diff --git a/test/org/traccar/protocol/WatchProtocolDecoderTest.java b/test/org/traccar/protocol/WatchProtocolDecoderTest.java index f1287d721..51846f51a 100644 --- a/test/org/traccar/protocol/WatchProtocolDecoderTest.java +++ b/test/org/traccar/protocol/WatchProtocolDecoderTest.java @@ -119,32 +119,11 @@ public class WatchProtocolDecoderTest extends ProtocolTest { verifyNull(decoder.decode(null, null, buffer("[CS*1234567890*0004*TK,1]"))); - MockMediaManager mockMediaManager = new MockMediaManager("/tmp"); - Context.initMediaManager(mockMediaManager); String hex = "7d5b5d2c2aff"; Object decodedObject = decoder.decode(null, null, concatenateBuffers(buffer("[CS*1234567890*000e*TK,#!AMR"), binary(hex), buffer("]"))); assertTrue("not a position", decodedObject instanceof Position); Position position = (Position) decodedObject; assertEquals("1234567890/mock.amr", position.getAttributes().get("audio")); - verifyFrame(concatenateBuffers(buffer("#!AMR"), binary(hex)), mockMediaManager.readFile("1234567890/mock.amr")); - } - - private static class MockMediaManager extends MediaManager { - Map files = new HashMap<>(); - - MockMediaManager(String path) { - super(path); - } - - @Override - public String writeFile(String uniqueId, ByteBuf buf, String extension) { - String fileName = uniqueId + "/mock." + extension; - files.put(fileName, buf); - return fileName; - } - - ByteBuf readFile(String fileName) { - return files.get(fileName); - } + verifyFrame(concatenateBuffers(buffer("#!AMR"), binary(hex)), ((MockMediaManager) Context.getMediaManager()).readFile("1234567890/mock.amr")); } } -- cgit v1.2.3