Skip to content

Commit 9b89668

Browse files
author
jossonsmith
committed
Update Simple RPC:
Add header "WLL100" for current Simple RPC Protocol Add a following class name and a "#" to identify the Simple RPC Runnable service Remove Simple RPC URL mapping
1 parent df17506 commit 9b89668

File tree

8 files changed

+114
-97
lines changed

8 files changed

+114
-97
lines changed

‎tests/net.sf.j2s.test.ajax/src/com/ognize/lz77js/LZ77JSSimpleRPCRunnable.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public class LZ77JSSimpleRPCRunnable extends SimpleRPCRunnable {
2626
public boolean addLZ77Header;
2727
public String result;
2828

29-
public String url() {
29+
public String getHttpURL() {
3030
/*
3131
* In JavaScript, this url must NOT be cross site URL!
3232
*/
33-
return "http://bl.ognize.com/lz77js/j2s-lz77js";
33+
return "http://bl.ognize.com/lz77js/simplerpc"; /* this url doesn't work yet! */
3434
}
3535

3636
public void ajaxRun() {

‎tests/net.sf.j2s.test.ajax/src/net/sf/j2s/test/ajax/ArrayDeserializeTest.java‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,42 +22,45 @@
2222
* 2006-10-11
2323
*/
2424
public class ArrayDeserializeTest extends TestCase {
25+
String trim(String s) {
26+
return s.substring(s.indexOf('#') + 1);
27+
}
2528
public void testSimple() {
2629
SimpleSerializable ss = new SimpleSerializable();
2730
//System.out.println(ss.serialize());
28-
assertEquals(0, ss.serialize().length());
29-
assertEquals("", ss.serialize());
31+
assertEquals(0, trim(ss.serialize()).length());
32+
assertEquals("", trim(ss.serialize()));
3033
}
3134
public class FloatSerialize extends SimpleSerializable {
3235
public float[] f = new float[] {23.2f};
3336
}
3437
public void testSimpleFloat() {
3538
FloatSerialize ss = new FloatSerialize();
36-
ss.deserialize("CfAFCF21.2");
39+
ss.deserialize("WLL100#CfAFCF21.2");
3740
assertEquals(21.2, ss.f[0], 0.0001);
3841
}
3942
public class DoubleSerialize extends SimpleSerializable {
4043
public double[] d = new double[] {23.2};
4144
}
4245
public void testSimpleDouble() {
4346
DoubleSerialize ss = new DoubleSerialize();
44-
ss.deserialize("CdADCF21.2");
47+
ss.deserialize("WLL100#CdADCF21.2");
4548
assertEquals(21.2, ss.d[0], 0.0001);
4649
}
4750
public class IntSerialize extends SimpleSerializable {
4851
public int[] i = new int[] {23};
4952
}
5053
public void testSimpleInt() {
5154
IntSerialize ss = new IntSerialize();
52-
ss.deserialize("CiAICD13");;
55+
ss.deserialize("WLL100#CiAICD13");;
5356
assertEquals(13, ss.i[0]);
5457
}
5558
public class LongSerialize extends SimpleSerializable {
5659
public long[] l = new long[] {23};
5760
}
5861
public void testSimpleLong() {
5962
LongSerialize ss = new LongSerialize();
60-
ss.deserialize("ClALCD13");;
63+
ss.deserialize("WLL100#ClALCD13");;
6164
assertEquals(1, ss.l.length);
6265
assertEquals(13, ss.l[0]);
6366
}
@@ -66,59 +69,59 @@ public class ShortSerialize extends SimpleSerializable {
6669
}
6770
public void testSimpleShort() {
6871
ShortSerialize ss = new ShortSerialize();
69-
ss.deserialize("CsASCD63");;
72+
ss.deserialize("WLL100#CsASCD63");;
7073
assertEquals(63, ss.s[0]);
7174
}
7275
public class ByteSerialize extends SimpleSerializable {
7376
public byte[] b = new byte[] {23};
7477
}
7578
public void testSimpleByte() {
7679
ByteSerialize ss = new ByteSerialize();
77-
ss.deserialize("CbABCD33");;
80+
ss.deserialize("WLL100#CbABCD33");;
7881
assertEquals(33, ss.b[0]);
7982
}
8083
public class CharSerialize extends SimpleSerializable {
8184
public char[] c = new char[] {23};
8285
}
8386
public void testSimpleChar() {
8487
CharSerialize ss = new CharSerialize();
85-
ss.deserialize("CcACCD65");;
88+
ss.deserialize("WLL100#CcACCD65");;
8689
assertEquals('A', ss.c[0]);
8790
}
8891
public class BooleanSerialize extends SimpleSerializable {
8992
public boolean[] b = new boolean[] {true};
9093
}
9194
public void testSimpleBoolean() {
9295
BooleanSerialize ss = new BooleanSerialize();
93-
ss.deserialize("CbAbCGfalse");;
96+
ss.deserialize("WLL100#CbAbCGfalse");;
9497
assertEquals(false, ss.b[0]);
9598
}
9699
public void testSimpleBoolean2() {
97100
BooleanSerialize ss = new BooleanSerialize();
98-
ss.deserialize("CbAb@D56GfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalse");;
101+
ss.deserialize("WLL100#CbAb@D56GfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalse");;
99102
assertEquals(56, ss.b.length);
100103
}
101104
public class StringSerialize extends SimpleSerializable {
102105
public String[] s = new String[] {"My name is jozz"};
103106
}
104107
public void testSimpleString() {
105108
StringSerialize ss = new StringSerialize();
106-
ss.deserialize("CsAXCsQMy name iz jozz");;
109+
ss.deserialize("WLL100#CsAXCsQMy name iz jozz");;
107110
assertEquals("My name iz jozz", ss.s[0]);
108111
}
109112
public void testSimpleString2() {
110113
StringSerialize ss = new StringSerialize();
111-
ss.deserialize("CsAXA");;
114+
ss.deserialize("WLL100#CsAXA");;
112115
assertEquals(null, ss.s);
113116
}
114117
public void testSimpleString3() {
115118
StringSerialize ss = new StringSerialize();
116-
ss.deserialize("CsAXCs@D56abcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefg");;
119+
ss.deserialize("WLL100#CsAXCs@D56abcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefg");;
117120
assertEquals(56, ss.s[0].length());
118121
}
119122
public void testSimpleString7() {
120123
StringSerialize ss = new StringSerialize();
121-
ss.deserialize("CsAXCuN5ZGo5LuB5bu6");;
124+
ss.deserialize("WLL100#CsAXCuN5ZGo5LuB5bu6");;
122125
assertEquals("ÖÜÈʽ¨", ss.s[0]);
123126
}
124127
public class MixedSerialize extends SimpleSerializable {
@@ -134,7 +137,7 @@ public class MixedSerialize extends SimpleSerializable {
134137
}
135138
public void testSimpleMixed() {
136139
MixedSerialize ss = new MixedSerialize();
137-
ss.deserialize("CfAFCF23.2CdADCF20.2CnAICD23ClALCD23CsASCD23CbABCD23CcACCD23CxAbCGfalseEstrAXCsLHell World");;
140+
ss.deserialize("WLL100#CfAFCF23.2CdADCF20.2CnAICD23ClALCD23CsASCD23CbABCD23CcACCD23CxAbCGfalseEstrAXCsLHell World");;
138141
assertEquals(20.2, ss.d[0], 0.001);
139142
}
140143
}

‎tests/net.sf.j2s.test.ajax/src/net/sf/j2s/test/ajax/ArraySerializeTest.java‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -22,95 +22,98 @@
2222
* 2006-10-11
2323
*/
2424
public class ArraySerializeTest extends TestCase {
25+
String trim(String s) {
26+
return s.substring(s.indexOf('#') + 1);
27+
}
2528
public void testSimple() {
2629
SimpleSerializable ss = new SimpleSerializable();
27-
//System.out.println(ss.serialize());
28-
assertEquals(0, ss.serialize().length());
29-
assertEquals("", ss.serialize());
30+
//System.out.println(trim(ss.serialize()));
31+
assertEquals(0, trim(ss.serialize()).length());
32+
assertEquals("", trim(ss.serialize()));
3033
}
3134
public class FloatSerialize extends SimpleSerializable {
3235
public float[] f = new float[] {23.2f};
3336
}
3437
public void testSimpleFloat() {
3538
SimpleSerializable ss = new FloatSerialize();
36-
System.out.println(ss.serialize());
37-
assertEquals("CfAFCF23.2", ss.serialize());
39+
System.out.println(trim(ss.serialize()));
40+
assertEquals("CfAFCF23.2", trim(ss.serialize()));
3841
}
3942
public class DoubleSerialize extends SimpleSerializable {
4043
public double[] d = new double[] {23.2};
4144
}
4245
public void testSimpleDouble() {
4346
SimpleSerializable ss = new DoubleSerialize();
44-
System.out.println(ss.serialize());
45-
assertEquals("CdADCF23.2", ss.serialize());
47+
System.out.println(trim(ss.serialize()));
48+
assertEquals("CdADCF23.2", trim(ss.serialize()));
4649
}
4750
public class IntSerialize extends SimpleSerializable {
4851
public int[] i = new int[] {23};
4952
}
5053
public void testSimpleInt() {
5154
SimpleSerializable ss = new IntSerialize();
52-
System.out.println(ss.serialize());
53-
assertEquals("CiAICD23", ss.serialize());
55+
System.out.println(trim(ss.serialize()));
56+
assertEquals("CiAICD23", trim(ss.serialize()));
5457
}
5558
public class LongSerialize extends SimpleSerializable {
5659
public long[] l = new long[] {23};
5760
}
5861
public void testSimpleLong() {
5962
SimpleSerializable ss = new LongSerialize();
60-
System.out.println(ss.serialize());
61-
assertEquals("ClALCD23", ss.serialize());
63+
System.out.println(trim(ss.serialize()));
64+
assertEquals("ClALCD23", trim(ss.serialize()));
6265
}
6366
public class ShortSerialize extends SimpleSerializable {
6467
public short[] s = new short[] {23};
6568
}
6669
public void testSimpleShort() {
6770
SimpleSerializable ss = new ShortSerialize();
68-
System.out.println(ss.serialize());
69-
assertEquals("CsASCD23", ss.serialize());
71+
System.out.println(trim(ss.serialize()));
72+
assertEquals("CsASCD23", trim(ss.serialize()));
7073
}
7174
public class ByteSerialize extends SimpleSerializable {
7275
public byte[] b = new byte[] {23};
7376
}
7477
public void testSimpleByte() {
7578
SimpleSerializable ss = new ByteSerialize();
76-
System.out.println(ss.serialize());
77-
assertEquals("CbABCD23", ss.serialize());
79+
System.out.println(trim(ss.serialize()));
80+
assertEquals("CbABCD23", trim(ss.serialize()));
7881
}
7982
public class CharSerialize extends SimpleSerializable {
8083
public char[] c = new char[] {23};
8184
}
8285
public void testSimpleChar() {
8386
SimpleSerializable ss = new CharSerialize();
84-
System.out.println(ss.serialize());
85-
assertEquals("CcACCD23", ss.serialize());
87+
System.out.println(trim(ss.serialize()));
88+
assertEquals("CcACCD23", trim(ss.serialize()));
8689
}
8790
public class BooleanSerialize extends SimpleSerializable {
8891
public boolean[] b = new boolean[] {true};
8992
}
9093
public void testSimpleBoolean() {
9194
SimpleSerializable ss = new BooleanSerialize();
92-
System.out.println(ss.serialize());
93-
assertEquals("CbAbCFtrue", ss.serialize());
95+
System.out.println(trim(ss.serialize()));
96+
assertEquals("CbAbCFtrue", trim(ss.serialize()));
9497
}
9598
public void testSimpleBoolean2() {
9699
BooleanSerialize ss = new BooleanSerialize();
97100
ss.b = new boolean[56];
98-
System.out.println(ss.serialize());
99-
assertEquals("CbAb@D56GfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalse", ss.serialize());
101+
System.out.println(trim(ss.serialize()));
102+
assertEquals("CbAb@D56GfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalseGfalse", trim(ss.serialize()));
100103
}
101104
public class StringSerialize extends SimpleSerializable {
102105
public String[] s = new String[] {"My name is jozz"};
103106
}
104107
public void testSimpleString() {
105108
SimpleSerializable ss = new StringSerialize();
106-
System.out.println(ss.serialize());
107-
assertEquals("CsAXCsQMy name is jozz", ss.serialize());
109+
System.out.println(trim(ss.serialize()));
110+
assertEquals("CsAXCsQMy name is jozz", trim(ss.serialize()));
108111
}
109112
public void testSimpleString2() {
110113
StringSerialize ss = new StringSerialize();
111114
ss.s = null;
112-
System.out.println(ss.serialize());
113-
assertEquals("CsAXA", ss.serialize());
115+
System.out.println(trim(ss.serialize()));
116+
assertEquals("CsAXA", trim(ss.serialize()));
114117
}
115118
public void testSimpleString3() {
116119
StringSerialize ss = new StringSerialize();
@@ -119,14 +122,14 @@ public void testSimpleString3() {
119122
ss.s[0] += ss.s[0];
120123
ss.s[0] += ss.s[0];
121124
System.out.println(ss.s[0].length());
122-
System.out.println(ss.serialize());
123-
assertEquals("CsAXCs@D56abcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefg", ss.serialize());
125+
System.out.println(trim(ss.serialize()));
126+
assertEquals("CsAXCs@D56abcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefg", trim(ss.serialize()));
124127
}
125128
public void testSimpleString7() {
126129
StringSerialize ss = new StringSerialize();
127130
ss.s[0] = "ÖÜÈʽ¨";
128-
System.out.println(ss.serialize());
129-
assertEquals("CsAXCuN5ZGo5LuB5bu6", ss.serialize());
131+
System.out.println(trim(ss.serialize()));
132+
assertEquals("CsAXCuN5ZGo5LuB5bu6", trim(ss.serialize()));
130133
}
131134
public class MixedSerialize extends SimpleSerializable {
132135
public float[] f = new float[] {23.2f};
@@ -141,7 +144,8 @@ public class MixedSerialize extends SimpleSerializable {
141144
}
142145
public void testSimpleMixed() {
143146
SimpleSerializable ss = new MixedSerialize();
144-
System.out.println(ss.serialize());
145-
assertEquals("CfAFCF23.2CdADCF23.2CnAICD23ClALCD23CsASCD23CbABCD23CcACCD23CxAbCGfalseEstrAXCsLHell World", ss.serialize());
147+
System.out.println(trim(ss.serialize()));
148+
// assertEquals("CfAFCF23.2CdADCF23.2CnAICD23ClALCD23CsASCD23CbABCD23CcACCD23CxAbCGfalseEstrAXCsLHell World", trim(ss.serialize()));
149+
assertEquals("CdADCF23.2CxAbCGfalseCfAFCF23.2CbABCD23CsASCD23EstrAXCsLHell WorldClALCD23CcACCD23CnAICD23", trim(ss.serialize()));
146150
}
147151
}

‎tests/net.sf.j2s.test.ajax/src/net/sf/j2s/test/ajax/BigTest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
* 2006-10-13
2323
*/
2424
public class BigTest extends TestCase {
25+
String trim(String s) {
26+
return s.substring(s.indexOf('#') + 1);
27+
}
2528
public void testJavaSource() {
2629
String tmpStr = "";
2730
tmpStr += "/*******************************************************************************\r\n";
@@ -191,7 +194,7 @@ public void testJavaSource() {
191194

192195
StringSS sss = new StringSS();
193196
sss.s = tmpStr;
194-
String serialize = sss.serialize();
197+
String serialize = trim(sss.serialize());
195198
System.out.println(serialize);
196199
System.out.println(serialize.length());
197200
assertEquals(6153, serialize.length());

0 commit comments

Comments
 (0)