mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-09-26 01:29:32 +02:00
e98d42790a
This commit adds - SmackReactor / NIO - a framework for finite state machine connections - support for Java 8 - pretty printed XML debug output It also - reworks the integration test framework - raises the minimum Android API level to 19 - introduces XmppNioTcpConnection Furthermore fixes SMACK-801 (at least partly). Java 8 language features are available, but not all runtime library methods. For that we would need to raise the Android API level to 24 or higher.
107 lines
4.2 KiB
Java
107 lines
4.2 KiB
Java
/**
|
|
*
|
|
* Copyright 2016-2019 Florian Schmaus
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package org.jivesoftware.smackx.iot;
|
|
|
|
import static org.junit.Assert.assertEquals;
|
|
import static org.junit.Assert.assertTrue;
|
|
|
|
import java.util.Collections;
|
|
import java.util.List;
|
|
import java.util.concurrent.TimeoutException;
|
|
|
|
import org.jivesoftware.smack.util.StringUtils;
|
|
|
|
import org.jivesoftware.smackx.iot.data.IoTDataManager;
|
|
import org.jivesoftware.smackx.iot.data.ThingMomentaryReadOutRequest;
|
|
import org.jivesoftware.smackx.iot.data.ThingMomentaryReadOutResult;
|
|
import org.jivesoftware.smackx.iot.data.element.IoTDataField;
|
|
import org.jivesoftware.smackx.iot.data.element.IoTDataField.IntField;
|
|
import org.jivesoftware.smackx.iot.data.element.IoTFieldsExtension;
|
|
import org.jivesoftware.smackx.iot.data.element.NodeElement;
|
|
import org.jivesoftware.smackx.iot.data.element.TimestampElement;
|
|
|
|
import org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest;
|
|
import org.igniterealtime.smack.inttest.SmackIntegrationTest;
|
|
import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment;
|
|
import org.igniterealtime.smack.inttest.util.IntegrationTestRosterUtil;
|
|
|
|
public class IoTDataIntegrationTest extends AbstractSmackIntegrationTest {
|
|
|
|
private final IoTDataManager iotDataManagerOne;
|
|
|
|
private final IoTDataManager iotDataManagerTwo;
|
|
|
|
public IoTDataIntegrationTest(SmackIntegrationTestEnvironment<?> environment) {
|
|
super(environment);
|
|
iotDataManagerOne = IoTDataManager.getInstanceFor(conOne);
|
|
iotDataManagerTwo = IoTDataManager.getInstanceFor(conTwo);
|
|
}
|
|
|
|
/**
|
|
* Connection one provides a thing, which momentary value is read out by connection two.
|
|
*
|
|
* @throws Exception
|
|
* @throws TimeoutException
|
|
*/
|
|
@SmackIntegrationTest
|
|
public void dataTest() throws Exception {
|
|
final String key = StringUtils.randomString(12);
|
|
final String sn = StringUtils.randomString(12);
|
|
final int value = INSECURE_RANDOM.nextInt();
|
|
|
|
Thing dataThing = Thing.builder().setKey(key).setSerialNumber(sn).setMomentaryReadOutRequestHandler(new ThingMomentaryReadOutRequest() {
|
|
@Override
|
|
public void momentaryReadOutRequest(ThingMomentaryReadOutResult callback) {
|
|
IoTDataField.IntField field = new IntField(testRunId, value);
|
|
callback.momentaryReadOut(Collections.singletonList(field));
|
|
}
|
|
}).build();
|
|
|
|
iotDataManagerOne.installThing(dataThing);
|
|
|
|
List<IoTFieldsExtension> values;
|
|
try {
|
|
IntegrationTestRosterUtil.ensureBothAccountsAreSubscribedToEachOther(conOne, conTwo, timeout);
|
|
|
|
values = iotDataManagerTwo.requestMomentaryValuesReadOut(conOne.getUser());
|
|
}
|
|
finally {
|
|
iotDataManagerOne.uninstallThing(dataThing);
|
|
IntegrationTestRosterUtil.ensureBothAccountsAreNotInEachOthersRoster(conOne, conTwo);
|
|
}
|
|
|
|
assertEquals(1, values.size());
|
|
IoTFieldsExtension iotFieldsExtension = values.get(0);
|
|
List<NodeElement> nodes = iotFieldsExtension.getNodes();
|
|
|
|
assertEquals(1, nodes.size());
|
|
NodeElement node = nodes.get(0);
|
|
List<TimestampElement> timestamps = node.getTimestampElements();
|
|
|
|
assertEquals(1, timestamps.size());
|
|
TimestampElement timestamp = timestamps.get(0);
|
|
List<? extends IoTDataField> fields = timestamp.getDataFields();
|
|
|
|
assertEquals(1, fields.size());
|
|
IoTDataField dataField = fields.get(0);
|
|
assertTrue(dataField instanceof IoTDataField.IntField);
|
|
IoTDataField.IntField intDataField = (IoTDataField.IntField) dataField;
|
|
assertEquals(testRunId, intDataField.getName());
|
|
assertEquals(value, intDataField.getValue());
|
|
}
|
|
}
|