git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:nikiroo/nikiroo-utils
[fanfix.git]
/
src
/
be
/
nikiroo
/
utils
/
test_code
/
SerialServerTest.java
diff --git
a/src/be/nikiroo/utils/test_code/SerialServerTest.java
b/src/be/nikiroo/utils/test_code/SerialServerTest.java
index 9c346fd5829b880622dd05307513720f816213b3..956499a40f3e43cac07998ffa5f9c20764b7bc70 100644
(file)
--- a/
src/be/nikiroo/utils/test_code/SerialServerTest.java
+++ b/
src/be/nikiroo/utils/test_code/SerialServerTest.java
@@
-51,8
+51,8
@@
class SerialServerTest extends TestLauncher {
ServerString server = new ServerString(this.getName(), 0, key) {
@Override
protected String onRequest(
ServerString server = new ServerString(this.getName(), 0, key) {
@Override
protected String onRequest(
- ConnectActionServerString action, String data
)
- throws Exception {
+ ConnectActionServerString action, String data
,
+
long id)
throws Exception {
return null;
}
return null;
}
@@
-111,8
+111,8
@@
class SerialServerTest extends TestLauncher {
ServerString server = new ServerString(this.getName(), 0, key) {
@Override
protected String onRequest(
ServerString server = new ServerString(this.getName(), 0, key) {
@Override
protected String onRequest(
- ConnectActionServerString action, String data
)
- throws Exception {
+ ConnectActionServerString action, String data
,
+
long id)
throws Exception {
sent[0] = data;
return "pong";
}
sent[0] = data;
return "pong";
}
@@
-172,8
+172,8
@@
class SerialServerTest extends TestLauncher {
ServerString server = new ServerString(this.getName(), 0, key) {
@Override
protected String onRequest(
ServerString server = new ServerString(this.getName(), 0, key) {
@Override
protected String onRequest(
- ConnectActionServerString action, String data
)
- throws Exception {
+ ConnectActionServerString action, String data
,
+
long id)
throws Exception {
sent[0] = data;
action.send("pong");
sent[1] = action.rec();
sent[0] = data;
action.send("pong");
sent[1] = action.rec();
@@
-238,8
+238,8
@@
class SerialServerTest extends TestLauncher {
ServerString server = new ServerString(this.getName(), 0, key) {
@Override
protected String onRequest(
ServerString server = new ServerString(this.getName(), 0, key) {
@Override
protected String onRequest(
- ConnectActionServerString action, String data
)
- throws Exception {
+ ConnectActionServerString action, String data
,
+
long id)
throws Exception {
sent[Integer.parseInt(data)] = data;
return "" + (Integer.parseInt(data) * 2);
}
sent[Integer.parseInt(data)] = data;
return "" + (Integer.parseInt(data) * 2);
}
@@
-310,8
+310,8
@@
class SerialServerTest extends TestLauncher {
ServerObject server = new ServerObject(this.getName(), 0, key) {
@Override
protected Object onRequest(
ServerObject server = new ServerObject(this.getName(), 0, key) {
@Override
protected Object onRequest(
- ConnectActionServerObject action, Object data
)
- throws Exception {
+ ConnectActionServerObject action, Object data
,
+
long id)
throws Exception {
return null;
}
return null;
}
@@
-369,8
+369,8
@@
class SerialServerTest extends TestLauncher {
ServerObject server = new ServerObject(this.getName(), 0, key) {
@Override
protected Object onRequest(
ServerObject server = new ServerObject(this.getName(), 0, key) {
@Override
protected Object onRequest(
- ConnectActionServerObject action, Object data
)
- throws Exception {
+ ConnectActionServerObject action, Object data
,
+
long id)
throws Exception {
sent[0] = data;
return "pong";
}
sent[0] = data;
return "pong";
}
@@
-430,8
+430,8
@@
class SerialServerTest extends TestLauncher {
ServerObject server = new ServerObject(this.getName(), 0, key) {
@Override
protected Object onRequest(
ServerObject server = new ServerObject(this.getName(), 0, key) {
@Override
protected Object onRequest(
- ConnectActionServerObject action, Object data
)
- throws Exception {
+ ConnectActionServerObject action, Object data
,
+
long id)
throws Exception {
sent[0] = data;
action.send("pong");
sent[1] = action.rec();
sent[0] = data;
action.send("pong");
sent[1] = action.rec();
@@
-496,8
+496,8
@@
class SerialServerTest extends TestLauncher {
ServerObject server = new ServerObject(this.getName(), 0, key) {
@Override
protected Object onRequest(
ServerObject server = new ServerObject(this.getName(), 0, key) {
@Override
protected Object onRequest(
- ConnectActionServerObject action, Object data
)
- throws Exception {
+ ConnectActionServerObject action, Object data
,
+
long id)
throws Exception {
sent[0] = data;
return new Object[] { "ACK" };
}
sent[0] = data;
return new Object[] { "ACK" };
}
@@
-567,8
+567,8
@@
class SerialServerTest extends TestLauncher {
ServerObject server = new ServerObject(this.getName(), 0, key) {
@Override
protected Object onRequest(
ServerObject server = new ServerObject(this.getName(), 0, key) {
@Override
protected Object onRequest(
- ConnectActionServerObject action, Object data
)
- throws Exception {
+ ConnectActionServerObject action, Object data
,
+
long id)
throws Exception {
sent[(Integer) data] = data;
return ((Integer) data) * 2;
}
sent[(Integer) data] = data;
return ((Integer) data) * 2;
}