mirror
/
ttnhabbridge
kopia lustrzana https://github.com/bertrik/ttnhabbridge
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Move code from unit test to actual code, also rename things a bit.

koppelting
Bertrik Sikken 2017-08-19 00:32:16 +02:00
rodzic a07a8f9705
commit 29671c1b37
2 zmienionych plików z 57 dodań i 33 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

46
workspace/ttnhabbridge/src/main/java/nl/sikken/bertrik/hab/habitat/HabitatUploader.java
Wyświetl plik

@ -14,12 +14,15 @@ import javax.ws.rs.WebApplicationException;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
import javax.xml.bind.DatatypeConverter;
import javax.xml.ws.WebServiceException;
import org.glassfish.jersey.client.ClientProperties;
import org.glassfish.jersey.client.proxy.WebResourceFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nl.sikken.bertrik.hab.habitat.docs.ListenerInformationDoc;
import nl.sikken.bertrik.hab.habitat.docs.ListenerTelemetryDoc;
import nl.sikken.bertrik.hab.habitat.docs.PayloadTelemetryDoc;
/**
@ -71,13 +74,13 @@ public final class HabitatUploader {
}
/**
* Uploads a new sentence to the HAB network (non-blocking).
* Schedules a new sentence to be sent to the HAB network.
*
* @param sentence the ASCII sentence
* @param receivers list of receivers that got this sentence
* @param date the current date
*/
public void upload(String sentence, List<String> receivers, Date date) {
public void uploadPayloadTelemetry(String sentence, List<String> receivers, Date date) {
// encode sentence as raw bytes
final byte[] bytes = sentence.getBytes(StandardCharsets.US_ASCII);
@ -138,5 +141,42 @@ public final class HabitatUploader {
.property(ClientProperties.READ_TIMEOUT, timeout).target(url);
return WebResourceFactory.newResource(IHabitatRestApi.class, target);
}
/**
* Schedules new listener data to be sent to habitat.
*
* @param receiver the receiver data
* @param date the current date
*/
public void uploadListenerData(HabReceiver receiver, Date date) {
executor.submit(() -> uploadListener(receiver, date));
}
/**
* Uploads listener data (information and telemetry)
*
* @param receiver the receiver/listener
* @param date the current date
*/
private void uploadListener(HabReceiver receiver, Date date) {
try {
// get two uuids
final UuidsList list = restClient.getUuids(2);
final List<String> uuids = list.getUuids();
LOG.info("list = {},{}", uuids.get(0), uuids.get(1));
// upload payload listener info
final ListenerInformationDoc info = new ListenerInformationDoc(date, receiver.getCallsign());
final UploadResult infoResult = restClient.uploadDocument(uuids.get(0), info.format());
LOG.info("Result from uploading listener info: {}", infoResult);
// upload payload telemetry
final ListenerTelemetryDoc telem = new ListenerTelemetryDoc(date, receiver);
final UploadResult telemResult = restClient.uploadDocument(uuids.get(1), telem.format());
LOG.info("Result from uploading listener telemetry: {}", telemResult);
} catch (WebServiceException e) {
LOG.warn("Caught WebServiceException: {}", e.getMessage());
}
}
}

44
workspace/ttnhabbridge/src/test/java/nl/sikken/bertrik/hab/habitat/HabitatUploaderTest.java
Wyświetl plik

@ -2,24 +2,17 @@ package nl.sikken.bertrik.hab.habitat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import org.junit.Test;
import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nl.sikken.bertrik.hab.Sentence;
import nl.sikken.bertrik.hab.habitat.docs.ListenerInformationDoc;
import nl.sikken.bertrik.hab.habitat.docs.ListenerTelemetryDoc;
/**
* Unit tests for HabitatUploader.
*/
public final class HabitatUploaderTest {
private final Logger LOG = LoggerFactory.getLogger(HabitatUploaderTest.class);
/**
* Happy flow scenario.
*
@ -40,7 +33,7 @@ public final class HabitatUploaderTest {
final String receiver = "BERTRIK";
final Date date = new Date();
final Sentence sentence = new Sentence("NOTAFLIGHT", 1, date, 52.0182307, 4.695772, 1000);
uploader.upload(sentence.format(), Arrays.asList(receiver), date);
uploader.uploadPayloadTelemetry(sentence.format(), Arrays.asList(receiver), date);
Mockito.verify(restClient, Mockito.timeout(3000)).updateListener(Mockito.anyString(), Mockito.anyString());
} finally {
@ -50,7 +43,7 @@ public final class HabitatUploaderTest {
@Test
// @Ignore("this is not a junit test")
public void testActualHappyFlow() throws InterruptedException {
public void testActualPayloadUpload() throws InterruptedException {
final IHabitatRestApi restClient = HabitatUploader.newRestClient("http://habitat.habhub.org", 3000);
final HabitatUploader uploader = new HabitatUploader(restClient);
uploader.start();
@ -58,7 +51,7 @@ public final class HabitatUploaderTest {
final Date date = new Date();
final Sentence sentence = new Sentence("NOTAFLIGHT", 1, date, 52.0182307, 4.695772, 1000);
final String receiver = "BERTRIK";
uploader.upload(sentence.format(), Arrays.asList(receiver), date);
uploader.uploadPayloadTelemetry(sentence.format(), Arrays.asList(receiver), date);
Thread.sleep(3000);
} finally {
uploader.stop();
@ -67,29 +60,20 @@ public final class HabitatUploaderTest {
/**
* Verifies upload of listener information and telemetry.
* @throws InterruptedException
*/
@Test
public void testListenerUpload() {
// get two uuids
public void testActualListenerUpload() throws InterruptedException {
final IHabitatRestApi restClient = HabitatUploader.newRestClient("http://habitat.habhub.org", 3000);
final UuidsList list = restClient.getUuids(2);
final List<String> uuids = list.getUuids();
LOG.info("list = {},{}", uuids.get(0), uuids.get(1));
final Date date = new Date();
final String callSign = "BERTRIK";
// upload payload listener info
final ListenerInformationDoc info = new ListenerInformationDoc(date, callSign);
final UploadResult infoResult = restClient.uploadDocument(uuids.get(0), info.format());
LOG.info("Result from uploading listener info: {}", infoResult);
// upload payload telemetry
final Location location = new Location(52.0182307, 4.695772, 15);
final HabReceiver receiver = new HabReceiver(callSign, location);
final ListenerTelemetryDoc telem = new ListenerTelemetryDoc(date, receiver);
final UploadResult telemResult = restClient.uploadDocument(uuids.get(1), telem.format());
LOG.info("Result from uploading listener telemetry: {}", telemResult);
final HabitatUploader uploader = new HabitatUploader(restClient);
try {
final Date date = new Date();
final HabReceiver receiver = new HabReceiver("BERTRIK", new Location(52.0182307, 4.695772, 15));
uploader.uploadListenerData(receiver, date);
Thread.sleep(3000);
} finally {
uploader.stop();
}
}
}