From 9269bfdb12221e5b8590b1a6a16e5fb41f4bc6d4 Mon Sep 17 00:00:00 2001 From: Petr Aubrecht Date: Thu, 24 Mar 2022 21:16:22 +0100 Subject: [PATCH 1/2] fix filename used in ConcurrencySigTest --- .../tck/concurrent/spec/signature/ConcurrencySigTest.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/ConcurrencySigTest.java b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/ConcurrencySigTest.java index c440a01d..9ff4222a 100644 --- a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/ConcurrencySigTest.java +++ b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/ConcurrencySigTest.java @@ -21,9 +21,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.URI; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -140,7 +137,7 @@ protected File writeStreamToSigFile(InputStream inputStream, String packageVersi String tmpdir = System.getProperty("java.io.tmpdir"); try { File sigfile = new File( - tmpdir + File.separator + SignatureTests.SIG_FILE_NAME + SIG_FILE_VER_SEP + packageVersion); + tmpdir + File.separator + SignatureTests.SIG_FILE_NAME); if (sigfile.exists()) { sigfile.delete(); log.info("Existing signature file deleted to create new one"); @@ -210,8 +207,7 @@ public void signatureTest() throws Fault { log.info("Package version from mapfile :" + packageVersion); InputStream inStreamSigFile = ConcurrencySigTest.class.getClassLoader() - .getResourceAsStream("ee/jakarta/tck/concurrent/spec/signature/" + SignatureTests.SIG_FILE_NAME - + SIG_FILE_VER_SEP + packageVersion); + .getResourceAsStream("ee/jakarta/tck/concurrent/spec/signature/" + SignatureTests.SIG_FILE_NAME); File sigFile = writeStreamToSigFile(inStreamSigFile, packageVersion); log.info("signature File location is :" + sigFile.getCanonicalPath()); signatureRepositoryDir = System.getProperty("java.io.tmpdir"); From 52aea2a6c23945b8d3a108c152a2a98bf0f225b1 Mon Sep 17 00:00:00 2001 From: Petr Aubrecht Date: Fri, 25 Mar 2022 10:43:18 +0100 Subject: [PATCH 2/2] remove version number from signature file name --- .../tck/concurrent/spec/signature/ConcurrencySigTest.java | 8 ++------ .../tck/concurrent/spec/signature/SignatureTests.java | 2 +- ...urrent.sig_3.0.0 => jakarta.enterprise.concurrent.sig} | 0 3 files changed, 3 insertions(+), 7 deletions(-) rename tck/src/main/resources/ee/jakarta/tck/concurrent/spec/signature/{jakarta.enterprise.concurrent.sig_3.0.0 => jakarta.enterprise.concurrent.sig} (100%) diff --git a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/ConcurrencySigTest.java b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/ConcurrencySigTest.java index 9ff4222a..c0bcd233 100644 --- a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/ConcurrencySigTest.java +++ b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/ConcurrencySigTest.java @@ -37,8 +37,6 @@ public class ConcurrencySigTest extends SigTestEE { private static final TestLogger log = TestLogger.get(ConcurrencySigTest.class); - private static final String SIG_FILE_VER_SEP = "_"; - public ConcurrencySigTest() { setup(); } @@ -132,7 +130,7 @@ protected File writeStreamToTempFile(InputStream inputStream, String tempFilePre } } - protected File writeStreamToSigFile(InputStream inputStream, String packageVersion) throws IOException { + protected File writeStreamToSigFile(InputStream inputStream) throws IOException { FileOutputStream outputStream = null; String tmpdir = System.getProperty("java.io.tmpdir"); try { @@ -203,12 +201,10 @@ public void signatureTest() throws Fault { log.info("packageFile location is :" + packageListFile); mapFileAsProps = getSigTestDriver().loadMapFile(mapFile); - String packageVersion = mapFileAsProps.getProperty("jakarta.enterprise.concurrent"); - log.info("Package version from mapfile :" + packageVersion); InputStream inStreamSigFile = ConcurrencySigTest.class.getClassLoader() .getResourceAsStream("ee/jakarta/tck/concurrent/spec/signature/" + SignatureTests.SIG_FILE_NAME); - File sigFile = writeStreamToSigFile(inStreamSigFile, packageVersion); + File sigFile = writeStreamToSigFile(inStreamSigFile); log.info("signature File location is :" + sigFile.getCanonicalPath()); signatureRepositoryDir = System.getProperty("java.io.tmpdir"); diff --git a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/SignatureTests.java b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/SignatureTests.java index 77e4980e..838dfd9c 100644 --- a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/SignatureTests.java +++ b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/SignatureTests.java @@ -27,7 +27,7 @@ public class SignatureTests extends TestClient { - public static final String SIG_FILE_NAME = "jakarta.enterprise.concurrent.sig_3.0.0"; + public static final String SIG_FILE_NAME = "jakarta.enterprise.concurrent.sig"; public static final String SIG_MAP_NAME = "sig-test.map"; public static final String SIG_PKG_NAME = "sig-test-pkg-list.txt"; diff --git a/tck/src/main/resources/ee/jakarta/tck/concurrent/spec/signature/jakarta.enterprise.concurrent.sig_3.0.0 b/tck/src/main/resources/ee/jakarta/tck/concurrent/spec/signature/jakarta.enterprise.concurrent.sig similarity index 100% rename from tck/src/main/resources/ee/jakarta/tck/concurrent/spec/signature/jakarta.enterprise.concurrent.sig_3.0.0 rename to tck/src/main/resources/ee/jakarta/tck/concurrent/spec/signature/jakarta.enterprise.concurrent.sig