Skip to content

Commit b68bfab

Browse files
peteroupcpeteroupc
committed
update Java version
1 parent acbae8e commit b68bfab

4 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎src/test/java/com/upokecenter/test/CBORObjectTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8186,7 +8186,7 @@ public static void TestWrite3() {
81868186
}
81878187

81888188
for (int i = 0; i < 50; ++i) {
8189-
EFloat ef = RandomObjects.RandomEFloat(fr);
8189+
EFloat ef = RandomNumerics.RandomEFloat(fr);
81908190
if (!ef.IsNaN()) {
81918191
CBORObject cborTemp1 = ToObjectTest.TestToFromObjectRoundTrip(ef);
81928192
CBORObject cborTemp2 = ToObjectTest.TestToFromObjectRoundTrip(ef);
@@ -8221,8 +8221,8 @@ public static void TestWrite3() {
82218221
}
82228222

82238223
ef = EFloat.Create(
8224-
RandomObjects.RandomEInteger(fr),
8225-
RandomObjects.RandomEInteger(fr));
8224+
RandomNumerics.RandomEInteger(fr),
8225+
RandomNumerics.RandomEInteger(fr));
82268226
{
82278227
CBORObject cborTemp1 = ToObjectTest.TestToFromObjectRoundTrip(ef);
82288228
CBORObject cborTemp2 = ToObjectTest.TestToFromObjectRoundTrip(ef);
@@ -8262,7 +8262,7 @@ public static void TestWrite3() {
82628262
}
82638263
}
82648264
for (int i = 0; i < 50; ++i) {
8265-
EDecimal ed = RandomObjects.RandomEDecimal(fr);
8265+
EDecimal ed = RandomNumerics.RandomEDecimal(fr);
82668266
if (!ed.IsNaN()) {
82678267
CBORObject cborTemp1 = ToObjectTest.TestToFromObjectRoundTrip(ed);
82688268
CBORObject cborTemp2 = ToObjectTest.TestToFromObjectRoundTrip(ed);
@@ -8305,8 +8305,8 @@ public static void TestWrite3() {
83058305
}
83068306

83078307
ed = EDecimal.Create(
8308-
RandomObjects.RandomEInteger(fr),
8309-
RandomObjects.RandomEInteger(fr));
8308+
RandomNumerics.RandomEInteger(fr),
8309+
RandomNumerics.RandomEInteger(fr));
83108310
{
83118311
CBORObject cborTemp1 = ToObjectTest.TestToFromObjectRoundTrip(ed);
83128312
CBORObject cborTemp2 = ToObjectTest.TestToFromObjectRoundTrip(ed);
@@ -8453,7 +8453,7 @@ public void TestWrite2() {
84538453
TestWriteObj(er, null);
84548454
}
84558455
do {
8456-
er = RandomObjects.RandomERational(fr);
8456+
er = RandomNumerics.RandomERational(fr);
84578457
} while (er.isNegative() && er.isZero());
84588458
{
84598459
CBORObject cborTemp1 = ToObjectTest.TestToFromObjectRoundTrip(er);
@@ -10959,7 +10959,7 @@ public void TestFromJsonStringEDecimalSpec() {
1095910959
RandomGenerator rg = new RandomGenerator();
1096010960
for (int i = 0; i < 2000; ++i) {
1096110961
String[] decstring = new String[1];
10962-
EDecimal ed = RandomObjects.RandomEDecimal(rg, decstring);
10962+
EDecimal ed = RandomNumerics.RandomEDecimal(rg, decstring);
1096310963
if (decstring[0] == null) {
1096410964
Assert.fail();
1096510965
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public void TestArray() {
346346
public void TestEInteger() {
347347
RandomGenerator r = new RandomGenerator();
348348
for (int i = 0; i < 500; ++i) {
349-
EInteger bi = RandomObjects.RandomEInteger(r);
349+
EInteger bi = RandomNumerics.RandomEInteger(r);
350350
CBORTestCommon.AssertJSONSer(
351351
ToObjectTest.TestToFromObjectRoundTrip(bi),
352352
bi.toString());
@@ -1510,10 +1510,10 @@ public void TestDivide() {
15101510
RandomGenerator r = new RandomGenerator();
15111511
for (int i = 0; i < 3000; ++i) {
15121512
CBORObject o1 = ToObjectTest.TestToFromObjectRoundTrip(
1513-
RandomObjects.RandomEInteger(r));
1513+
RandomNumerics.RandomEInteger(r));
15141514

15151515
CBORObject o2 = ToObjectTest.TestToFromObjectRoundTrip(
1516-
RandomObjects.RandomEInteger(r));
1516+
RandomNumerics.RandomEInteger(r));
15171517

15181518
if (o2.AsNumber().IsZero()) {
15191519
continue;

‎src/test/java/com/upokecenter/test/CBORTestCommon.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ private CBORTestCommon() {
2929

3030
private static EFloat RandomEFloatLowExponent(IRandomGenExtended rand) {
3131
while (true) {
32-
EFloat ef = RandomObjects.RandomEFloat(rand);
32+
EFloat ef = RandomNumerics.RandomEFloat(rand);
3333
if (
3434
ef.getExponent().compareTo(-20000) >= 0 &&
3535
ef.getExponent().compareTo(20000) <= 0) {
@@ -40,7 +40,7 @@ private static EFloat RandomEFloatLowExponent(IRandomGenExtended rand) {
4040

4141
private static EDecimal RandomEDecimalLowExponent(IRandomGenExtended rand) {
4242
while (true) {
43-
EDecimal ef = RandomObjects.RandomEDecimal(rand);
43+
EDecimal ef = RandomNumerics.RandomEDecimal(rand);
4444
if (
4545
ef.getExponent().compareTo(-20000) >= 0 &&
4646
ef.getExponent().compareTo(20000) <= 0) {
@@ -69,14 +69,14 @@ public static CBORObject RandomNumber(IRandomGenExtended rand, boolean
6969
return CBORObject.FromObject(o);
7070
case 2:
7171
return CBORObject.FromEInteger(
72-
RandomObjects.RandomEInteger(rand));
72+
RandomNumerics.RandomEInteger(rand));
7373
case 3:
7474
o = lowExponent ? RandomEFloatLowExponent(rand) :
75-
RandomObjects.RandomEFloat(rand);
75+
RandomNumerics.RandomEFloat(rand);
7676
return CBORObject.FromObject(o);
7777
case 4:
7878
o = lowExponent ? RandomEDecimalLowExponent(rand) :
79-
RandomObjects.RandomEDecimal(rand);
79+
RandomNumerics.RandomEDecimal(rand);
8080
return CBORObject.FromObject(o);
8181
case 5:
8282
o = RandomObjects.RandomInt64(rand);
@@ -101,18 +101,18 @@ public static CBORObject RandomNumberOrRational(IRandomGenExtended rand) {
101101
return CBORObject.FromObject(o);
102102
case 2:
103103
return CBORObject.FromEInteger(
104-
RandomObjects.RandomEInteger(rand));
104+
RandomNumerics.RandomEInteger(rand));
105105
case 3:
106106
return CBORObject.FromEFloat(
107-
RandomObjects.RandomEFloat(rand));
107+
RandomNumerics.RandomEFloat(rand));
108108
case 4:
109-
o = RandomObjects.RandomEDecimal(rand);
109+
o = RandomNumerics.RandomEDecimal(rand);
110110
return CBORObject.FromObject(o);
111111
case 5:
112112
o = RandomObjects.RandomInt64(rand);
113113
return CBORObject.FromObject(o);
114114
case 6:
115-
o = RandomObjects.RandomERational(rand);
115+
o = RandomNumerics.RandomERational(rand);
116116
return CBORObject.FromObject(o);
117117
default:
118118
throw new IllegalStateException();
@@ -190,15 +190,15 @@ public static CBORObject RandomCBORTaggedObject(
190190
cbor = CBORObject.FromObject(o);
191191
} else if (tag == 4 || tag == 5) {
192192
cbor = CBORObject.NewArray();
193-
Object o = RandomObjects.RandomSmallIntegral(rand);
193+
Object o = RandomNumerics.RandomSmallIntegral(rand);
194194
cbor.Add(o);
195-
o = RandomObjects.RandomEInteger(rand);
195+
o = RandomNumerics.RandomEInteger(rand);
196196
cbor.Add(o);
197197
} else if (tag == 30) {
198198
cbor = CBORObject.NewArray();
199-
Object o = RandomObjects.RandomSmallIntegral(rand);
199+
Object o = RandomNumerics.RandomSmallIntegral(rand);
200200
cbor.Add(o);
201-
o = RandomObjects.RandomEInteger(rand);
201+
o = RandomNumerics.RandomEInteger(rand);
202202
cbor.Add(o);
203203
} else {
204204
cbor = RandomCBORObject(rand, depth + 1);

‎src/test/java/com/upokecenter/test/RandomObjects.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public static String RandomSmallIntegralString(IRandomGenExtended r) {
280280
sb.append((char)('1' + r.GetInt32(9)));
281281
--count;
282282
AppendRandomDecimals(r, sb, count);
283-
return EInteger.FromString(sb.toString());
283+
return sb.toString();
284284
}
285285

286286
public static String RandomDecimalString(IRandomGenExtended r) {

0 commit comments

Comments
 (0)