Skip to content

Commit 2569b98

Browse files
mugamuga
committed
refactored test programs for getting size of serialized data
1 parent d0bcf70 commit 2569b98

58 files changed

Lines changed: 529 additions & 529 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/test/java/org/msgpack/TestBufferPackBufferUnpack.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void testBoolean(boolean v) throws Exception {
3131
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
3232
boolean ret = unpacker.readBoolean();
3333
assertEquals(v, ret);
34-
assertEquals(bytes.length, unpacker.getLastMessageSize());
34+
assertEquals(bytes.length, unpacker.getReadByteCount());
3535
}
3636

3737
@Test @Override
@@ -48,7 +48,7 @@ public void testByte(byte v) throws Exception {
4848
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
4949
byte ret = unpacker.readByte();
5050
assertEquals(v, ret);
51-
assertEquals(bytes.length, unpacker.getLastMessageSize());
51+
assertEquals(bytes.length, unpacker.getReadByteCount());
5252
}
5353

5454
@Test @Override
@@ -65,7 +65,7 @@ public void testShort(short v) throws Exception {
6565
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
6666
short ret = unpacker.readShort();
6767
assertEquals(v, ret);
68-
assertEquals(bytes.length, unpacker.getLastMessageSize());
68+
assertEquals(bytes.length, unpacker.getReadByteCount());
6969
}
7070

7171
@Test @Override
@@ -82,7 +82,7 @@ public void testInteger(int v) throws Exception {
8282
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
8383
int ret = unpacker.readInt();
8484
assertEquals(v, ret);
85-
assertEquals(bytes.length, unpacker.getLastMessageSize());
85+
assertEquals(bytes.length, unpacker.getReadByteCount());
8686
}
8787

8888
@Test @Override
@@ -99,7 +99,7 @@ public void testLong(long v) throws Exception {
9999
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
100100
long ret = unpacker.readLong();
101101
assertEquals(v, ret);
102-
assertEquals(bytes.length, unpacker.getLastMessageSize());
102+
assertEquals(bytes.length, unpacker.getReadByteCount());
103103
}
104104

105105
@Test @Override
@@ -116,7 +116,7 @@ public void testFloat(float v) throws Exception {
116116
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
117117
float ret = unpacker.readFloat();
118118
assertEquals(v, ret, 10e-10);
119-
assertEquals(bytes.length, unpacker.getLastMessageSize());
119+
assertEquals(bytes.length, unpacker.getReadByteCount());
120120
}
121121

122122
@Test @Override
@@ -133,7 +133,7 @@ public void testDouble(double v) throws Exception {
133133
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
134134
double ret = unpacker.readDouble();
135135
assertEquals(v, ret, 10e-10);
136-
assertEquals(bytes.length, unpacker.getLastMessageSize());
136+
assertEquals(bytes.length, unpacker.getReadByteCount());
137137
}
138138

139139
@Test @Override
@@ -144,7 +144,7 @@ public void testNil() throws Exception {
144144
byte[] bytes = packer.toByteArray();
145145
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
146146
unpacker.readNil();
147-
assertEquals(bytes.length, unpacker.getLastMessageSize());
147+
assertEquals(bytes.length, unpacker.getReadByteCount());
148148
}
149149

150150
@Test @Override
@@ -161,7 +161,7 @@ public void testBigInteger(BigInteger v) throws Exception {
161161
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
162162
BigInteger ret = unpacker.read(BigInteger.class);
163163
assertEquals(v, ret);
164-
assertEquals(bytes.length, unpacker.getLastMessageSize());
164+
assertEquals(bytes.length, unpacker.getReadByteCount());
165165
}
166166

167167
@Test @Override
@@ -178,7 +178,7 @@ public void testString(String v) throws Exception {
178178
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
179179
String ret = unpacker.read(String.class);
180180
assertEquals(v, ret);
181-
assertEquals(bytes.length, unpacker.getLastMessageSize());
181+
assertEquals(bytes.length, unpacker.getReadByteCount());
182182
}
183183

