Skip to content

Commit b2811a0

Browse files
wangweijwangweij
committedDec 19, 2024
8340493: Fix some Asserts failure messages
Reviewed-by: valeriep, djelinski
1 parent 4d77dba commit b2811a0

File tree

8 files changed

+103
-70
lines changed

8 files changed

+103
-70
lines changed
 

‎test/jdk/com/sun/crypto/provider/KDF/HKDFBasicFunctionsTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ public static void main(String[] args) throws Exception {
5252
var extractAndExpand = HKDFParameterSpec.ofExtract().addIKM(ikm).addSalt(salt).thenExpand(info, len);
5353
var okm2 = kdf.deriveKey("OKM", extractAndExpand);
5454

55-
Asserts.assertEqualsByteArray(prk.getEncoded(), expectedPrk,
55+
Asserts.assertEqualsByteArray(expectedPrk, prk.getEncoded(),
5656
"the PRK must match the expected value");
5757

58-
Asserts.assertEqualsByteArray(okm1.getEncoded(), expectedOkm,
58+
Asserts.assertEqualsByteArray(expectedOkm, okm1.getEncoded(),
5959
"the OKM must match the expected value "
6060
+ "(expand)");
6161

62-
Asserts.assertEqualsByteArray(okm2.getEncoded(), expectedOkm,
62+
Asserts.assertEqualsByteArray(expectedOkm, okm2.getEncoded(),
6363
"the OKM must match the expected value "
6464
+ "(extract expand)");
6565

‎test/jdk/sun/security/ec/ECDHPrimitive.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private static void runTest(ECParameterSpec ecParams,
118118
byte[] secret = ka.generateSecret();
119119

120120
byte[] expectedSecret = values.get("ZIUT");
121-
Asserts.assertEqualsByteArray(secret, expectedSecret, "Incorrect secret value");
121+
Asserts.assertEqualsByteArray(expectedSecret, secret, "Incorrect secret value");
122122
int testIndex = values.get("COUNT")[0];
123123
System.out.println("Test " + testIndex + " passed.");
124124
}
@@ -141,4 +141,4 @@ private static void addKeyValue(String line, Map<String, byte[]> values) {
141141
private static String lookupName(String name) {
142142
return NAME_MAP.get(name);
143143
}
144-
}
144+
}

‎test/jdk/sun/security/provider/acvp/ML_DSA_Test.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ static void keyGenTest(JSONValue kat, Provider p) throws Exception {
7676
var kp = g.generateKeyPair();
7777
var pk = f.getKeySpec(kp.getPublic(), EncodedKeySpec.class).getEncoded();
7878
var sk = f.getKeySpec(kp.getPrivate(), EncodedKeySpec.class).getEncoded();
79-
Asserts.assertEqualsByteArray(pk, toByteArray(c.get("pk").asString()));
80-
Asserts.assertEqualsByteArray(sk, toByteArray(c.get("sk").asString()));
79+
Asserts.assertEqualsByteArray(toByteArray(c.get("pk").asString()), pk);
80+
Asserts.assertEqualsByteArray(toByteArray(c.get("sk").asString()), sk);
8181
}
8282
System.out.println();
8383
}
@@ -104,7 +104,7 @@ static void sigGenTest(JSONValue kat, Provider p) throws Exception {
104104
s.update(toByteArray(c.get("message").asString()));
105105
var sig = s.sign();
106106
Asserts.assertEqualsByteArray(
107-
sig, toByteArray(c.get("signature").asString()));
107+
toByteArray(c.get("signature").asString()), sig);
108108
}
109109
System.out.println();
110110
}

‎test/jdk/sun/security/provider/acvp/ML_KEM_Test.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ static void keyGenTest(JSONValue kat, Provider p) throws Exception {
7070
var kp = g.generateKeyPair();
7171
var pk = f.getKeySpec(kp.getPublic(), EncodedKeySpec.class).getEncoded();
7272
var sk = f.getKeySpec(kp.getPrivate(), EncodedKeySpec.class).getEncoded();
73-
Asserts.assertEqualsByteArray(pk, toByteArray(c.get("ek").asString()));
74-
Asserts.assertEqualsByteArray(sk, toByteArray(c.get("dk").asString()));
73+
Asserts.assertEqualsByteArray(toByteArray(c.get("ek").asString()), pk);
74+
Asserts.assertEqualsByteArray(toByteArray(c.get("dk").asString()), sk);
7575
}
7676
System.out.println();
7777
}
@@ -97,9 +97,9 @@ static void encapDecapTest(JSONValue kat, Provider p) throws Exception {
9797
ek, new FixedSecureRandom(toByteArray(c.get("m").asString())));
9898
var enc = e.encapsulate();
9999
Asserts.assertEqualsByteArray(
100-
enc.encapsulation(), toByteArray(c.get("c").asString()));
100+
toByteArray(c.get("c").asString()), enc.encapsulation());
101101
Asserts.assertEqualsByteArray(
102-
enc.key().getEncoded(), toByteArray(c.get("k").asString()));
102+
toByteArray(c.get("k").asString()), enc.key().getEncoded());
103103
}
104104
System.out.println();
105105
} else if (function.equals("decapsulation")) {
@@ -112,7 +112,7 @@ static void encapDecapTest(JSONValue kat, Provider p) throws Exception {
112112
System.out.print(c.get("tcId").asString() + " ");
113113
var d = g.newDecapsulator(dk);
114114
var k = d.decapsulate(toByteArray(c.get("c").asString()));
115-
Asserts.assertEqualsByteArray(k.getEncoded(), toByteArray(c.get("k").asString()));
115+
Asserts.assertEqualsByteArray(toByteArray(c.get("k").asString()), k.getEncoded());
116116
}
117117
System.out.println();
118118
}

