Skip to content

7903846: apidiff: test issues on Windows #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

7903846: apidiff: test issues on Windows #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
616a1d7
CODETOOLS-7903846: apidiff: test issues on Windows
jonathan-gibbons Sep 26, 2024
c146376
review feedback: proactively remove edit to JUnitTests.gmk to avoid a…
jonathan-gibbons Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions test/junit/apitest/GetSerialVersionUIDTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -91,7 +91,7 @@ public static Stream<Arguments> provideLocalClasses() {
@MethodSource("provideLocalClasses")
public void testLocal(String interfaces, String members) throws Exception {
log.printf("interfaces: %s; members: %s%n", interfaces, members);
Path base = getScratchDir().resolve(getDirectory(interfaces, members));
Path base = getScratchDir(getSubdirectoryName(interfaces, members));
log.println(base);

Path src = Files.createDirectories(base.resolve("src"));
Expand Down Expand Up @@ -154,16 +154,18 @@ public void testSystemClass(String name) throws Exception {
Assertions.assertEquals(platformSerialVersionUID, classSerialVersionUID, "serialVersionUID from class");
}

Path getDirectory(String interfaces, String members) {
String getSubdirectoryName(String interfaces, String members) {
String i = Stream.of(interfaces.split("\\s+"))
.map(s -> s.substring(s.lastIndexOf(".") + 1))
.collect(Collectors.joining("-"));
String m = Stream.of(members.split(";\\s*"))
.map(s -> s.replaceAll("=.*", ""))
.map(s -> s.substring(s.lastIndexOf(" ") + 1))
.collect(Collectors.joining("-"));
// allow for all kinds of members: not just fields
String m = members.replaceAll("[^A-Za-z0-9]+", "-");
int MAX_MEMBER_LENGTH = 32;
if (m.length() > MAX_MEMBER_LENGTH) {
m = m.substring(0, MAX_MEMBER_LENGTH);
}
String sep = i.isEmpty() || m.isEmpty() ? "" : "-";
return Path.of(i + sep + m);
return i + sep + m;
}

long getPlatformSerialVersionUID(Path classes, String name) throws Exception {
Expand Down