Skip to content

Commit

Permalink
reformat
Browse files Browse the repository at this point in the history
  • Loading branch information
pschichtel committed Aug 19, 2018
1 parent dc91d97 commit 1899398
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
3 changes: 2 additions & 1 deletion src/main/java/tel/schich/javacan/ISOTPSocket.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@
*/
package tel.schich.javacan;

import java.io.ByteArrayOutputStream;
import org.checkerframework.checker.nullness.qual.NonNull;

import java.io.ByteArrayOutputStream;

import static tel.schich.javacan.PollEvent.POLLIN;
import static tel.schich.javacan.PollEvent.POLLPRI;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tel/schich/javacan/LinuxErrno.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
package tel.schich.javacan;

public class LinuxErrno {
public static final int EIO = 5;
public static final int EIO = 5;
public static final int EAGAIN = 11;
}
1 change: 0 additions & 1 deletion src/main/java/tel/schich/javacan/PollEvent.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ public class PollEvent {
public static final int POLLMSG = 0x400;
public static final int POLLREMOVE = 0x1000;
public static final int POLLRDHUP = 0x2000;

/**
* Error condition.
*/
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/tel/schich/javacan/test/ISOTPSocketTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
*/
package tel.schich.javacan.test;

import java.io.IOException;
import org.junit.jupiter.api.Test;

import tel.schich.javacan.ISOTPSocket;
import tel.schich.javacan.JavaCAN;
import tel.schich.javacan.NativeException;

import java.io.IOException;

import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static tel.schich.javacan.test.CanTestHelper.CAN_INTERFACE;

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/tel/schich/javacan/test/RawCanSocketTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ void testNonBlockingRead() throws IOException, NativeException, InterruptedExcep
socket.bind(CAN_INTERFACE);
assertTrue(socket.isBlocking(), "Socket is blocking by default");

final CanFrame input = CanFrame.create(0x7EA, new byte[] {0x34, 0x52, 0x34});
final CanFrame input = CanFrame.create(0x7EA, new byte[]{0x34, 0x52, 0x34});
socket.setBlockingMode(false);
assertFalse(socket.isBlocking(), "Socket is non blocking after setting it so");
CanTestHelper.sendFrameViaUtils(CAN_INTERFACE, input);
Expand Down Expand Up @@ -171,7 +171,7 @@ void testFDFrame() throws NativeException, IOException, InterruptedException {
sock.setBlockingMode(false);

// more than 8 data bytes
final CanFrame input = CanFrame.create(0x7ED, new byte[] {0x00, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x22, 0x22, 0x22, 0x22});
final CanFrame input = CanFrame.create(0x7ED, new byte[]{0x00, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x22, 0x22, 0x22, 0x22});
CanTestHelper.sendFrameViaUtils(CAN_INTERFACE, input);
Thread.sleep(50);
final CanFrame output = sock.read();
Expand Down

0 comments on commit 1899398

Please sign in to comment.