‎test/jdk/sun/security/provider/acvp/SHA_Test.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public static void run(JSONValue kat, Provider provider) throws Exception {
4646
var msg = toByteArray(c.get("msg").asString());
4747
var len = Integer.parseInt(c.get("len").asString());
4848
if (msg.length * 8 == len) {
49-
Asserts.assertEqualsByteArray(md.digest(msg),
50-
toByteArray(c.get("md").asString()));
49+
Asserts.assertEqualsByteArray(
50+
toByteArray(c.get("md").asString()), md.digest(msg));
5151
} else {
5252
System.out.print("bits ");
5353
}
@@ -70,8 +70,8 @@ public static void run(JSONValue kat, Provider provider) throws Exception {
7070
}
7171
MD = md.digest(MD);
7272
}
73-
Asserts.assertEqualsByteArray(MD,
74-
toByteArray(r.get("md").asString()));
73+
Asserts.assertEqualsByteArray(
74+
toByteArray(r.get("md").asString()), MD);
7575
SEED = MD;
7676
} else {
7777
var A = SEED;
@@ -88,8 +88,8 @@ public static void run(JSONValue kat, Provider provider) throws Exception {
8888
B = C;
8989
C = MD;
9090
}
91-
Asserts.assertEqualsByteArray(MD,
92-
toByteArray(r.get("md").asString()));
91+
Asserts.assertEqualsByteArray(
92+
toByteArray(r.get("md").asString()), MD);
9393
SEED = MD;
9494
}
9595
}
@@ -110,8 +110,8 @@ public static void run(JSONValue kat, Provider provider) throws Exception {
110110
md.update(ct);
111111
cc += clen;
112112
}
113-
Asserts.assertEqualsByteArray(md.digest(),
114-
toByteArray(c.get("md").asString()));
113+
Asserts.assertEqualsByteArray(
114+
toByteArray(c.get("md").asString()), md.digest());
115115
}
116116
}
117117
default -> throw new UnsupportedOperationException(

‎test/lib-test/jdk/test/lib/AssertsTest.java

+38-3
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525

2626
import java.lang.SuppressWarnings;
2727
import java.util.Arrays;
28-
import java.util.HexFormat;
2928

3029
import static jdk.test.lib.Asserts.*;
3130

3231
/*
3332
* @test
33+
* @bug 8340493
3434
* @library /test/lib
3535
* @summary Tests the different assertions in the Assert class
3636
*/
@@ -49,6 +49,29 @@ public String toString() {
4949
}
5050
}
5151

