From a86632153c161736601311397aaa3e36dd9a5537 Mon Sep 17 00:00:00 2001 From: Fredrik Elestedt Date: Fri, 11 Sep 2020 20:24:05 +0200 Subject: [PATCH] Fix compilation issues --- java/src/jmri/jmrix/ipocs/IpocsClientHandler.java | 8 +++++--- java/src/jmri/jmrix/ipocs/IpocsLight.java | 2 +- .../ipocs/configurexml/IpocsConnectionConfigXml.java | 4 ++-- .../jmri/jmrix/ipocs/protocol/enums/RqAlarmState.java | 2 +- .../jmrix/ipocs/protocol/enums/RqControllerState.java | 2 +- .../jmri/jmrix/ipocs/protocol/enums/RqDisconnect.java | 2 +- .../ipocs/protocol/packets/DisconnectPacket.java | 2 +- java/test/jmri/jmrix/ipocs/IpocsTurnoutTest.java | 3 --- .../configurexml/IpocsConnectionConfigXmlTest.java | 11 ++++++++++- .../ipocs/protocol/packets/SetDerailerPacketTest.java | 2 +- 10 files changed, 23 insertions(+), 15 deletions(-) diff --git a/java/src/jmri/jmrix/ipocs/IpocsClientHandler.java b/java/src/jmri/jmrix/ipocs/IpocsClientHandler.java index 275885b2f03..1ab0dc06852 100644 --- a/java/src/jmri/jmrix/ipocs/IpocsClientHandler.java +++ b/java/src/jmri/jmrix/ipocs/IpocsClientHandler.java @@ -16,7 +16,7 @@ import jmri.jmrix.ipocs.protocol.packets.Packet; public class IpocsClientHandler implements CompletionHandler { - private final static Logger log = LoggerFactory.getLogger(IpocsSocketAcceptor.class); + private final static Logger log = LoggerFactory.getLogger(IpocsClientHandler.class); private final AsynchronousSocketChannel client; private byte unitId; private List clientListeners = new ArrayList(); @@ -50,7 +50,7 @@ public void completed(final Integer bytesRead, final ByteBuffer recvBuffer) { listener.clientDisconnected(this); } } catch (final IOException ex) { - log.error("Unable to close client: {0}", ex.getMessage()); + log.error("Unable to close client: {}", ex.getMessage()); } return; } @@ -98,7 +98,9 @@ public void completed(final Integer bytesRead, final ByteBuffer recvBuffer) { public void failed(final Throwable exc, final ByteBuffer attachment) { try { client.close(); - } catch (IOException ex) {} + } catch (IOException ex) { + log.error("Error closing connection", ex); + } for (IpocsClientListener listener : clientListeners) { listener.clientDisconnected(this); } diff --git a/java/src/jmri/jmrix/ipocs/IpocsLight.java b/java/src/jmri/jmrix/ipocs/IpocsLight.java index d0d07fa5280..58fbf1a84ff 100644 --- a/java/src/jmri/jmrix/ipocs/IpocsLight.java +++ b/java/src/jmri/jmrix/ipocs/IpocsLight.java @@ -12,7 +12,7 @@ import jmri.jmrix.ipocs.protocol.packets.SetOutputPacket; public class IpocsLight extends AbstractLight implements IpocsClientListener { - private final static Logger log = LoggerFactory.getLogger(IpocsTurnout.class); + private final static Logger log = LoggerFactory.getLogger(IpocsLight.class); private IpocsPortController portController; public IpocsLight(IpocsPortController portController, String systemName, String userName) { diff --git a/java/src/jmri/jmrix/ipocs/configurexml/IpocsConnectionConfigXml.java b/java/src/jmri/jmrix/ipocs/configurexml/IpocsConnectionConfigXml.java index 0cd8436d376..2b62b94b740 100644 --- a/java/src/jmri/jmrix/ipocs/configurexml/IpocsConnectionConfigXml.java +++ b/java/src/jmri/jmrix/ipocs/configurexml/IpocsConnectionConfigXml.java @@ -57,7 +57,7 @@ public boolean load(Element shared, Element perNode) throws JmriConfigureXmlExce try { portController.connect(); } catch (IOException ex) { - log.error("Unable to start service: {0}", ex.getMessage()); + log.error("Unable to start service: {}", ex.getMessage()); } } return true; @@ -77,4 +77,4 @@ protected void getInstance(IpocsConnectionConfig o) { protected void register() { this.register(new IpocsConnectionConfig(portController)); } -} \ No newline at end of file +} diff --git a/java/src/jmri/jmrix/ipocs/protocol/enums/RqAlarmState.java b/java/src/jmri/jmrix/ipocs/protocol/enums/RqAlarmState.java index 510900e7181..23892d8c928 100644 --- a/java/src/jmri/jmrix/ipocs/protocol/enums/RqAlarmState.java +++ b/java/src/jmri/jmrix/ipocs/protocol/enums/RqAlarmState.java @@ -19,4 +19,4 @@ public static RqAlarmState valueOf(byte value) { } return null; } -} \ No newline at end of file +} diff --git a/java/src/jmri/jmrix/ipocs/protocol/enums/RqControllerState.java b/java/src/jmri/jmrix/ipocs/protocol/enums/RqControllerState.java index 5ae2bbd5761..0046bf40f0e 100644 --- a/java/src/jmri/jmrix/ipocs/protocol/enums/RqControllerState.java +++ b/java/src/jmri/jmrix/ipocs/protocol/enums/RqControllerState.java @@ -19,4 +19,4 @@ public static RqControllerState valueOf(byte value) { } return null; } -} \ No newline at end of file +} diff --git a/java/src/jmri/jmrix/ipocs/protocol/enums/RqDisconnect.java b/java/src/jmri/jmrix/ipocs/protocol/enums/RqDisconnect.java index c2be5286b7d..1ba3b1da96b 100644 --- a/java/src/jmri/jmrix/ipocs/protocol/enums/RqDisconnect.java +++ b/java/src/jmri/jmrix/ipocs/protocol/enums/RqDisconnect.java @@ -21,4 +21,4 @@ public static RqDisconnect valueOf(byte value) { } return null; } -} \ No newline at end of file +} diff --git a/java/src/jmri/jmrix/ipocs/protocol/packets/DisconnectPacket.java b/java/src/jmri/jmrix/ipocs/protocol/packets/DisconnectPacket.java index c22b8d55243..7926864c127 100644 --- a/java/src/jmri/jmrix/ipocs/protocol/packets/DisconnectPacket.java +++ b/java/src/jmri/jmrix/ipocs/protocol/packets/DisconnectPacket.java @@ -21,7 +21,7 @@ protected void parseSpecific(ByteBuffer buffer) { @Override protected byte[] serializeSpecific() { - ByteBuffer buffer = ByteBuffer.allocate(2); + ByteBuffer buffer = ByteBuffer.allocate(1); buffer.put(reason.value); buffer.rewind(); return buffer.array(); diff --git a/java/test/jmri/jmrix/ipocs/IpocsTurnoutTest.java b/java/test/jmri/jmrix/ipocs/IpocsTurnoutTest.java index c44d133b821..df27cb02404 100644 --- a/java/test/jmri/jmrix/ipocs/IpocsTurnoutTest.java +++ b/java/test/jmri/jmrix/ipocs/IpocsTurnoutTest.java @@ -35,13 +35,10 @@ public int numListeners() { @Override public void checkThrownMsgSent() throws InterruptedException { - // TODO Auto-generated method stub - } @Override public void checkClosedMsgSent() throws InterruptedException { - // TODO Auto-generated method stub } @Test diff --git a/java/test/jmri/jmrix/ipocs/configurexml/IpocsConnectionConfigXmlTest.java b/java/test/jmri/jmrix/ipocs/configurexml/IpocsConnectionConfigXmlTest.java index b283f2646ee..c35b7ffb558 100644 --- a/java/test/jmri/jmrix/ipocs/configurexml/IpocsConnectionConfigXmlTest.java +++ b/java/test/jmri/jmrix/ipocs/configurexml/IpocsConnectionConfigXmlTest.java @@ -1,19 +1,28 @@ package jmri.jmrix.ipocs.configurexml; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import jmri.jmrix.ipocs.IpocsConnectionConfig; +import jmri.jmrix.ipocs.IpocsPortController; public class IpocsConnectionConfigXmlTest extends jmri.jmrix.configurexml.AbstractConnectionConfigXmlTestBase { + private IpocsPortController portController; + @BeforeEach @Override public void setUp() { jmri.util.JUnitUtil.setUp(); jmri.util.JUnitUtil.initDefaultUserMessagePreferences(); xmlAdapter = new IpocsConnectionConfigXml(); - cc = new IpocsConnectionConfig(); + portController = mock(IpocsPortController.class); + when(portController.getOptions()).thenReturn(new String[] {}); + cc = new IpocsConnectionConfig(portController); + ((IpocsConnectionConfigXml)xmlAdapter).getInstance((IpocsConnectionConfig)cc); } @AfterEach diff --git a/java/test/jmri/jmrix/ipocs/protocol/packets/SetDerailerPacketTest.java b/java/test/jmri/jmrix/ipocs/protocol/packets/SetDerailerPacketTest.java index 297bb70b8e1..e7b7cc481c1 100644 --- a/java/test/jmri/jmrix/ipocs/protocol/packets/SetDerailerPacketTest.java +++ b/java/test/jmri/jmrix/ipocs/protocol/packets/SetDerailerPacketTest.java @@ -10,7 +10,7 @@ import jmri.jmrix.ipocs.protocol.enums.RqDerailerCommand; public class SetDerailerPacketTest { - private byte[] testPacket = { RqDerailerCommand.Passable.value, 0x00, 0x10, 0x01 }; + private byte[] testPacket = { RqDerailerCommand.Passable.value }; @Test public void getIdTest() {