Skip to content

Commit fe765f0

Browse files
mugamuga
committed
changed test programs
1 parent bae63ba commit fe765f0

17 files changed

Lines changed: 63 additions & 69 deletions

‎src/main/java/org/msgpack/template/ByteBufferTemplate.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public ByteBuffer read(Unpacker u, ByteBuffer to, boolean required) throws IOExc
4343
if (!required && u.trySkipNil()) {
4444
return null;
4545
}
46-
return u.readByteBuffer(); // TODO read to 'to' obj?
46+
return u.readByteBuffer(); // TODO read to 'to' obj?
4747
}
4848

4949
static public ByteBufferTemplate getInstance() {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void testBigInteger(BigInteger v) throws Exception {
151151
packer.write(v);
152152
byte[] bytes = packer.toByteArray();
153153
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
154-
BigInteger ret = unpacker.readBigInteger();
154+
BigInteger ret = unpacker.read(BigInteger.class);
155155
assertEquals(v, ret);
156156
}
157157

@@ -167,7 +167,7 @@ public void testString(String v) throws Exception {
167167
packer.write(v);
168168
byte[] bytes = packer.toByteArray();
169169
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
170-
String ret = unpacker.readString();
170+
String ret = unpacker.read(String.class);
171171
assertEquals(v, ret);
172172
}
173173

@@ -183,7 +183,7 @@ public void testByteArray(byte[] v) throws Exception {
183183
packer.write(v);
184184
byte[] bytes = packer.toByteArray();
185185
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
186-
byte[] ret = unpacker.readByteArray();
186+
byte[] ret = unpacker.read(byte[].class);
187187
assertArrayEquals(v, ret);
188188
}
189189

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ public void testBigInteger(BigInteger v) throws Exception {
171171
byte[] bytes = packer.toByteArray();
172172
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
173173
Value value = unpacker.readValue();
174-
assertTrue(value.isIntegerValue());
175-
BigInteger ret = new Converter(value).readBigInteger();
174+
BigInteger ret = new Converter(value).read(BigInteger.class);
176175
assertEquals(v, ret);
177176
}
178177

@@ -189,8 +188,7 @@ public void testString(String v) throws Exception {
189188
byte[] bytes = packer.toByteArray();
190189
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
191190
Value value = unpacker.readValue();
192-
assertTrue(value.isRawValue());
193-
String ret = new Converter(value).readString();
191+
String ret = new Converter(value).read(String.class);
194192
assertEquals(v, ret);
195193
}
196194

@@ -207,8 +205,7 @@ public void testByteArray(byte[] v) throws Exception {
207205
byte[] bytes = packer.toByteArray();
208206
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
209207
Value value = unpacker.readValue();
210-
assertTrue(value.isRawValue());
211-
byte[] ret = new Converter(value).readByteArray();
208+
byte[] ret = new Converter(value).read(byte[].class);
212209
assertArrayEquals(v, ret);
213210
}
214211

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public void testBigInteger(BigInteger v) throws Exception {
152152
packer.write(v);
153153
byte[] bytes = packer.toByteArray();
154154
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
155-
BigInteger ret = unpacker.readBigInteger();
155+
BigInteger ret = unpacker.read(BigInteger.class);
156156
assertEquals(v, ret);
157157
}
158158

@@ -168,7 +168,7 @@ public void testString(String v) throws Exception {
168168
packer.write(v);
169169
byte[] bytes = packer.toByteArray();
170170
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
171-
String ret = unpacker.readString();
171+
String ret = unpacker.read(String.class);
172172
assertEquals(v, ret);
173173
}
174174

@@ -184,7 +184,7 @@ public void testByteArray(byte[] v) throws Exception {
184184
packer.write(v);
185185
byte[] bytes = packer.toByteArray();
186186
Unpacker unpacker = msgpack.createUnpacker(new ByteArrayInputStream(bytes));
187-
byte[] ret = unpacker.readByteArray();
187+
byte[] ret = unpacker.read(byte[].class);
188188
assertArrayEquals(v, ret);
189189
}
190190

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package org.msgpack;
2+
3+
import static org.junit.Assert.assertTrue;
4+
5+
import org.junit.Test;
6+
7+
8+
public class TestMessagePack extends TestSet {
9+
10+
@Test
11+
public void testDummy() {
12+
assertTrue(true);
13+
}
14+
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public void testBigInteger(BigInteger v) throws Exception {
161161
packer.write(v);
162162
byte[] bytes = out.toByteArray();
163163
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
164-
BigInteger ret = unpacker.readBigInteger();
164+
BigInteger ret = unpacker.read(BigInteger.class);
165165
assertEquals(v, ret);
166166
}
167167

@@ -178,7 +178,7 @@ public void testString(String v) throws Exception {
178178
packer.write(v);
179179
byte[] bytes = out.toByteArray();
180180
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
181-
String ret = unpacker.readString();
181+
String ret = unpacker.read(String.class);
182182
assertEquals(v, ret);
183183
}
184184

@@ -195,7 +195,7 @@ public void testByteArray(byte[] v) throws Exception {
195195
packer.write(v);
196196
byte[] bytes = out.toByteArray();
197197
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
198-
byte[] ret = unpacker.readByteArray();
198+
byte[] ret = unpacker.read(byte[].class);
199199
assertArrayEquals(v, ret);
200200
}
201201

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,7 @@ public void testBigInteger(BigInteger v) throws Exception {
181181
byte[] bytes = out.toByteArray();
182182
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
183183
Value value = unpacker.readValue();
184-
assertTrue(value.isIntegerValue());
185-
BigInteger ret = new Converter(value).readBigInteger();
184+
BigInteger ret = new Converter(value).read(BigInteger.class);
186185
assertEquals(v, ret);
187186
}
188187

@@ -200,8 +199,7 @@ public void testString(String v) throws Exception {
200199
byte[] bytes = out.toByteArray();
201200
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
202201
Value value = unpacker.readValue();
203-
assertTrue(value.isRawValue());
204-
String ret = new Converter(value).readString();
202+
String ret = new Converter(value).read(String.class);
205203
assertEquals(v, ret);
206204
}
207205

@@ -219,8 +217,7 @@ public void testByteArray(byte[] v) throws Exception {
219217
byte[] bytes = out.toByteArray();
220218
BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
221219
Value value = unpacker.readValue();
222-
assertTrue(value.isRawValue());
223-
byte[] ret = new Converter(value).readByteArray();
220+
byte[] ret = new Converter(value).read(byte[].class);
224221
assertArrayEquals(v, ret);
225222
}
226223

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public void testBigInteger(BigInteger v) throws Exception {
157157
packer.write(v);
158158
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
159159
Unpacker unpacker = msgpack.createUnpacker(in);
160-
BigInteger ret = unpacker.readBigInteger();
160+
BigInteger ret = unpacker.read(BigInteger.class);
161161
assertEquals(v, ret);
162162
}
163163

@@ -174,7 +174,7 @@ public void testString(String v) throws Exception {
174174
packer.write(v);
175175
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
176176
Unpacker unpacker = msgpack.createUnpacker(in);
177-
String ret = unpacker.readString();
177+
String ret = unpacker.read(String.class);
178178
assertEquals(v, ret);
179179
}
180180

@@ -191,7 +191,7 @@ public void testByteArray(byte[] v) throws Exception {
191191
packer.write(v);
192192
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
193193
Unpacker unpacker = msgpack.createUnpacker(in);
194-
byte[] ret = unpacker.readByteArray();
194+
byte[] ret = unpacker.read(byte[].class);
195195
assertArrayEquals(v, ret);
196196
}
197197

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void testByte(byte v) throws Exception {
5959
}
6060

6161
public void testByteArray() throws Exception {
62-
// TODO testByteArray(null); // #MN considering next version
62+
testByteArray(null);
6363
Random rand = new Random(System.currentTimeMillis());
6464
byte[] b0 = new byte[0];
6565
testByteArray(b0);
@@ -278,7 +278,7 @@ public void testNil() throws Exception {
278278
}
279279

280280
public void testString() throws Exception {
281-
// TODO testString(null); // #MN considering next version
281+
testString(null);
282282
testString("");
283283
testString("a");
284284
testString("ab");
@@ -324,7 +324,7 @@ public void testString(String v) throws Exception {
324324
}
325325

326326
public void testByteBuffer() throws Exception {
327-
// FIXME testByteBuffer(null); // #MN considering next version
327+
testByteBuffer(null);
328328
Random rand = new Random(System.currentTimeMillis());
329329
byte[] b0 = new byte[0];
330330
testByteBuffer(ByteBuffer.wrap(b0));
@@ -394,7 +394,7 @@ public <K, V> void testMap(Map<K, V> v, Class<K> keyElementClass, Class<V> value
394394
}
395395

396396
public void testBigInteger() throws Exception {
397-
// TODO testBigInteger(null); // #MN considering next version
397+
testBigInteger(null);
398398
testBigInteger(BigInteger.valueOf(0));
399399
testBigInteger(BigInteger.valueOf(-1));
400400
testBigInteger(BigInteger.valueOf(1));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public void testBigInteger(BigInteger v) throws Exception {
152152
packer.write(v);
153153
Value r = packer.getResult();
154154
Converter unpacker = new Converter(msgpack, r);
155-
BigInteger ret = unpacker.readBigInteger();
155+
BigInteger ret = unpacker.read(BigInteger.class);
156156
assertEquals(v, ret);
157157
}
158158

@@ -168,7 +168,7 @@ public void testString(String v) throws Exception {
168168
packer.write(v);
169169
Value r = packer.getResult();
170170
Converter unpacker = new Converter(msgpack, r);
171-
String ret = unpacker.readString();
171+
String ret = unpacker.read(String.class);
172172
assertEquals(v, ret);
173173
}
174174

@@ -184,7 +184,7 @@ public void testByteArray(byte[] v) throws Exception {
184184
packer.write(v);
185185
Value r = packer.getResult();
186186
Converter unpacker = new Converter(msgpack, r);
187-
byte[] ret = unpacker.readByteArray();
187+
byte[] ret = unpacker.read(byte[].class);
188188
assertArrayEquals(v, ret);
189189
}
190190

0 commit comments

Comments
 (0)