signature test update with logger. Signed-off-by: gurunandan.rao@oracle.com <gurunandan.rao@oracle.com>
diff --git a/tck/tck-dist/src/main/assembly/assembly.xml b/tck/tck-dist/src/main/assembly/assembly.xml index ec03e0d..67411d9 100644 --- a/tck/tck-dist/src/main/assembly/assembly.xml +++ b/tck/tck-dist/src/main/assembly/assembly.xml
@@ -34,26 +34,27 @@ <source>artifact-install.sh</source> <outputDirectory>artifacts</outputDirectory> </file> - <file> - <source>../tck-docs/userguide/target/generated-docs/Jakarta-JSON-Processing-TCK-Users-Guide.pdf</source> - <outputDirectory>docs/pdf-usersguide</outputDirectory> - </file> - <file> - <source>../tck-docs/index.html</source> - <outputDirectory>docs/</outputDirectory> - </file> - <file> - <source>../tck-docs/JSONP2.1-ReleaseNotes.html</source> - <outputDirectory>docs/</outputDirectory> - </file> </files> - <fileSets> + <fileSet> + <directory>../tck-docs/</directory> + <outputDirectory>docs/</outputDirectory> + <includes> + <include>*.*</include> + </includes> + </fileSet> + <fileSet> + <directory>../tck-docs/userguide/target/generated-docs</directory> + <outputDirectory>docs/pdf-usersguide</outputDirectory> + <includes> + <include>**/*.pdf</include> + </includes> + </fileSet> <fileSet> <directory>../tck-docs/assertions</directory> <outputDirectory>/docs/assertions</outputDirectory> <includes> - <include>JSONP*avadocAssertions.html</include> + <include>*Assertions.html</include> </includes> </fileSet> <fileSet>
diff --git a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/ApiCheckDriver.java b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/ApiCheckDriver.java index 612e5f3..bcc1ed2 100644 --- a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/ApiCheckDriver.java +++ b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/ApiCheckDriver.java
@@ -27,11 +27,17 @@ import java.lang.reflect.Method; import java.util.LinkedList; import java.util.List; +import java.util.logging.Logger; + public final class ApiCheckDriver extends SignatureTestDriver implements Serializable { + + private static final Logger LOGGER = Logger.getLogger(ApiCheckDriver.class.getName()); + + /* flags for the Diff utility argument list */ private static final String BASE_FLAG = "-base"; @@ -129,10 +135,10 @@ } // dump args for debugging aid - System.out.println( + LOGGER.fine( "\nCalling: com.sun.tdk.signaturetest.SignatureTest() with following args:"); for (int ii = 0; ii < testArguments.length; ii++) { - System.out.println(" testArguments[" + ii + "] = " + testArguments[ii]); + LOGGER.fine(" testArguments[" + ii + "] = " + testArguments[ii]); } @SuppressWarnings("unchecked") @@ -145,9 +151,9 @@ // currently, there is no way to determine if there are error msgs in // the rawmessages, so we will always dump this and call it a status. - System.out.println( + LOGGER.info( "********** Status Report '" + packageOrClassName + "' **********\n"); - System.out.println(rawMessages); + LOGGER.info(rawMessages); return sigTestInstance.toString().substring(7).startsWith("Passed."); }
diff --git a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/PackageList.java b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/PackageList.java index ab3240a..6706713 100644 --- a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/PackageList.java +++ b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/PackageList.java
@@ -32,6 +32,8 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; +import java.util.logging.Logger; + /** * This class represents a package list file. A package list file is used in @@ -64,6 +66,9 @@ */ class PackageList { + private static final Logger LOGGER = Logger.getLogger(PackageList.class.getName()); + + // Any line in the packageFile starting with this character is a comment private static final char COMMENT_CHAR = '#'; @@ -219,7 +224,7 @@ for (int i = 0; i < delPkgs.size(); i++) { packageName = (String) (delPkgs.get(i)); packageNames.remove(packageName); - System.out.println( + LOGGER.info( "PackageList.removeExistingPackage() \"" + packageName + "\""); } } @@ -354,8 +359,7 @@ String packageName = (String) i.next(); out.write(packageName); out.newLine(); - System.out - .println("PackageList.writePkgFile() \"" + packageName + "\""); + LOGGER.info("PackageList.writePkgFile() \"" + packageName + "\""); } } finally { if (out != null) { @@ -413,18 +417,17 @@ * Test Driver */ public static void main(String[] args) throws Exception { - System.out.println("\n\n*** Creating package list file ***\n\n"); + LOGGER.info("\n\n*** Creating package list file ***\n\n"); PackageList list = new PackageList("jakarta.ejb", "/home/ryano/cts-tools-master/tools/api-check/test/jakarta.ejb.sig_2.1", "/home/ryano/cts-tools-master/tools/api-check/test/pkg-list.txt"); list.writePkgListFile(); - System.out - .println("\n\n*** Reading sub-packages from package list file ***\n\n"); + LOGGER.info("\n\n*** Reading sub-packages from package list file ***\n\n"); PackageList readList = new PackageList( "/home/ryano/cts-tools-master/tools/api-check/test/pkg-list.txt"); - System.out.println(Arrays.asList(readList.getSubPackages("jakarta.ejb"))); - System.out.println(readList.getSubPackagesFormatted("jakarta.ejb")); + LOGGER.info(readList.getSubPackages("jakarta.ejb").toString()); + LOGGER.info(readList.getSubPackagesFormatted("jakarta.ejb").toString()); } } // end class PackageList
diff --git a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/Recorder.java b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/Recorder.java index cce2559..67f4778 100644 --- a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/Recorder.java +++ b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/Recorder.java
@@ -28,9 +28,13 @@ import java.util.Arrays; import java.util.Iterator; import java.util.Properties; +import java.util.logging.Logger; + public abstract class Recorder { + private static final Logger LOGGER = Logger.getLogger(Recorder.class.getName()); + protected Properties signatureMap; protected String packageListFile; @@ -45,9 +49,9 @@ public Recorder(String[] args) { - System.out.println("\nCalling: Recorder with following args:"); + LOGGER.info("\nCalling: Recorder with following args:"); for (int ii = 0; ii < args.length; ii++) { - System.out.println(" args[" + ii + "] = " + args[ii]); + LOGGER.info(" args[" + ii + "] = " + args[ii]); } Arguments arguments = new Arguments(args); @@ -78,11 +82,11 @@ try { // dump command line args passed to Setup()... - System.out.println("\n\nDUMPING SIGTEST COMMAND LINE: \n"); + LOGGER.info("\n\nDUMPING SIGTEST COMMAND LINE: \n"); for (int ii = 0; ii < commandLine.length; ii++) { - System.out.println("commandLine[" + ii + "] = " + commandLine[ii]); + LOGGER.info("commandLine[" + ii + "] = " + commandLine[ii]); } - System.out.println("\nDONE DUMPING SIGTEST COMMAND LINE. \n\n"); + LOGGER.info("\nDONE DUMPING SIGTEST COMMAND LINE. \n\n"); doRecord(commandLine); } catch (Exception e) { @@ -92,7 +96,7 @@ try { writePackageListFile(basePackageName, outputFileName, packageListFile); } catch (Exception e) { - System.out.println("Unexpected exception: " + e); + LOGGER.info("Unexpected exception: " + e); e.printStackTrace(); System.exit(1); } @@ -198,12 +202,11 @@ // all 4 arguments must be defined, thus there should be 8 elements if (args.length != 8) { - System.out - .println("Error - incorrect number of args should be 8 but was: " + LOGGER.info("Error - incorrect number of args should be 8 but was: " + args.length); - System.out.println("Args passed in were: "); + LOGGER.info("Args passed in were: "); for (int ii = 0; ii < args.length; ii++) { - System.out.println("args[" + ii + "] = " + args[ii]); + LOGGER.info("args[" + ii + "] = " + args[ii]); } throw new IllegalArgumentException();
diff --git a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTest.java b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTest.java index e263aa0..c3f25b9 100644 --- a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTest.java +++ b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTest.java
@@ -29,6 +29,8 @@ import java.util.ArrayList; import java.util.Properties; +import java.util.logging.Logger; + /** @@ -39,6 +41,8 @@ */ public abstract class SigTest { + private static final Logger LOGGER = Logger.getLogger(SigTest.class.getName()); + protected SignatureTestDriver driver; /** @@ -179,11 +183,11 @@ */ public void setup() { try { - System.out.println("$$$ SigTest.setup() called"); + LOGGER.info("$$$ SigTest.setup() called"); this.testInfo = new SigTestData(); - System.out.println("$$$ SigTest.setup() complete"); + LOGGER.info("$$$ SigTest.setup() complete"); } catch (Exception e) { - System.out.println("Unexpected exception " + e.getMessage()); + LOGGER.info("Unexpected exception " + e.getMessage()); //throw new Fault("setup failed!", e); } } @@ -198,10 +202,10 @@ * When an error occurs cleaning up the state of this test. */ public void cleanup() throws Fault { - System.out.println("$$$ SigTest.cleanup() called"); + LOGGER.info("$$$ SigTest.cleanup() called"); try { getSigTestDriver().cleanupImpl(); - System.out.println("$$$ SigTest.cleanup() returning"); + LOGGER.info("$$$ SigTest.cleanup() returning"); } catch (Exception e) { throw new Fault("Cleanup failed!", e); } @@ -217,7 +221,7 @@ */ public Fault(String msg) { super(msg); - System.out.println(msg); + LOGGER.info(msg); } /** @@ -231,7 +235,7 @@ public Fault(String msg, Throwable t) { super(msg); this.t = t; - // System.out.println(msg, t); + // LOGGER.info(msg, t); } /**
diff --git a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTestDriver.java b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTestDriver.java index db58ff0..1b8619e 100644 --- a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTestDriver.java +++ b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTestDriver.java
@@ -22,6 +22,8 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; +import java.util.logging.Logger; + /** @@ -31,6 +33,9 @@ */ public class SigTestDriver extends SignatureTestDriver { + private static final Logger LOGGER = Logger.getLogger(SigTestDriver.class.getName()); + + private static final String CLASSPATH_FLAG = "-Classpath"; private static final String FILENAME_FLAG = "-FileName"; @@ -108,7 +113,7 @@ if (bStaticMode) { // static mode allows finer level of constants checking // -CheckValue says to check the actual const values - System.out.println("Setting static mode flag to allow constant checking."); + LOGGER.info("Setting static mode flag to allow constant checking."); command.add(STATIC_FLAG); command.add(CHECKVALUE_FLAG); @@ -119,7 +124,7 @@ // command.add("bin"); command.add("src"); } else { - System.out.println("Not Setting static mode flag to allow constant checking."); + LOGGER.info("Not Setting static mode flag to allow constant checking."); } command.add("-Verbose"); @@ -162,10 +167,10 @@ ByteArrayOutputStream output = new ByteArrayOutputStream(); // do some logging to help with troubleshooting - System.out.println( + LOGGER.info( "\nCalling: com.sun.tdk.signaturetest.SignatureTest() with following args:"); for (int ii = 0; ii < testArguments.length; ii++) { - System.out.println(" testArguments[" + ii + "] = " + testArguments[ii]); + LOGGER.info(" testArguments[" + ii + "] = " + testArguments[ii]); } @SuppressWarnings("unchecked") @@ -178,9 +183,9 @@ // currently, there is no way to determine if there are error msgs in // the rawmessages, so we will always dump this and call it a status. - System.out.println( + LOGGER.info( "********** Status Report '" + packageOrClassName + "' **********\n"); - System.out.println(rawMessages); + LOGGER.info(rawMessages); return sigTestInstance.toString().substring(7).startsWith("Passed."); } // END runSignatureTest @@ -207,10 +212,10 @@ } // dump args for debugging aid - System.out.println( + LOGGER.info( "\nCalling: com.sun.tdk.signaturetest.SignatureTest() with following args:"); for (int ii = 0; ii < testArguments.length; ii++) { - System.out.println(" testArguments[" + ii + "] = " + testArguments[ii]); + LOGGER.info(" testArguments[" + ii + "] = " + testArguments[ii]); } @SuppressWarnings("unchecked") @@ -223,9 +228,9 @@ // currently, there is no way to determine if there are error msgs in // the rawmessages, so we will always dump this and call it a status. - System.out.println( + LOGGER.info( "********** Status Report '" + packageOrClassName + "' **********\n"); - System.out.println(rawMessages); + LOGGER.info(rawMessages); return sigTestInstance.toString().substring(7).startsWith("Passed."); } @@ -236,7 +241,7 @@ */ protected boolean verifyJTAJarForNoXA(String classpath, String repositoryDir) throws Exception { - System.out.println("SigTestDriver#verifyJTAJarForNoXA - Starting:"); + LOGGER.info("SigTestDriver#verifyJTAJarForNoXA - Starting:"); boolean result = false; List command = new ArrayList(); @@ -252,9 +257,9 @@ String testArguments [] = (String[]) command.toArray(new String[command.size()]); // do some logging to help with troubleshooting - System.out.println("\nCalling: com.sun.tdk.signaturetest.SignatureTest() with following args:"); + LOGGER.info("\nCalling: com.sun.tdk.signaturetest.SignatureTest() with following args:"); for (int ii=0; ii < testArguments.length; ii++) { - System.out.println(" testArguments[" +ii+ "] = " + testArguments[ii]); + LOGGER.info(" testArguments[" +ii+ "] = " + testArguments[ii]); } Class sigTestClass = Class.forName("com.sun.tdk.signaturetest.SignatureTest"); @@ -274,8 +279,8 @@ // currently, there is no way to determine if there are error msgs in // the rawmessages, so we will always dump this and call it a status. - System.out.println("********** Status Report JTA JAR validation **********\n"); - System.out.println(rawMessages); + LOGGER.info("********** Status Report JTA JAR validation **********\n"); + LOGGER.info(rawMessages); return sigTestInstance.toString().substring(7).startsWith("Passed."); } }
diff --git a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTestEE.java b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTestEE.java index aafa354..fbefc2e 100644 --- a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTestEE.java +++ b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTestEE.java
@@ -25,6 +25,8 @@ import java.util.ArrayList; import java.util.Properties; +import java.util.logging.Logger; + /** @@ -35,6 +37,9 @@ */ public abstract class SigTestEE { + private static final Logger LOGGER = Logger.getLogger(SigTestEE.class.getName()); + + String[] sVehicles; private Object theSharedObject; @@ -213,11 +218,11 @@ */ public void setup() { try { - System.out.println("$$$ SigTestEE.setup() called"); + LOGGER.info("$$$ SigTestEE.setup() called"); this.testInfo = new SigTestData(); - System.out.println("$$$ SigTestEE.setup() complete"); + LOGGER.info("$$$ SigTestEE.setup() complete"); } catch (Exception e) { - System.out.println("Unexpected exception " + e.getMessage()); + LOGGER.info("Unexpected exception " + e.getMessage()); } } @@ -231,7 +236,7 @@ * When an error occurs executing the signature tests. */ public void signatureTest() throws Fault { - System.out.println("$$$ SigTestEE.signatureTest() called"); + LOGGER.info("$$$ SigTestEE.signatureTest() called"); SigTestResult results = null; String mapFile = getMapFile(); String repositoryDir = getRepositoryDir(); @@ -258,24 +263,24 @@ f.mkdirs(); String javaHome = (String) sysProps.get("java.home"); - System.out.println("Executing JImage"); + LOGGER.info("Executing JImage"); try { ProcessBuilder pb = new ProcessBuilder(javaHome + "/bin/jimage", "extract", "--dir=" + jimageDir, javaHome + "/lib/modules"); - System.out.println(javaHome + "/bin/jimage extract --dir=" + jimageDir + " " + javaHome + "/lib/modules"); + LOGGER.info(javaHome + "/bin/jimage extract --dir=" + jimageDir + " " + javaHome + "/lib/modules"); pb.redirectErrorStream(true); Process proc = pb.start(); BufferedReader out = new BufferedReader(new InputStreamReader(proc.getInputStream())); String line = null; while ((line = out.readLine()) != null) { - System.out.println(line); + LOGGER.info(line); } int rc = proc.waitFor(); - System.out.println("JImage RC = " + rc); + LOGGER.info("JImage RC = " + rc); out.close(); } catch (Exception e) { - System.out.println("Exception while executing JImage! Some tests may fail."); + LOGGER.info("Exception while executing JImage! Some tests may fail."); e.printStackTrace(); } } @@ -284,9 +289,9 @@ results = getSigTestDriver().executeSigTest(packageFile, mapFile, repositoryDir, packages, classes, testClasspath, unlistedTechnologyPkgs, optionalPkgToIgnore); - System.out.println(results.toString()); + LOGGER.info(results.toString()); if (!results.passed()) { - System.out.println("results.passed() returned false"); + LOGGER.info("results.passed() returned false"); throw new Exception(); } @@ -296,7 +301,7 @@ Properties mapFileAsProps = getSigTestDriver().loadMapFile(mapFile); if (mapFileAsProps == null || mapFileAsProps.size() == 0) { // empty signature file, something unusual - System.out.println("SigTestEE.signatureTest() returning, " + + LOGGER.info("SigTestEE.signatureTest() returning, " + "as signature map file is empty."); return; } @@ -307,12 +312,12 @@ // jakarta.transaction String jtaVersion = mapFileAsProps.getProperty("jakarta.transaction"); if (jtaVersion == null || "".equals(jtaVersion.trim())) { - System.out.println("SigTestEE.signatureTest() returning, " + + LOGGER.info("SigTestEE.signatureTest() returning, " + "as this is neither JTA TCK run, not Java EE CTS run."); return; } - System.out.println("jtaVersion " + jtaVersion); + LOGGER.info("jtaVersion " + jtaVersion); // Signature map packaged in JTA TCK will contain a single package // jakarta.transaction if (mapFileAsProps.size() == 1) { @@ -323,12 +328,12 @@ verifyJtaJarTest(); } } - System.out.println("$$$ SigTestEE.signatureTest() returning"); + LOGGER.info("$$$ SigTestEE.signatureTest() returning"); } catch (Exception e) { if (results != null && !results.passed()) { throw new Fault("SigTestEE.signatureTest() failed!, diffs found"); } else { - System.out.println("Unexpected exception " + e.getMessage()); + LOGGER.info("Unexpected exception " + e.getMessage()); throw new Fault("signatureTest failed with an unexpected exception", e); } } @@ -355,18 +360,18 @@ * @throws Fault When an error occurs executing the signature tests. */ public void verifyJtaJarTest() throws Exception { - System.out.println("SigTestEE#verifyJtaJarTest - Starting:"); + LOGGER.info("SigTestEE#verifyJtaJarTest - Starting:"); String repositoryDir = getRepositoryDir(); String jtaJarClasspath = testInfo.getJtaJarClasspath(); boolean result = getSigTestDriver().verifyJTAJarForNoXA( testInfo.getJtaJarClasspath(), repositoryDir); if(result) { - System.out.println("PASS: javax.transaction.xa not found in API jar"); + LOGGER.info("PASS: javax.transaction.xa not found in API jar"); } else { - System.out.println("FAIL: javax.transaction.xa found in API jar"); + LOGGER.info("FAIL: javax.transaction.xa found in API jar"); throw new Fault("javax.transaction.xa validation failed"); } - System.out.println("SigTestEE#verifyJtaJarTest returning"); + LOGGER.info("SigTestEE#verifyJtaJarTest returning"); } /** @@ -378,10 +383,10 @@ * When an error occurs cleaning up the state of this test. */ public void cleanup() throws Fault { - System.out.println("$$$ SigTestEE.cleanup() called"); + LOGGER.info("$$$ SigTestEE.cleanup() called"); try { getSigTestDriver().cleanupImpl(); - System.out.println("$$$ SigTestEE.cleanup() returning"); + LOGGER.info("$$$ SigTestEE.cleanup() returning"); } catch (Exception e) { throw new Fault("Cleanup failed!", e); } @@ -398,7 +403,7 @@ */ public Fault(String msg) { super(msg); - System.out.println(msg); + LOGGER.info(msg); } /** @@ -412,7 +417,7 @@ public Fault(String msg, Throwable t) { super(msg); this.t = t; - System.out.println(msg); + LOGGER.info(msg); t.printStackTrace(); }
diff --git a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SignatureTestDriver.java b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SignatureTestDriver.java index 1f2a8a3..fb2b0e4 100644 --- a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SignatureTestDriver.java +++ b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SignatureTestDriver.java
@@ -24,6 +24,8 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.Properties; +import java.util.logging.Logger; + /** @@ -32,6 +34,9 @@ */ public abstract class SignatureTestDriver { + private static final Logger LOGGER = Logger.getLogger(SignatureTestDriver.class.getName()); + + private static final String SIG_FILE_EXT = ".sig"; private static final String SIG_FILE_VER_SEP = "_"; @@ -46,7 +51,7 @@ String thePkgListFile = "sig-test-pkg-list.txt"; - System.out.println( + LOGGER.info( "Using the following as the SigTest Package file: " + thePkgListFile); String theFile = binDir + File.separator + thePkgListFile; @@ -55,14 +60,14 @@ // we could not find the map file that coresponded to our SE version so // lets // try to default to use the sig-test-pkg-list.txt - System.out.println("The SigTest Package file does not exist: " + thePkgListFile); + LOGGER.warning("The SigTest Package file does not exist: " + thePkgListFile); theFile = binDir + File.separator + "sig-test-pkg-list.txt"; File ff2 = new File(theFile); if (!ff2.exists()) { - System.out.println("The Default SigTest Package file does not exist either: " + LOGGER.warning("The Default SigTest Package file does not exist either: " + theFile); } else { - System.out.println("Defaulting to using SigTest Package file: " + theFile); + LOGGER.info("Defaulting to using SigTest Package file: " + theFile); } } @@ -78,7 +83,7 @@ String theMapFile = "sig-test.map"; - System.out.println("Using the following as the sig-Test map file: " + theMapFile); + LOGGER.info("Using the following as the sig-Test map file: " + theMapFile); String theFile = binDir + File.separator + theMapFile; File ff = new File(theFile); @@ -86,13 +91,13 @@ // we could not find the map file that coresponded to our SE version so // lets // try to default to use the sig-test.map - System.out.println("The SigTest Map file does not exist: " + theMapFile); + LOGGER.warning("The SigTest Map file does not exist: " + theMapFile); theFile = binDir + File.separator + "sig-test.map"; File ff2 = new File(theFile); if (!ff2.exists()) { - System.out.println("The SigTest Map file does not exist either: " + theFile); + LOGGER.warning("The SigTest Map file does not exist either: " + theFile); } else { - System.out.println("Defaulting to using SigTest Map file: " + theFile); + LOGGER.info("Defaulting to using SigTest Map file: " + theFile); } } @@ -135,9 +140,9 @@ public void cleanupImpl() throws Exception { try { - System.out.println("cleanup"); + LOGGER.info("cleanup"); } catch (Exception e) { - System.out.println("Exception in cleanup method" + e); + LOGGER.warning("Exception in cleanup method" + e); throw e; } @@ -180,43 +185,43 @@ SigTestResult result = new SigTestResult(); - System.out.println("optionalPkgToIgnore = " + optionalPkgToIgnore); + LOGGER.info("optionalPkgToIgnore = " + optionalPkgToIgnore); String[] arrayOptionalPkgsToIgnore = null; if (optionalPkgToIgnore != null) { arrayOptionalPkgsToIgnore = optionalPkgToIgnore.split(","); } if (packagesUnderTest != null && packagesUnderTest.length > 0) { - System.out.println("********** BEGIN PACKAGE LEVEL SIGNATURE " + LOGGER.info("********** BEGIN PACKAGE LEVEL SIGNATURE " + "VALIDATION **********\n\n"); for (int i = 0; i < packagesUnderTest.length; i++) { String packageName = packagesUnderTest[i]; - System.out.println("********** BEGIN VALIDATE PACKAGE '" + LOGGER.info("********** BEGIN VALIDATE PACKAGE '" + packagesUnderTest[i] + "' **********\n"); - System.out.println( + LOGGER.info( "********** VALIDATE IN STATIC MODE - TO CHECK CONSANT VALUES ****"); - System.out.println("Static mode supports checks of static constants values "); + LOGGER.info("Static mode supports checks of static constants values "); String[] args = createTestArguments(packageListFile, mapFile, signatureRepositoryDir, packageName, classpath, true); dumpTestArguments(args); if (runSignatureTest(packageName, args)) { - System.out.println("********** Package '" + packageName + LOGGER.info("********** Package '" + packageName + "' - PASSED (STATIC MODE) **********"); result.addPassedPkg(packageName + "(static mode)"); } else { result.addFailedPkg(packageName + "(static mode)"); - System.out.println("********** Package '" + packageName + LOGGER.info("********** Package '" + packageName + "' - FAILED (STATIC MODE) **********"); } - System.out.println("\n\n"); - System.out.println("********** VALIDATE IN REFLECTIVE MODE ****"); - System.out.println( + LOGGER.info("\n\n"); + LOGGER.info("********** VALIDATE IN REFLECTIVE MODE ****"); + LOGGER.info( "Reflective mode supports verification within containers (ie ejb, servlet, etc)"); String[] args2 = createTestArguments(packageListFile, mapFile, @@ -224,56 +229,56 @@ dumpTestArguments(args2); if (runSignatureTest(packageName, args2)) { - System.out.println("********** Package '" + packageName + LOGGER.info("********** Package '" + packageName + "' - PASSED (REFLECTION MODE) **********"); result.addPassedPkg(packageName + "(reflection mode)"); } else { result.addFailedPkg(packageName + "(reflection mode)"); - System.out.println("********** Package '" + packageName + LOGGER.info("********** Package '" + packageName + "' - FAILED (REFLECTION MODE) **********"); } - System.out.println("********** END VALIDATE PACKAGE '" + LOGGER.info("********** END VALIDATE PACKAGE '" + packagesUnderTest[i] + "' **********\n"); - System.out.println("\n"); - System.out.println("\n"); + LOGGER.info("\n"); + LOGGER.info("\n"); } } if (classesUnderTest != null && classesUnderTest.length > 0) { - System.out.println("********** BEGIN CLASS LEVEL SIGNATURE " + LOGGER.info("********** BEGIN CLASS LEVEL SIGNATURE " + "VALIDATION **********\n\n"); for (int i = 0; i < classesUnderTest.length; i++) { String className = classesUnderTest[i]; - System.out.println("********** BEGIN VALIDATE CLASS '" + LOGGER.info("********** BEGIN VALIDATE CLASS '" + classesUnderTest[i] + "' **********\n"); - System.out.println( + LOGGER.info( "********** VALIDATE IN STATIC MODE - TO CHECK CONSANT VALUES ****"); - System.out.println("Static mode supports checks of static constants values "); + LOGGER.info("Static mode supports checks of static constants values "); String[] args = createTestArguments(packageListFile, mapFile, signatureRepositoryDir, className, classpath, true); dumpTestArguments(args); if (runSignatureTest(className, args)) { - System.out.println("********** Class '" + className + LOGGER.info("********** Class '" + className + "' - PASSED (STATIC MODE) **********"); result.addPassedClass(className + "(static mode)"); } else { - System.out.println("********** Class '" + className + LOGGER.info("********** Class '" + className + "' - FAILED (STATIC MODE) **********"); result.addFailedClass(className + "(static mode)"); } - System.out.println("\n\n"); - System.out.println("********** VALIDATE IN REFLECTIVE MODE ****"); - System.out.println( + LOGGER.info("\n\n"); + LOGGER.info("********** VALIDATE IN REFLECTIVE MODE ****"); + LOGGER.info( "Reflective mode supports verification within containers (ie ejb, servlet, etc)"); String[] args2 = createTestArguments(packageListFile, mapFile, @@ -281,20 +286,20 @@ dumpTestArguments(args2); if (runSignatureTest(className, args2)) { - System.out.println("********** Class '" + className + LOGGER.info("********** Class '" + className + "' - PASSED (REFLECTION MODE) **********"); result.addPassedClass(className + "(reflection mode)"); } else { - System.out.println("********** Class '" + className + LOGGER.info("********** Class '" + className + "' - FAILED (REFLECTION MODE) **********"); result.addFailedClass(className + "(reflection mode)"); } - System.out.println("********** END VALIDATE CLASS '" + classesUnderTest[i] + LOGGER.info("********** END VALIDATE CLASS '" + classesUnderTest[i] + "' **********\n"); - System.out.println("\n"); - System.out.println("\n"); + LOGGER.info("\n"); + LOGGER.info("\n"); } } @@ -324,15 +329,15 @@ // requires us to add special handling to avoid testing 'certain' pkgs // within an optional technology. if (isIgnorePackageUnderTest(packageName, arrayOptionalPkgsToIgnore)) { - System.out.println( + LOGGER.info( "Ignoring special optional technology package: " + packageName); continue; } - System.out.println("\n\n"); - System.out.println( + LOGGER.info("\n\n"); + LOGGER.info( "********** CHECK IF OPTIONAL TECHNOLOGIES EXIST IN REFLECTIVE MODE ****"); - System.out.println( + LOGGER.info( "Reflective mode supports verification within containers (ie ejb, servlet, etc)"); String[] args3 = createTestArguments(packageListFile, mapFile, @@ -353,7 +358,7 @@ if (runPackageSearch(packageName, args3)) { // if this passed we have an issue because it should not exist - thus // should NOT pass. - System.out.println("********** Package '" + packageName + LOGGER.info("********** Package '" + packageName + "' - WAS FOUND BUT SHOULD NOT BE (REFLECTION MODE) **********"); String err = "ERROR: An area of concern has been identified. "; err += "You must run sigtests with (ts.jte) javaee.level set to "; @@ -363,11 +368,11 @@ err += "all related TCK tests. To properly pass the "; err += "signature tests - you must identify all Optional Technology "; err += "areas (via javaee.level) that you wish to pass signature tests for."; - System.out.println(err); + LOGGER.info(err); result.addFailedPkg(packageName + " (Undeclared Optional Technology package found in reflection mode)"); } else { - System.out.println("********** Undeclared Optional Technology package '" + LOGGER.info("********** Undeclared Optional Technology package '" + packageName + "' - PASSED (REFLECTION MODE) **********"); } } @@ -633,11 +638,11 @@ private static void dumpTestArguments(String[] params) { if (params != null && params.length > 0) { - System.out.println("----------------- BEGIN SIG PARAM DUMP -----------------"); + LOGGER.fine("----------------- BEGIN SIG PARAM DUMP -----------------"); for (int i = 0; i < params.length; i++) { - System.out.println(" Param[" + i + "]: " + params[i]); + LOGGER.fine(" Param[" + i + "]: " + params[i]); } - System.out.println("------------------ END SIG PARAM DUMP ------------------"); + LOGGER.fine("------------------ END SIG PARAM DUMP ------------------"); } } // END dumpTestArguments
diff --git a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/jsonp/JSONPSigTest.java b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/jsonp/JSONPSigTest.java index 042db22..9cb534c 100644 --- a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/jsonp/JSONPSigTest.java +++ b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/jsonp/JSONPSigTest.java
@@ -35,6 +35,8 @@ import java.util.ArrayList; import java.util.Properties; +import java.util.logging.Logger; + /* @@ -47,6 +49,9 @@ */ public class JSONPSigTest extends SigTestEE { + private static final Logger LOGGER = Logger.getLogger(JSONPSigTest.class.getName()); + + public JSONPSigTest(){ setup(); } @@ -99,10 +104,10 @@ File sigfile = new File(tmpdir+File.separator+"jakarta.json.sig_"+packageVersion); if(sigfile.exists()){ sigfile.delete(); - System.out.println("Existing signature file deleted to create new one"); + LOGGER.info("Existing signature file deleted to create new one"); } if(!sigfile.createNewFile()){ - System.out.println("signature file is not created"); + LOGGER.info("signature file is not created"); } outputStream = new FileOutputStream(sigfile); byte[] buffer = new byte[1024]; @@ -157,7 +162,7 @@ */ @Test public void signatureTest() throws Fault { - System.out.println("$$$ JSONPSigTest.signatureTest() called"); + LOGGER.info("$$$ JSONPSigTest.signatureTest() called"); SigTestResult results = null; String mapFile = null; String packageFile = null; @@ -168,25 +173,25 @@ InputStream inStreamMapfile = JSONPSigTest.class.getClassLoader().getResourceAsStream("jakarta/jsonp/tck/signaturetest/sig-test.map"); File mFile = writeStreamToTempFile(inStreamMapfile, "sig-test", ".map"); mapFile = mFile.getCanonicalPath(); - System.out.println("mapFile location is :"+mapFile); + LOGGER.info("mapFile location is :"+mapFile); InputStream inStreamPackageFile = JSONPSigTest.class.getClassLoader().getResourceAsStream("jakarta/jsonp/tck/signaturetest/sig-test-pkg-list.txt"); File pFile = writeStreamToTempFile(inStreamPackageFile, "sig-test-pkg-list", ".txt"); packageFile = pFile.getCanonicalPath(); - System.out.println("packageFile location is :"+packageFile); + LOGGER.info("packageFile location is :"+packageFile); mapFileAsProps = getSigTestDriver().loadMapFile(mapFile); String packageVersion = mapFileAsProps.getProperty("jakarta.json"); - System.out.println("Package version from mapfile :"+ packageVersion); + LOGGER.info("Package version from mapfile :"+ packageVersion); InputStream inStreamSigFile = JSONPSigTest.class.getClassLoader().getResourceAsStream("jakarta/jsonp/tck/signaturetest/jakarta.json.sig_"+packageVersion); File sigFile = writeStreamToSigFile(inStreamSigFile, packageVersion); - System.out.println("signature File location is :"+sigFile.getCanonicalPath()); + LOGGER.info("signature File location is :"+sigFile.getCanonicalPath()); repositoryDir = System.getProperty("java.io.tmpdir"); } catch(IOException ex){ - System.out.println("Exception while creating temp files :"+ex); + LOGGER.info("Exception while creating temp files :"+ex); } String[] packages = getPackages(testInfo.getVehicle()); @@ -211,24 +216,24 @@ f.mkdirs(); String javaHome = (String) sysProps.get("java.home"); - System.out.println("Executing JImage"); + LOGGER.info("Executing JImage"); try { ProcessBuilder pb = new ProcessBuilder(javaHome + "/bin/jimage", "extract", "--dir=" + jimageDir, javaHome + "/lib/modules"); - System.out.println(javaHome + "/bin/jimage extract --dir=" + jimageDir + " " + javaHome + "/lib/modules"); + LOGGER.info(javaHome + "/bin/jimage extract --dir=" + jimageDir + " " + javaHome + "/lib/modules"); pb.redirectErrorStream(true); Process proc = pb.start(); BufferedReader out = new BufferedReader(new InputStreamReader(proc.getInputStream())); String line = null; while ((line = out.readLine()) != null) { - System.out.println(line); + LOGGER.info(line); } int rc = proc.waitFor(); - System.out.println("JImage RC = " + rc); + LOGGER.info("JImage RC = " + rc); out.close(); } catch (Exception e) { - System.out.println("Exception while executing JImage! Some tests may fail."); + LOGGER.info("Exception while executing JImage! Some tests may fail."); e.printStackTrace(); } } @@ -237,9 +242,9 @@ results = getSigTestDriver().executeSigTest(packageFile, mapFile, repositoryDir, packages, classes, testClasspath, unlistedTechnologyPkgs, optionalPkgToIgnore); - System.out.println(results.toString()); + LOGGER.info(results.toString()); if (!results.passed()) { - System.out.println("results.passed() returned false"); + LOGGER.info("results.passed() returned false"); throw new Exception(); } @@ -248,7 +253,7 @@ if ("standalone".equalsIgnoreCase(testInfo.getVehicle())) { if (mapFileAsProps == null || mapFileAsProps.size() == 0) { // empty signature file, something unusual - System.out.println("JSONPSigTest.signatureTest() returning, " + + LOGGER.info("JSONPSigTest.signatureTest() returning, " + "as signature map file is empty."); return; } @@ -259,12 +264,12 @@ // jakarta.transaction String jtaVersion = mapFileAsProps.getProperty("jakarta.transaction"); if (jtaVersion == null || "".equals(jtaVersion.trim())) { - System.out.println("JSONPSigTest.signatureTest() returning, " + + LOGGER.info("JSONPSigTest.signatureTest() returning, " + "as this is neither JTA TCK run, not Java EE CTS run."); return; } - System.out.println("jtaVersion " + jtaVersion); + LOGGER.info("jtaVersion " + jtaVersion); // Signature map packaged in JTA TCK will contain a single package // jakarta.transaction if (mapFileAsProps.size() == 1) { @@ -275,12 +280,12 @@ verifyJtaJarTest(); } } - System.out.println("$$$ JSONPSigTest.signatureTest() returning"); + LOGGER.info("$$$ JSONPSigTest.signatureTest() returning"); } catch (Exception e) { if (results != null && !results.passed()) { throw new Fault("JSONPSigTest.signatureTest() failed!, diffs found"); } else { - System.out.println("Unexpected exception " + e.getMessage()); + LOGGER.info("Unexpected exception " + e.getMessage()); throw new Fault("signatureTest failed with an unexpected exception", e); } }