dorkbox/Network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed issues with unit tests

Browse Source
This commit is contained in:
nathan 2019-01-25 15:59:11 +01:00
parent 1a6540f360
commit f2adf6c8b8
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/dorkbox/network/IdleTest.java
View File

@ -49,7 +49,7 @@ class IdleTest extends BaseTest {
@Test @Test
public public
void InputStreamSender() throws SecurityException, IOException { void InputStreamSenderTCP() throws SecurityException, IOException {
final int largeDataSize = 12345; final int largeDataSize = 12345;
System.err.println("-- TCP"); System.err.println("-- TCP");
@ -59,10 +59,15 @@ class IdleTest extends BaseTest {
configuration.serialization = Serialization.DEFAULT(false, false, null); configuration.serialization = Serialization.DEFAULT(false, false, null);
streamSpecificType(largeDataSize, configuration, ConnectionType.TCP); streamSpecificType(largeDataSize, configuration, ConnectionType.TCP);
}
@Test
public
void InputStreamSenderUDP() throws SecurityException, IOException {
final int largeDataSize = 12345;
System.err.println("-- UDP"); System.err.println("-- UDP");
configuration = new Configuration(); Configuration configuration = new Configuration();
configuration.tcpPort = tcpPort; configuration.tcpPort = tcpPort;
configuration.udpPort = udpPort; configuration.udpPort = udpPort;
configuration.host = host; configuration.host = host;
@ -76,7 +81,7 @@ class IdleTest extends BaseTest {
// have to test sending objects // have to test sending objects
@Test @Test
public public
void ObjectSender() throws SecurityException, IOException { void ObjectSenderTCP() throws SecurityException, IOException {
final Data mainData = new Data(); final Data mainData = new Data();
populateData(mainData); populateData(mainData);
@ -89,10 +94,18 @@ class IdleTest extends BaseTest {
register(configuration.serialization); register(configuration.serialization);
sendObject(mainData, configuration, ConnectionType.TCP); sendObject(mainData, configuration, ConnectionType.TCP);
}
// have to test sending objects
@Test
public
void ObjectSenderUDP() throws SecurityException, IOException {
final Data mainData = new Data();
populateData(mainData);
System.err.println("-- UDP"); System.err.println("-- UDP");
configuration = new Configuration(); Configuration configuration = new Configuration();
configuration.tcpPort = tcpPort; configuration.tcpPort = tcpPort;
configuration.udpPort = udpPort; configuration.udpPort = udpPort;
configuration.host = host; configuration.host = host;
@ -102,8 +115,6 @@ class IdleTest extends BaseTest {
sendObject(mainData, configuration, ConnectionType.TCP); sendObject(mainData, configuration, ConnectionType.TCP);
} }
private private
void sendObject(final Data mainData, Configuration configuration, final ConnectionType type) void sendObject(final Data mainData, Configuration configuration, final ConnectionType type)
throws SecurityException, IOException { throws SecurityException, IOException {

6
test/dorkbox/network/ListenerTest.java
View File

@ -256,8 +256,7 @@ class ListenerTest extends BaseTest {
@Override @Override
public public
void received(Connection connection, String string) { void received(Connection connection, String string) {
if (ListenerTest.this.count.get() < ListenerTest.this.limit) { if (ListenerTest.this.count.getAndIncrement() < ListenerTest.this.limit) {
ListenerTest.this.count.getAndIncrement();
connection.send() connection.send()
.TCP(string); .TCP(string);
} }
@ -276,7 +275,8 @@ class ListenerTest extends BaseTest {
waitForThreads(); waitForThreads();
assertEquals(this.limit, this.count.get()); // -1 BECAUSE we are `getAndIncrement` for each check earlier
assertEquals(this.limit, this.count.get()-1);
assertTrue(this.check1.get()); assertTrue(this.check1.get());
assertTrue(this.check2.get()); assertTrue(this.check2.get());