Skip to content

Commit 94c0611

Browse files
author
Alexey Semenyuk
committed
8370122: jpackage test lib improvements
Reviewed-by: almatvee
1 parent ed153ee commit 94c0611

File tree

24 files changed

+2285
-96
lines changed

24 files changed

+2285
-96
lines changed
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
package jdk.jpackage.internal.util;
26+
27+
import java.util.Objects;
28+
29+
/**
30+
* Object wrapper implementing {@link Object#equals(Object)} such that it
31+
* returns {@code true} only when the argument is another instance of this class
32+
* wrapping the same object.
33+
* <p>
34+
* The class guarantees that {@link Object#equals(Object)} and
35+
* {@link Object#hashCode()} methods of the wrapped object will never be called
36+
* inside of the class methods.
37+
*
38+
* @param <T> the type of the wrapped value
39+
*/
40+
public final class IdentityWrapper<T> {
41+
42+
public IdentityWrapper(T value) {
43+
this.value = Objects.requireNonNull(value);
44+
}
45+
46+
public T value() {
47+
return value;
48+
}
49+
50+
@Override
51+
public int hashCode() {
52+
return System.identityHashCode(value);
53+
}
54+
55+
@Override
56+
public boolean equals(Object obj) {
57+
if (this == obj) {
58+
return true;
59+
}
60+
if ((obj == null) || (getClass() != obj.getClass())) {
61+
return false;
62+
}
63+
var other = (IdentityWrapper<?>) obj;
64+
return value == other.value;
65+
}
66+
67+
@Override
68+
public String toString() {
69+
return String.format("Identity[%s]", value);
70+
}
71+
72+
private final T value;
73+
}
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
package jdk.jpackage.test;
24+
25+
import static org.junit.jupiter.api.Assertions.assertEquals;
26+
import static org.junit.jupiter.api.Assertions.assertThrows;
27+
28+
import java.util.Map;
29+
import org.junit.jupiter.api.Test;
30+
31+
public class JUnitUtilsTest {
32+
33+
@Test
34+
public void test_assertArrayEquals() {
35+
JUnitUtils.assertArrayEquals(new int[] {1, 2, 3}, new int[] {1, 2, 3});
36+
JUnitUtils.assertArrayEquals(new long[] {1, 2, 3}, new long[] {1, 2, 3});
37+
JUnitUtils.assertArrayEquals(new boolean[] {true, true}, new boolean[] {true, true});
38+
}
39+
40+
@Test
41+
public void test_assertArrayEquals_negative() {
42+
assertThrows(AssertionError.class, () -> {
43+
JUnitUtils.assertArrayEquals(new int[] {1, 2, 3}, new int[] {2, 3});
44+
});
45+
}
46+
47+
@Test
48+
public void test_exceptionAsPropertyMapWithMessageWithoutCause() {
49+
50+
var ex = new Exception("foo");
51+
52+
var map = JUnitUtils.exceptionAsPropertyMap(ex);
53+
54+
assertEquals(Map.of("getClass", Exception.class.getName(), "getMessage", "foo"), map);
55+
}
56+
}

0 commit comments

Comments
 (0)