Skip to content

Commit b990a8c

Browse files
committed
update Java version
1 parent 68040cf commit b990a8c

File tree

4 files changed

+26
-25
lines changed

4 files changed

+26
-25
lines changed

src/main/java/com/upokecenter/cbor/CBORObject.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6565,7 +6565,10 @@ public void WriteTo(OutputStream stream, CBOREncodeOptions options) throws java.
65656565
break;
65666566
}
65676567
case CBORObjectTypeDouble: {
6568-
WriteFloatingPointBits(stream, this.AsDoubleBits(), 8,
6568+
WriteFloatingPointBits(
6569+
stream,
6570+
this.AsDoubleBits(),
6571+
8,
65696572
!options.getFloat64());
65706573
break;
65716574
}

src/test/java/com/upokecenter/test/CBORTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5217,7 +5217,10 @@ public static boolean TestTextStringStreamOne(String longString) {
52175217
{
52185218
Object objectTemp = longString;
52195219
Object objectTemp2 = CBORObject.DecodeFromBytes(cbor.EncodeToBytes(
5220-
new CBOREncodeOptions(false, true))).AsString();
5220+
new CBOREncodeOptions(
5221+
"useindeflengthstrings=false," +
5222+
" " + " " + " allowduplicatekeys=true")" +" +
5223+
"\u0020")).AsString();
52215224
Assert.assertEquals(objectTemp, objectTemp2);
52225225
}
52235226
TestCommon.AssertEqualsHashCode(cbor, cbor2);

src/test/java/com/upokecenter/test/DateTest.java

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ public static void DateConverterRoundTripOne(
2828
throw new NullPointerException("year");
2929
}
3030
String yearString = year.toString();
31-
String fieldsString = (yearString + "," + lesserFields[0] + "," +
32-
lesserFields[1] + "," + lesserFields[2] + "," + lesserFields[3] + ","+
33-
lesserFields[4] + "," + lesserFields[5] + "," + lesserFields[6]);
31+
String fieldsString = yearString + "," + lesserFields[0] + "," +
32+
lesserFields[1] + "," + lesserFields[2] + "," + lesserFields[3] + "," +
33+
lesserFields[4] + "," + lesserFields[5] + "," + lesserFields[6];
3434
try {
3535
if (dtc == null) {
3636
throw new NullPointerException("dtc");
@@ -118,38 +118,32 @@ public void DateConverterRoundTrip() {
118118
CBORDateConverter.TaggedNumber,
119119
CBORDateConverter.UntaggedNumber,
120120
};
121+
int[] lesserFields;
121122
for (int i = 0; i < 30000; ++i) {
122123
EInteger year = RandomExpandedYear(rg);
123-
int[] lesserFields = RandomLesserFields(rg, year);
124+
lesserFields = RandomLesserFields(rg, year);
124125
// Don't check fractional seconds because conversion is lossy
125126
lesserFields[5] = 0;
126127
for (int j = 0; j < dtcs.length; ++j) {
127128
DateConverterRoundTripOne(dtcs[j], year, lesserFields);
128129
}
129130
}
131+
lesserFields = new int[] {
132+
2,
133+
11,
134+
7,
135+
59,
136+
3,
137+
0,
138+
0,
139+
};
130140
DateConverterRoundTripOne(
131141
CBORDateConverter.TaggedString,
132142
9328,
133-
new int[] {
134-
2,
135-
11,
136-
7,
137-
59,
138-
3,
139-
0,
140-
0,
141-
});
143+
lesserFields);
142144
DateConverterRoundTripOne(
143145
CBORDateConverter.UntaggedNumber,
144146
9328,
145-
new int[] {
146-
2,
147-
11,
148-
7,
149-
59,
150-
3,
151-
0,
152-
0,
153-
});
147+
lesserFields);
154148
}
155149
}

src/test/java/com/upokecenter/test/ToObjectTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1580,7 +1580,8 @@ public void TestCBORTypeMapper() {
15801580
Assert.assertEquals("aa", cpx.getAa());
15811581
Assert.assertEquals("bb", cpx.getBb());
15821582
Assert.assertEquals("cc", cpx.getCc());
1583-
cbor = CBORObject.FromObject(new CPOD3[] { cp, cp2}, tm);
1583+
CPOD3[] cpodArray = new CPOD3[] { cp, cp2 };
1584+
cbor = CBORObject.FromObject(cpodArray, tm);
15841585
Assert.assertEquals(CBORType.Array, cbor.getType());
15851586
Assert.assertEquals(2, cbor.size());
15861587
cbor2 = cbor.get(0);

0 commit comments

Comments
 (0)