mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2025-12-08 06:01:07 +01:00
Add (partial) support for IoT XEPs
That is XEP-0323, -0324, -0325, and -0347. SMACK-727.
This commit is contained in:
Florian Schmaus
parent
d1fe5c2933
commit
b91978dcc4
110 changed files with 5395 additions and 40 deletions
|
|
@ -0,0 +1,97 @@
|
|||
/**
|
||||
*
|
||||
* Copyright 2016 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.assertNotNull;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.concurrent.TimeoutException;
|
||||
|
||||
import org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest;
|
||||
import org.igniterealtime.smack.inttest.SmackIntegrationTest;
|
||||
import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment;
|
||||
import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint;
|
||||
import org.jivesoftware.smack.XMPPException.XMPPErrorException;
|
||||
import org.jivesoftware.smack.roster.RosterIntegrationTest;
|
||||
import org.jivesoftware.smack.util.StringUtils;
|
||||
import org.jivesoftware.smackx.iot.control.IoTControlManager;
|
||||
import org.jivesoftware.smackx.iot.control.ThingControlRequest;
|
||||
import org.jivesoftware.smackx.iot.control.element.IoTSetResponse;
|
||||
import org.jivesoftware.smackx.iot.control.element.SetBoolData;
|
||||
import org.jivesoftware.smackx.iot.control.element.SetData;
|
||||
import org.jxmpp.jid.Jid;
|
||||
|
||||
public class IoTControlIntegrationTest extends AbstractSmackIntegrationTest {
|
||||
|
||||
private final IoTControlManager IoTControlManagerOne;
|
||||
|
||||
private final IoTControlManager IoTControlManagerTwo;
|
||||
|
||||
public IoTControlIntegrationTest(SmackIntegrationTestEnvironment environment) {
|
||||
super(environment);
|
||||
IoTControlManagerOne = IoTControlManager.getInstanceFor(conOne);
|
||||
IoTControlManagerTwo = IoTControlManager.getInstanceFor(conTwo);
|
||||
}
|
||||
|
||||
/**
|
||||
* Connection one provides a thing, which is controlled by connection two.
|
||||
*
|
||||
* @throws Exception
|
||||
* @throws TimeoutException
|
||||
*/
|
||||
@SmackIntegrationTest
|
||||
// @SmackSerialIntegrationTest
|
||||
public void controlTest() throws TimeoutException, Exception {
|
||||
final String key = StringUtils.randomString(12);
|
||||
final String sn = StringUtils.randomString(12);
|
||||
final SimpleResultSyncPoint syncPoint = new SimpleResultSyncPoint();
|
||||
|
||||
Thing controlThing = Thing.builder().setKey(key).setSerialNumber(sn).setControlRequestHandler(new ThingControlRequest() {
|
||||
@Override
|
||||
public void processRequest(Jid from, Collection<SetData> setData) throws XMPPErrorException {
|
||||
if (!from.equals(conTwo.getUser())) {
|
||||
return;
|
||||
}
|
||||
for (final SetData data : setData) {
|
||||
if (!data.getName().equals(testRunId)) continue;
|
||||
if (!(data instanceof SetBoolData)) continue;
|
||||
SetBoolData boolData = (SetBoolData) data;
|
||||
if (boolData.getBooleanValue()) {
|
||||
syncPoint.signal();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}).build();
|
||||
|
||||
IoTControlManagerOne.installThing(controlThing);
|
||||
|
||||
try {
|
||||
RosterIntegrationTest.ensureBothAccountsAreSubscribedToEachOther(conOne, conTwo, defaultTimeout);
|
||||
|
||||
SetData data = new SetBoolData(testRunId, true);
|
||||
IoTSetResponse response = IoTControlManagerTwo.setUsingIq(conOne.getUser(), data);
|
||||
assertNotNull(response);
|
||||
}
|
||||
finally {
|
||||
IoTControlManagerOne.uninstallThing(controlThing);
|
||||
RosterIntegrationTest.ensureBothAccountsAreNotInEachOthersRoster(conOne, conTwo);
|
||||
}
|
||||
|
||||
syncPoint.waitForResult(defaultTimeout);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,104 @@
|
|||
/**
|
||||
*
|
||||
* Copyright 2016 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.igniterealtime.smack.inttest.AbstractSmackIntegrationTest;
|
||||
import org.igniterealtime.smack.inttest.SmackIntegrationTest;
|
||||
import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment;
|
||||
import org.jivesoftware.smack.roster.RosterIntegrationTest;
|
||||
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;
|
||||
|
||||
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 TimeoutException, 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 {
|
||||
RosterIntegrationTest.ensureBothAccountsAreSubscribedToEachOther(conOne, conTwo, defaultTimeout);
|
||||
|
||||
values = iotDataManagerTwo.requestMomentaryValuesReadOut(conOne.getUser());
|
||||
}
|
||||
finally {
|
||||
iotDataManagerOne.uninstallThing(dataThing);
|
||||
RosterIntegrationTest.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());
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
/**
|
||||
*
|
||||
* Copyright 2016 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 org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest;
|
||||
import org.igniterealtime.smack.inttest.SmackIntegrationTest;
|
||||
import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment;
|
||||
import org.igniterealtime.smack.inttest.TestNotPossibleException;
|
||||
import org.jivesoftware.smack.SmackException;
|
||||
import org.jivesoftware.smack.SmackException.NoResponseException;
|
||||
import org.jivesoftware.smack.SmackException.NotConnectedException;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.XMPPException.XMPPErrorException;
|
||||
import org.jivesoftware.smack.util.StringUtils;
|
||||
import org.jivesoftware.smackx.iot.discovery.IoTClaimedException;
|
||||
import org.jivesoftware.smackx.iot.discovery.IoTDiscoveryManager;
|
||||
import org.jivesoftware.smackx.iot.discovery.ThingState;
|
||||
import org.jivesoftware.smackx.iot.discovery.element.IoTClaimed;
|
||||
import org.jxmpp.jid.Jid;
|
||||
|
||||
public class IoTDiscoveryIntegrationTest extends AbstractSmackIntegrationTest {
|
||||
|
||||
private final IoTDiscoveryManager discoveryManagerOne;
|
||||
private final IoTDiscoveryManager discoveryManagerTwo;
|
||||
|
||||
public IoTDiscoveryIntegrationTest(SmackIntegrationTestEnvironment environment) throws NoResponseException,
|
||||
XMPPErrorException, NotConnectedException, InterruptedException, TestNotPossibleException {
|
||||
super(environment);
|
||||
discoveryManagerOne = IoTDiscoveryManager.getInstanceFor(conOne);
|
||||
discoveryManagerTwo = IoTDiscoveryManager.getInstanceFor(conTwo);
|
||||
checkPrerequisites(conOne);
|
||||
}
|
||||
|
||||
@SmackIntegrationTest
|
||||
public void registerClaimAndUnregisterThing()
|
||||
throws XMPPErrorException, InterruptedException, SmackException {
|
||||
final String key = StringUtils.randomString(12);
|
||||
final String sn = StringUtils.randomString(12);
|
||||
final Thing thing = Thing.builder().setKey(key).setSerialNumber(sn).setManufacturer("Ignite Realtime").setModel(
|
||||
"Smack").setVersion("0.1").build();
|
||||
|
||||
registerThing(discoveryManagerOne, thing);
|
||||
|
||||
IoTClaimed iotClaimed = discoveryManagerTwo.claimThing(thing.getMetaTags());
|
||||
assertEquals(conOne.getUser().asBareJid(), iotClaimed.getJid());
|
||||
|
||||
discoveryManagerTwo.disownThing(iotClaimed.getJid());
|
||||
|
||||
discoveryManagerOne.unregister();
|
||||
}
|
||||
|
||||
static void checkPrerequisites(XMPPConnection connection) throws NoResponseException, XMPPErrorException,
|
||||
NotConnectedException, InterruptedException, TestNotPossibleException {
|
||||
IoTDiscoveryManager discoveryManager = IoTDiscoveryManager.getInstanceFor(connection);
|
||||
Jid registry = discoveryManager.findRegistry();
|
||||
if (registry == null) {
|
||||
throw new TestNotPossibleException("Could not find IoT Registry");
|
||||
}
|
||||
}
|
||||
|
||||
public static ThingState registerThing(IoTDiscoveryManager iotDiscoveryManager, Thing thing) throws XMPPErrorException, InterruptedException, SmackException {
|
||||
int attempts = 0;
|
||||
while (true) {
|
||||
try {
|
||||
return iotDiscoveryManager.registerThing(thing);
|
||||
}
|
||||
catch (IoTClaimedException e) {
|
||||
iotDiscoveryManager.unregister();
|
||||
}
|
||||
if (attempts++ > 3) {
|
||||
throw new SmackException("Could no register thing");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
/**
|
||||
*
|
||||
* Copyright 2015 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.
|
||||
*/
|
||||
|
||||
/**
|
||||
* TODO describe me.
|
||||
*/
|
||||
package org.jivesoftware.smackx.iot;
|
||||
Loading…
Add table
Add a link
Reference in a new issue