yeg
2026-09-04 b41d317e9b76b1158a9d21257698e55194bb39f5
battery-device-simulator/src/test/java/com/battery/device/contract/SimulatorPublicContractTest.java
File was renamed from ruoyi-device/src/test/java/com/ruoyi/device/contract/SimulatorPublicContractTest.java
@@ -1,4 +1,4 @@
package com.ruoyi.device.contract;
package com.battery.device.contract;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -13,27 +13,27 @@
import java.util.Set;
import org.junit.jupiter.api.Test;
import com.alibaba.fastjson2.JSON;
import com.ruoyi.device.api.DeviceAdapter;
import com.ruoyi.device.bts.BtsDevelopmentSimulator;
import com.ruoyi.device.bts.BtsDeviceAdapter;
import com.ruoyi.device.bts.BtsXmlCodec;
import com.ruoyi.device.bts.BtsTcpTransport;
import com.ruoyi.device.bts.ScriptedBtsTcpSimulator;
import com.ruoyi.device.model.DetectedChannel;
import com.ruoyi.device.model.DeviceWorkStatus;
import com.ruoyi.device.simulator.BtsSimulatorStateStore;
import com.ruoyi.device.simulator.BtsSimulatorStateStore.ChannelState;
import com.ruoyi.device.simulator.BtsSimulatorStateStore.CollectorChannelState;
import com.ruoyi.device.simulator.BtsSimulatorStateStore.CollectorHistoryAppend;
import com.ruoyi.device.simulator.BtsSimulatorStateStore.CollectorHistoryBatch;
import com.ruoyi.device.simulator.BtsSimulatorStateStore.CollectorHistoryFaults;
import com.ruoyi.device.simulator.BtsSimulatorStateStore.CollectorMeasurementRecord;
import com.ruoyi.device.simulator.BtsSimulatorStateStore.CollectorMetricState;
import com.ruoyi.device.simulator.BtsSimulatorStateStore.CollectorState;
import com.ruoyi.device.simulator.BtsSimulatorStateStore.DeviceState;
import com.ruoyi.device.simulator.BtsSimulatorStateStore.SimulatorState;
import com.ruoyi.device.simulator.BtsSimulatorStateStore.RecentRequest;
import com.ruoyi.device.simulator.InMemoryBtsSimulatorStateStore;
import com.battery.device.api.DeviceAdapter;
import com.battery.device.simulator.BtsDevelopmentSimulator;
import com.battery.device.bts.BtsDeviceAdapter;
import com.battery.device.bts.BtsXmlCodec;
import com.battery.device.bts.BtsTcpTransport;
import com.battery.device.simulator.ScriptedBtsTcpSimulator;
import com.battery.device.model.DetectedChannel;
import com.battery.device.model.DeviceWorkStatus;
import com.battery.device.simulator.BtsSimulatorStateStore;
import com.battery.device.simulator.BtsSimulatorStateStore.ChannelState;
import com.battery.device.simulator.BtsSimulatorStateStore.CollectorChannelState;
import com.battery.device.simulator.BtsSimulatorStateStore.CollectorHistoryAppend;
import com.battery.device.simulator.BtsSimulatorStateStore.CollectorHistoryBatch;
import com.battery.device.simulator.BtsSimulatorStateStore.CollectorHistoryFaults;
import com.battery.device.simulator.BtsSimulatorStateStore.CollectorMeasurementRecord;
import com.battery.device.simulator.BtsSimulatorStateStore.CollectorMetricState;
import com.battery.device.simulator.BtsSimulatorStateStore.CollectorState;
import com.battery.device.simulator.BtsSimulatorStateStore.DeviceState;
import com.battery.device.simulator.BtsSimulatorStateStore.SimulatorState;
import com.battery.device.simulator.BtsSimulatorStateStore.RecentRequest;
import com.battery.device.simulator.InMemoryBtsSimulatorStateStore;
class SimulatorPublicContractTest
{
@@ -81,7 +81,7 @@
            var first = simulator.collectorHistory(1, 0, 17);
            var second = simulator.collectorHistory(1, first.nextOffset(), 1000);
            List<com.ruoyi.device.simulator.BtsSimulatorStateStore.CollectorMeasurementRecord> records =
            List<com.battery.device.simulator.BtsSimulatorStateStore.CollectorMeasurementRecord> records =
                    new java.util.ArrayList<>(first.records());
            records.addAll(second.records());
@@ -291,7 +291,7 @@
            assertEquals(1, firstDiscovery.stream().map(channel -> channel.identity().devid()).distinct().count());
            assertEquals(4, firstDiscovery.stream().filter(channel -> channel.available()).count());
            Set<com.ruoyi.device.model.ChannelIdentity> channels = firstDiscovery.stream()
            Set<com.battery.device.model.ChannelIdentity> channels = firstDiscovery.stream()
                    .map(channel -> channel.identity())
                    .collect(java.util.stream.Collectors.toSet());
            var firstObservation = adapter.inquire(channels);
@@ -330,7 +330,7 @@
                    .filter(device -> device.deviceId() == tDevice || device.deviceId() == tnDevice)
                    .mapToInt(device -> device.channels().size()).sum() / 2);
            Set<com.ruoyi.device.model.ChannelIdentity> channel = tChannels.stream()
            Set<com.battery.device.model.ChannelIdentity> channel = tChannels.stream()
                    .map(DetectedChannel::identity).filter(identity -> identity.chlid() == 1)
                    .collect(java.util.stream.Collectors.toSet());
            var first = adapter.inquire(channel).values().iterator().next();
@@ -377,7 +377,7 @@
            simulator.updateChannel(1, 2, false, DeviceWorkStatus.PAUSED);
            var discovered = adapter.discoverChannels();
            Set<com.ruoyi.device.model.ChannelIdentity> available = discovered.stream()
            Set<com.battery.device.model.ChannelIdentity> available = discovered.stream()
                    .filter(channel -> channel.available())
                    .map(channel -> channel.identity())
                    .collect(java.util.stream.Collectors.toSet());