52+
// equals() always returns true
53+
public static class Bar {
54+
private final int i;
55+
public Bar(int i) {
56+
this.i = i;
57+
}
58+
59+
@Override
60+
public int hashCode() {
61+
return 0;
62+
}
63+
64+
@Override
65+
public boolean equals(Object obj) {
66+
return true;
67+
}
68+
69+
@Override
70+
public String toString() {
71+
return Integer.toString(i);
72+
}
73+
}
74+
5275
public static void main(String[] args) throws Exception {
5376
testLessThan();
5477
testLessThanOrEqual();
@@ -62,6 +85,19 @@ public static void main(String[] args) throws Exception {
6285
testTrue();
6386
testFalse();
6487
testFail();
88+
89+
testErrorMessages();
90+
}
91+
92+
public static void testErrorMessages() throws Exception {
93+
try {
94+
Asserts.assertNotEquals(new Bar(1), new Bar(2));
95+
throw new Exception("Should fail");
96+
} catch (RuntimeException e) {
97+
if (!e.getMessage().contains("was 2")) {
98+
throw new Exception("msg is " + e.getMessage());
99+
}
100+
}
65101
}
66102

67103
private static void testLessThan() throws Exception {
@@ -216,8 +252,7 @@ private static <T extends Comparable<T>> void expectFail(Assertion assertion, T
216252
" to throw a RuntimeException");
217253
}
218254

219-
private static void expectPass(Assertion assertion, byte[] b1, byte[] b2)
220-
throws Exception {
255+
private static void expectPass(Assertion assertion, byte[] b1, byte[] b2) {
221256
if (assertion == Assertion.EQBA) {
222257
String msg = "Expected " + Assertion.asString("assertEqualsByteArray",
223258
Arrays.toString(b1), Arrays.toString(b2)) + " to pass";

‎test/lib-test/jdk/test/lib/security/FixedSecureRandomTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ public static void main(String[] args) throws Exception {
3535
new byte[] {4, 5, 6});
3636
var b1 = new byte[2];
3737
fsr.nextBytes(b1);
38-
Asserts.assertEqualsByteArray(b1, new byte[] {1, 2});
38+
Asserts.assertEqualsByteArray(new byte[] {1, 2}, b1);
3939
Asserts.assertTrue(fsr.hasRemaining());
4040
fsr.nextBytes(b1);
41-
Asserts.assertEqualsByteArray(b1, new byte[] {3, 4});
41+
Asserts.assertEqualsByteArray(new byte[] {3, 4}, b1);
4242
Asserts.assertTrue(fsr.hasRemaining());
4343
fsr.nextBytes(b1);
44-
Asserts.assertEqualsByteArray(b1, new byte[] {5, 6});
44+
Asserts.assertEqualsByteArray(new byte[] {5, 6}, b1);
4545
Asserts.assertFalse(fsr.hasRemaining());
4646
Utils.runAndCheckException(() -> fsr.nextBytes(b1),
4747
IllegalStateException.class);

‎test/lib/jdk/test/lib/Asserts.java

+41-43
Original file line numberDiff line numberDiff line change
@@ -234,59 +234,58 @@ public static void assertSame(Object lhs, Object rhs, String msg) {
234234
}
235235

236236
/**
237-
* Asserts that {@code lhs} is the same byte array as {@code rhs}.
237+
* Asserts that {@code actual} has the same content as {@code expected}.
238238
*
239-
* @param lhs The left hand side of the comparison.
240-
* @param rhs The right hand side of the comparison.
239+
* @param expected The expected value
240+
* @param actual The actual value
241241
* @throws RuntimeException if the assertion is not true.
242242
* @see #assertEqualsByteArray(byte[], byte[], String)
243243
*/
244-
public static void assertEqualsByteArray(byte[] lhs, byte[] rhs) {
245-
assertEqualsByteArray(lhs, rhs, null);
244+
public static void assertEqualsByteArray(byte[] expected, byte[] actual) {
245+
assertEqualsByteArray(expected, actual, null);
246246
}
247247

248248
/**
249-
* Asserts that {@code lhs} is not the same byte array as {@code rhs}.
249+
* Asserts that {@code actual} does not have the same content as {@code unexpected}.
250250
*
251-
* @param lhs The left hand side of the comparison.
252-
* @param rhs The right hand side of the comparison.
251+
* @param unexpected The unexpected value
252+
* @param actual The actual value
253253
* @throws RuntimeException if the assertion is not true.
254254
* @see #assertNotEqualsByteArray(byte[], byte[], String)
255255
*/
256-
public static void assertNotEqualsByteArray(byte[] lhs, byte[] rhs) {
257-
assertNotEqualsByteArray(lhs, rhs, null);
256+
public static void assertNotEqualsByteArray(byte[] unexpected, byte[] actual) {
257+
assertNotEqualsByteArray(unexpected, actual, null);
258258
}
259259

260260
/**
261-
* Asserts that {@code lhs} is the same byte array as {@code rhs}.
261+
* Asserts that {@code actual} is the same byte array as {@code expected}.
262262
*
263-
* @param lhs The left hand side of the comparison.
264-
* @param rhs The right hand side of the comparison.
263+
* @param expected The expected value
264+
* @param actual The actual value
265265
* @param msg A description of the assumption; {@code null} for a default message.
266266
* @throws RuntimeException if the assertion is not true.
267267
*/
268-
public static void assertEqualsByteArray(byte[] lhs, byte[] rhs, String msg) {
269-
if (!Arrays.equals(lhs, rhs)) {
268+
public static void assertEqualsByteArray(byte[] expected, byte[] actual, String msg) {
269+
if (!Arrays.equals(expected, actual)) {
270270
msg = Objects.toString(msg, "assertEqualsByteArray")
271-
+ ": expected " + HexFormat.of().formatHex(lhs)
272-
+ " to equal " + HexFormat.of().formatHex(rhs);
271+
+ ": expected " + HexFormat.of().formatHex(expected)
272+
+ " but was " + HexFormat.of().formatHex(actual);
273273
fail(msg);
274274
}
275275
}
276276

277277
/**
278-
* Asserts that {@code lhs} is not the same byte array as {@code rhs}.
278+
* Asserts that {@code actual} is not the same byte array as {@code unexpected}.
279279
*
280-
* @param lhs The left hand side of the comparison.
281-
* @param rhs The right hand side of the comparison.
280+
* @param unexpected The unexpected value
281+
* @param actual The actual value
282282
* @param msg A description of the assumption; {@code null} for a default message.
283283
* @throws RuntimeException if the assertion is not true.
284284
*/
285-
public static void assertNotEqualsByteArray(byte[] lhs, byte[] rhs, String msg) {
286-
if (Arrays.equals(lhs, rhs)) {
285+
public static void assertNotEqualsByteArray(byte[] unexpected, byte[] actual, String msg) {
286+
if (Arrays.equals(unexpected, actual)) {
287287
msg = Objects.toString(msg, "assertNotEqualsByteArray")
288-
+ ": expected " + HexFormat.of().formatHex(lhs)
289-
+ " to not equal " + HexFormat.of().formatHex(rhs);
288+
+ ": expected not equals but was " + HexFormat.of().formatHex(actual);
290289
fail(msg);
291290
}
292291
}
@@ -404,50 +403,49 @@ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs, Str
404403
/**
405404
* Shorthand for {@link #assertNotEquals(Object, Object)}.
406405
*
407-
* @param lhs The left hand side of the comparison.
408-
* @param rhs The right hand side of the comparison.
406+
* @param unexpected The unexpected value
407+
* @param actual The actual value
409408
* @see #assertNotEquals(Object, Object)
410409
*/
411-
public static void assertNE(Object lhs, Object rhs) {
412-
assertNotEquals(lhs, rhs);
410+
public static void assertNE(Object unexpected, Object actual) {
411+
assertNotEquals(unexpected, actual);
413412
}
414413

415414
/**
416415
* Shorthand for {@link #assertNotEquals(Object, Object, String)}.
417416
*
418-
* @param lhs The left hand side of the comparison.
419-
* @param rhs The right hand side of the comparison.
417+
* @param unexpected The unexpected value
418+
* @param actual The actual value
420419
* @param msg A description of the assumption; {@code null} for a default message.
421420
* @see #assertNotEquals(Object, Object, String)
422421
*/
423-
public static void assertNE(Object lhs, Object rhs, String msg) {
424-
assertNotEquals(lhs, rhs, msg);
422+
public static void assertNE(Object unexpected, Object actual, String msg) {
423+
assertNotEquals(unexpected, actual, msg);
425424
}
426425

427426
/**
428427
* Calls {@link #assertNotEquals(Object, Object, String)} with a default message.
429428
*
430-
* @param lhs The left hand side of the comparison.
431-
* @param rhs The right hand side of the comparison.
429+
* @param unexpected The unexpected value
430+
* @param actual The actual value
432431
* @see #assertNotEquals(Object, Object, String)
433432
*/
434-
public static void assertNotEquals(Object lhs, Object rhs) {
435-
assertNotEquals(lhs, rhs, null);
433+
public static void assertNotEquals(Object unexpected, Object actual) {
434+
assertNotEquals(unexpected, actual, null);
436435
}
437436

438437
/**
439-
* Asserts that {@code lhs} is not equal to {@code rhs}.
438+
* Asserts that {@code actual} is not equal to {@code unexpected}.
440439
*
441-
* @param lhs The left hand side of the comparison.
442-
* @param rhs The right hand side of the comparison.
440+
* @param unexpected The unexpected value
441+
* @param actual The actual value
443442
* @param msg A description of the assumption; {@code null} for a default message.
444443
* @throws RuntimeException if the assertion is not true.
445444
*/
446-
public static void assertNotEquals(Object lhs, Object rhs, String msg) {
447-
if ((lhs == rhs) || (lhs != null && lhs.equals(rhs))) {
445+
public static void assertNotEquals(Object unexpected, Object actual, String msg) {
446+
if ((unexpected == actual) || (unexpected != null && unexpected.equals(actual))) {
448447
msg = Objects.toString(msg, "assertNotEquals")
449-
+ ": expected " + Objects.toString(lhs)
450-
+ " to not equal " + Objects.toString(rhs);
448+
+ ": expected not equals but was " + Objects.toString(actual);
451449
fail(msg);
452450
}
453451
}

0 commit comments

Comments
 (0)
Please sign in to comment.