184184
@Test @Override
@@ -195,7 +195,7 @@ public void testByteArray(byte[] v) throws Exception {
195195
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
196196
byte[] ret = unpacker.read(byte[].class);
197197
assertArrayEquals(v, ret);
198-
assertEquals(bytes.length, unpacker.getLastMessageSize());
198+
assertEquals(bytes.length, unpacker.getReadByteCount());
199199
}
200200

201201
@Test @Override
@@ -234,7 +234,7 @@ public <E> void testList(List<E> v, Class<E> elementClass) throws Exception {
234234
while (v_iter.hasNext()) {
235235
assertEquals(v_iter.next(), ret_iter.next());
236236
}
237-
assertEquals(bytes.length, unpacker.getLastMessageSize());
237+
assertEquals(bytes.length, unpacker.getReadByteCount());
238238
}
239239

240240
@Test @Override
@@ -275,6 +275,6 @@ public <K, V> void testMap(Map<K, V> v, Class<K> keyElementClass, Class<V> value
275275
Object value = ret.get(e.getKey());
276276
assertEquals(e.getValue(), value);
277277
}
278-
assertEquals(bytes.length, unpacker.getLastMessageSize());
278+
assertEquals(bytes.length, unpacker.getReadByteCount());
279279
}
280280
}

‎src/test/java/org/msgpack/TestBufferPackConvert.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void testBoolean(boolean v) throws Exception {
3636
assertTrue(value.isBooleanValue());
3737
boolean ret = new Converter(value).readBoolean();
3838
assertEquals(v, ret);
39-
assertEquals(bytes.length, unpacker.getLastMessageSize());
39+
assertEquals(bytes.length, unpacker.getReadByteCount());
4040
}
4141

4242
@Test @Override
@@ -55,7 +55,7 @@ public void testByte(byte v) throws Exception {
5555
assertTrue(value.isIntegerValue());
5656
byte ret = new Converter(value).readByte();
5757
assertEquals(v, ret);
58-
assertEquals(bytes.length, unpacker.getLastMessageSize());
58+
assertEquals(bytes.length, unpacker.getReadByteCount());
5959
}
6060

6161
@Test @Override
@@ -74,7 +74,7 @@ public void testShort(short v) throws Exception {
7474
assertTrue(value.isIntegerValue());
7575
short ret = new Converter(value).readShort();
7676
assertEquals(v, ret);
77-
assertEquals(bytes.length, unpacker.getLastMessageSize());
77+
assertEquals(bytes.length, unpacker.getReadByteCount());
7878
}
7979

8080
@Test @Override
@@ -93,7 +93,7 @@ public void testInteger(int v) throws Exception {
9393
assertTrue(value.isIntegerValue());
9494
int ret = new Converter(value).readInt();
9595
assertEquals(v, ret);
96-
assertEquals(bytes.length, unpacker.getLastMessageSize());
96+
assertEquals(bytes.length, unpacker.getReadByteCount());
9797
}
9898

9999
@Test @Override
@@ -112,7 +112,7 @@ public void testLong(long v) throws Exception {
112112
assertTrue(value.isIntegerValue());
113113
long ret = new Converter(value).readLong();
114114
assertEquals(v, ret);
115-
assertEquals(bytes.length, unpacker.getLastMessageSize());
115+
assertEquals(bytes.length, unpacker.getReadByteCount());
116116
}
117117

118118
@Test @Override
@@ -131,7 +131,7 @@ public void testFloat(float v) throws Exception {
131131
assertTrue(value.isFloatValue());
132132
float ret = new Converter(value).readFloat();
133133
assertEquals(v, ret, 10e-10);
134-
assertEquals(bytes.length, unpacker.getLastMessageSize());
134+
assertEquals(bytes.length, unpacker.getReadByteCount());
135135
}
136136

137137
@Test @Override
@@ -150,7 +150,7 @@ public void testDouble(double v) throws Exception {
150150
assertTrue(value.isFloatValue());
151151
double ret = new Converter(value).readDouble();
152152
assertEquals(v, ret, 10e-10);
153-
assertEquals(bytes.length, unpacker.getLastMessageSize());
153+
assertEquals(bytes.length, unpacker.getReadByteCount());
154154
}
155155

156156
@Test @Override
@@ -163,7 +163,7 @@ public void testNil() throws Exception {
163163
Value value = unpacker.readValue();
164164
assertTrue(value.isNilValue());
165165
new Converter(value).readNil();
166-
assertEquals(bytes.length, unpacker.getLastMessageSize());
166+
assertEquals(bytes.length, unpacker.getReadByteCount());
167167
}
168168

169169
@Test @Override
@@ -181,7 +181,7 @@ public void testBigInteger(BigInteger v) throws Exception {
181181
Value value = unpacker.readValue();
182182
BigInteger ret = new Converter(value).read(BigInteger.class);
183183
assertEquals(v, ret);
184-
assertEquals(bytes.length, unpacker.getLastMessageSize());
184+
assertEquals(bytes.length, unpacker.getReadByteCount());
185185
}
186186

187187
@Test @Override
@@ -199,7 +199,7 @@ public void testString(String v) throws Exception {
199199
Value value = unpacker.readValue();
200200
String ret = new Converter(value).read(String.class);
201201
assertEquals(v, ret);
202-
assertEquals(bytes.length, unpacker.getLastMessageSize());
202+
assertEquals(bytes.length, unpacker.getReadByteCount());
203203
}
204204

205205
@Test @Override
@@ -217,7 +217,7 @@ public void testByteArray(byte[] v) throws Exception {
217217
Value value = unpacker.readValue();
218218
byte[] ret = new Converter(value).read(byte[].class);
219219
assertArrayEquals(v, ret);
220-
assertEquals(bytes.length, unpacker.getLastMessageSize());
220+
assertEquals(bytes.length, unpacker.getReadByteCount());
221221
}
222222

223223
@Test @Override
@@ -257,7 +257,7 @@ public <E> void testList(List<E> v, Class<E> elementClass) throws Exception {
257257
while (v_iter.hasNext()) {
258258
assertEquals(v_iter.next(), ret_iter.next());
259259
}
260-
assertEquals(bytes.length, unpacker.getLastMessageSize());
260+
assertEquals(bytes.length, unpacker.getReadByteCount());
261261
}
262262

263263
@Test @Override
@@ -300,6 +300,6 @@ public <K, V> void testMap(Map<K, V> v, Class<K> keyElementClass, Class<V> value
300300
Object value = ret.get(e.getKey());
301301
assertEquals(e.getValue(), value);
302302
}
303-
assertEquals(bytes.length, unpacker.getLastMessageSize());
303+
assertEquals(bytes.length, unpacker.getReadByteCount());
304304
}
305305
}

‎src/test/java/org/msgpack/TestBufferPackUnpack.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void testBoolean(boolean v) throws Exception {
3232
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
3333
boolean ret = unpacker.readBoolean();
3434
assertEquals(v, ret);
35-
assertEquals(bytes.length, unpacker.getLastMessageSize());
35+
assertEquals(bytes.length, unpacker.getReadByteCount());
3636
}
3737

3838
@Test @Override
@@ -49,7 +49,7 @@ public void testByte(byte v) throws Exception {
4949
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
5050
byte ret = unpacker.readByte();
5151
assertEquals(v, ret);
52-
assertEquals(bytes.length, unpacker.getLastMessageSize());
52+
assertEquals(bytes.length, unpacker.getReadByteCount());
5353
}
5454

5555
@Test @Override
@@ -66,7 +66,7 @@ public void testShort(short v) throws Exception {
6666
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
6767
short ret = unpacker.readShort();
6868
assertEquals(v, ret);
69-
assertEquals(bytes.length, unpacker.getLastMessageSize());
69+
assertEquals(bytes.length, unpacker.getReadByteCount());
7070
}
7171

7272
@Test @Override
@@ -83,7 +83,7 @@ public void testInteger(int v) throws Exception {
8383
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
8484
int ret = unpacker.readInt();
8585
assertEquals(v, ret);
86-
assertEquals(bytes.length, unpacker.getLastMessageSize());
86+
assertEquals(bytes.length, unpacker.getReadByteCount());
8787
}
8888

8989
@Test @Override
@@ -100,7 +100,7 @@ public void testLong(long v) throws Exception {
100100
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
101101
long ret = unpacker.readLong();
102102
assertEquals(v, ret);
103-
assertEquals(bytes.length, unpacker.getLastMessageSize());
103+
assertEquals(bytes.length, unpacker.getReadByteCount());
104104
}
105105

106106
@Test @Override
@@ -117,7 +117,7 @@ public void testFloat(float v) throws Exception {
117117
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
118118
float ret = unpacker.readFloat();
119119
assertEquals(v, ret, 10e-10);
120-
assertEquals(bytes.length, unpacker.getLastMessageSize());
120+
assertEquals(bytes.length, unpacker.getReadByteCount());
121121
}
122122

123123
@Test @Override
@@ -134,7 +134,7 @@ public void testDouble(double v) throws Exception {
134134
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
135135
double ret = unpacker.readDouble();
136136
assertEquals(v, ret, 10e-10);
137-
assertEquals(bytes.length, unpacker.getLastMessageSize());
137+
assertEquals(bytes.length, unpacker.getReadByteCount());
138138
}
139139

140140
@Test @Override
@@ -145,7 +145,7 @@ public void testNil() throws Exception {
145145
byte[] bytes = packer.toByteArray();
146146
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
147147
unpacker.readNil();
148-
assertEquals(bytes.length, unpacker.getLastMessageSize());
148+
assertEquals(bytes.length, unpacker.getReadByteCount());
149149
}
150150

151151
@Test @Override
@@ -162,7 +162,7 @@ public void testBigInteger(BigInteger v) throws Exception {
162162
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
163163
BigInteger ret = unpacker.read(BigInteger.class);
164164
assertEquals(v, ret);
165-
assertEquals(bytes.length, unpacker.getLastMessageSize());
165+
assertEquals(bytes.length, unpacker.getReadByteCount());
166166
}
167167

168168
@Test @Override
@@ -179,7 +179,7 @@ public void testString(String v) throws Exception {
179179
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
180180
String ret = unpacker.read(String.class);
181181
assertEquals(v, ret);
182-
assertEquals(bytes.length, unpacker.getLastMessageSize());
182+
assertEquals(bytes.length, unpacker.getReadByteCount());
183183
}
184184

185185
@Test @Override
@@ -196,7 +196,7 @@ public void testByteArray(byte[] v) throws Exception {
196196
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
197197
byte[] ret = unpacker.read(byte[].class);
198198
assertArrayEquals(v, ret);
199-
assertEquals(bytes.length, unpacker.getLastMessageSize());
199+
assertEquals(bytes.length, unpacker.getReadByteCount());
200200
}
201201

202202
@Test @Override
@@ -235,7 +235,7 @@ public <E> void testList(List<E> v, Class<E> elementClass) throws Exception {
235235
while (v_iter.hasNext()) {
236236
assertEquals(v_iter.next(), ret_iter.next());
237237
}
238-
assertEquals(bytes.length, unpacker.getLastMessageSize());
238+
assertEquals(bytes.length, unpacker.getReadByteCount());
239239
}
240240

241241
@Test @Override
@@ -276,6 +276,6 @@ public <K, V> void testMap(Map<K, V> v, Class<K> keyElementClass, Class<V> value
276276
Object value = ret.get(e.getKey());
277277
assertEquals(e.getValue(), value);
278278
}
279-
assertEquals(bytes.length, unpacker.getLastMessageSize());
279+
assertEquals(bytes.length, unpacker.getReadByteCount());
280280
}
281281
}

0 commit comments

Comments
 (0)