Skip to content

Commit 5011e1e

Browse files
gurunraolukasj
gurunrao
authored and
lukasj
committed
signature test update with logger.
Signed-off-by: [email protected] <[email protected]>
1 parent 1c21499 commit 5011e1e

File tree

9 files changed

+188
-151
lines changed

9 files changed

+188
-151
lines changed

‎tck/tck-dist/src/main/assembly/assembly.xml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,27 @@
3434
<source>artifact-install.sh</source>
3535
<outputDirectory>artifacts</outputDirectory>
3636
</file>
37-
<file>
38-
<source>../tck-docs/userguide/target/generated-docs/Jakarta-JSON-Processing-TCK-Users-Guide.pdf</source>
39-
<outputDirectory>docs/pdf-usersguide</outputDirectory>
40-
</file>
41-
<file>
42-
<source>../tck-docs/index.html</source>
43-
<outputDirectory>docs/</outputDirectory>
44-
</file>
45-
<file>
46-
<source>../tck-docs/JSONP2.1-ReleaseNotes.html</source>
47-
<outputDirectory>docs/</outputDirectory>
48-
</file>
4937
</files>
50-
5138
<fileSets>
39+
<fileSet>
40+
<directory>../tck-docs/</directory>
41+
<outputDirectory>docs/</outputDirectory>
42+
<includes>
43+
<include>*.*</include>
44+
</includes>
45+
</fileSet>
46+
<fileSet>
47+
<directory>../tck-docs/userguide/target/generated-docs</directory>
48+
<outputDirectory>docs/pdf-usersguide</outputDirectory>
49+
<includes>
50+
<include>**/*.pdf</include>
51+
</includes>
52+
</fileSet>
5253
<fileSet>
5354
<directory>../tck-docs/assertions</directory>
5455
<outputDirectory>/docs/assertions</outputDirectory>
5556
<includes>
56-
<include>JSONP*avadocAssertions.html</include>
57+
<include>*Assertions.html</include>
5758
</includes>
5859
</fileSet>
5960
<fileSet>

‎tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/ApiCheckDriver.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,17 @@
2727
import java.lang.reflect.Method;
2828
import java.util.LinkedList;
2929
import java.util.List;
30+
import java.util.logging.Logger;
31+
3032

3133

3234
public final class ApiCheckDriver extends SignatureTestDriver
3335
implements Serializable {
3436

37+
38+
private static final Logger LOGGER = Logger.getLogger(ApiCheckDriver.class.getName());
39+
40+
3541
/* flags for the Diff utility argument list */
3642
private static final String BASE_FLAG = "-base";
3743

@@ -129,10 +135,10 @@ protected boolean runPackageSearch(String packageOrClassName,
129135
}
130136

131137
// dump args for debugging aid
132-
System.out.println(
138+
LOGGER.fine(
133139
"\nCalling: com.sun.tdk.signaturetest.SignatureTest() with following args:");
134140
for (int ii = 0; ii < testArguments.length; ii++) {
135-
System.out.println(" testArguments[" + ii + "] = " + testArguments[ii]);
141+
LOGGER.fine(" testArguments[" + ii + "] = " + testArguments[ii]);
136142
}
137143

138144
@SuppressWarnings("unchecked")
@@ -145,9 +151,9 @@ protected boolean runPackageSearch(String packageOrClassName,
145151

146152
// currently, there is no way to determine if there are error msgs in
147153
// the rawmessages, so we will always dump this and call it a status.
148-
System.out.println(
154+
LOGGER.info(
149155
"********** Status Report '" + packageOrClassName + "' **********\n");
150-
System.out.println(rawMessages);
156+
LOGGER.info(rawMessages);
151157
return sigTestInstance.toString().substring(7).startsWith("Passed.");
152158
}
153159

‎tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/PackageList.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
import java.util.List;
3333
import java.util.Set;
3434
import java.util.TreeSet;
35+
import java.util.logging.Logger;
36+
3537

3638
/**
3739
* This class represents a package list file. A package list file is used in
@@ -64,6 +66,9 @@
6466
*/
6567
class PackageList {
6668

69+
private static final Logger LOGGER = Logger.getLogger(PackageList.class.getName());
70+
71+
6772
// Any line in the packageFile starting with this character is a comment
6873
private static final char COMMENT_CHAR = '#';
6974

@@ -219,7 +224,7 @@ private void removeExistingPackage() {
219224
for (int i = 0; i < delPkgs.size(); i++) {
220225
packageName = (String) (delPkgs.get(i));
221226
packageNames.remove(packageName);
222-
System.out.println(
227+
LOGGER.info(
223228
"PackageList.removeExistingPackage() \"" + packageName + "\"");
224229
}
225230
}
@@ -354,8 +359,7 @@ private void writePkgFile() throws Exception {
354359
String packageName = (String) i.next();
355360
out.write(packageName);
356361
out.newLine();
357-
System.out
358-
.println("PackageList.writePkgFile() \"" + packageName + "\"");
362+
LOGGER.info("PackageList.writePkgFile() \"" + packageName + "\"");
359363
}
360364
} finally {
361365
if (out != null) {
@@ -413,18 +417,17 @@ public String getSubPackagesFormatted(String pkgName) {
413417
* Test Driver
414418
*/
415419
public static void main(String[] args) throws Exception {
416-
System.out.println("\n\n*** Creating package list file ***\n\n");
420+
LOGGER.info("\n\n*** Creating package list file ***\n\n");
417421
PackageList list = new PackageList("jakarta.ejb",
418422
"/home/ryano/cts-tools-master/tools/api-check/test/jakarta.ejb.sig_2.1",
419423
"/home/ryano/cts-tools-master/tools/api-check/test/pkg-list.txt");
420424
list.writePkgListFile();
421425

422-
System.out
423-
.println("\n\n*** Reading sub-packages from package list file ***\n\n");
426+
LOGGER.info("\n\n*** Reading sub-packages from package list file ***\n\n");
424427
PackageList readList = new PackageList(
425428
"/home/ryano/cts-tools-master/tools/api-check/test/pkg-list.txt");
426-
System.out.println(Arrays.asList(readList.getSubPackages("jakarta.ejb")));
427-
System.out.println(readList.getSubPackagesFormatted("jakarta.ejb"));
429+
LOGGER.info(readList.getSubPackages("jakarta.ejb").toString());
430+
LOGGER.info(readList.getSubPackagesFormatted("jakarta.ejb").toString());
428431
}
429432

430433
} // end class PackageList

‎tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/Recorder.java

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,13 @@
2828
import java.util.Arrays;
2929
import java.util.Iterator;
3030
import java.util.Properties;
31+
import java.util.logging.Logger;
32+
3133

3234
public abstract class Recorder {
3335

36+
private static final Logger LOGGER = Logger.getLogger(Recorder.class.getName());
37+
3438
protected Properties signatureMap;
3539

3640
protected String packageListFile;
@@ -45,9 +49,9 @@ public abstract class Recorder {
4549

4650
public Recorder(String[] args) {
4751

48-
System.out.println("\nCalling: Recorder with following args:");
52+
LOGGER.info("\nCalling: Recorder with following args:");
4953
for (int ii = 0; ii < args.length; ii++) {
50-
System.out.println(" args[" + ii + "] = " + args[ii]);
54+
LOGGER.info(" args[" + ii + "] = " + args[ii]);
5155
}
5256

5357
Arguments arguments = new Arguments(args);
@@ -78,11 +82,11 @@ public void batchRecord() {
7882
try {
7983

8084
// dump command line args passed to Setup()...
81-
System.out.println("\n\nDUMPING SIGTEST COMMAND LINE: \n");
85+
LOGGER.info("\n\nDUMPING SIGTEST COMMAND LINE: \n");
8286
for (int ii = 0; ii < commandLine.length; ii++) {
83-
System.out.println("commandLine[" + ii + "] = " + commandLine[ii]);
87+
LOGGER.info("commandLine[" + ii + "] = " + commandLine[ii]);
8488
}
85-
System.out.println("\nDONE DUMPING SIGTEST COMMAND LINE. \n\n");
89+
LOGGER.info("\nDONE DUMPING SIGTEST COMMAND LINE. \n\n");
8690

8791
doRecord(commandLine);
8892
} catch (Exception e) {
@@ -92,7 +96,7 @@ public void batchRecord() {
9296
try {
9397
writePackageListFile(basePackageName, outputFileName, packageListFile);
9498
} catch (Exception e) {
95-
System.out.println("Unexpected exception: " + e);
99+
LOGGER.info("Unexpected exception: " + e);
96100
e.printStackTrace();
97101
System.exit(1);
98102
}
@@ -198,12 +202,11 @@ private static class Arguments {
198202

199203
// all 4 arguments must be defined, thus there should be 8 elements
200204
if (args.length != 8) {
201-
System.out
202-
.println("Error - incorrect number of args should be 8 but was: "
205+
LOGGER.info("Error - incorrect number of args should be 8 but was: "
203206
+ args.length);
204-
System.out.println("Args passed in were: ");
207+
LOGGER.info("Args passed in were: ");
205208
for (int ii = 0; ii < args.length; ii++) {
206-
System.out.println("args[" + ii + "] = " + args[ii]);
209+
LOGGER.info("args[" + ii + "] = " + args[ii]);
207210
}
208211

209212
throw new IllegalArgumentException();

‎tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTest.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929

3030
import java.util.ArrayList;
3131
import java.util.Properties;
32+
import java.util.logging.Logger;
33+
3234

3335

3436
/**
@@ -39,6 +41,8 @@
3941
*/
4042
public abstract class SigTest {
4143

44+
private static final Logger LOGGER = Logger.getLogger(SigTest.class.getName());
45+
4246
protected SignatureTestDriver driver;
4347

4448
/**
@@ -179,11 +183,11 @@ protected String[] getClasses() {
179183
*/
180184
public void setup() {
181185
try {
182-
System.out.println("$$$ SigTest.setup() called");
186+
LOGGER.info("$$$ SigTest.setup() called");
183187
this.testInfo = new SigTestData();
184-
System.out.println("$$$ SigTest.setup() complete");
188+
LOGGER.info("$$$ SigTest.setup() complete");
185189
} catch (Exception e) {
186-
System.out.println("Unexpected exception " + e.getMessage());
190+
LOGGER.info("Unexpected exception " + e.getMessage());
187191
//throw new Fault("setup failed!", e);
188192
}
189193
}
@@ -198,10 +202,10 @@ public void setup() {
198202
* When an error occurs cleaning up the state of this test.
199203
*/
200204
public void cleanup() throws Fault {
201-
System.out.println("$$$ SigTest.cleanup() called");
205+
LOGGER.info("$$$ SigTest.cleanup() called");
202206
try {
203207
getSigTestDriver().cleanupImpl();
204-
System.out.println("$$$ SigTest.cleanup() returning");
208+
LOGGER.info("$$$ SigTest.cleanup() returning");
205209
} catch (Exception e) {
206210
throw new Fault("Cleanup failed!", e);
207211
}
@@ -217,7 +221,7 @@ public static class Fault extends Exception {
217221
*/
218222
public Fault(String msg) {
219223
super(msg);
220-
System.out.println(msg);
224+
LOGGER.info(msg);
221225
}
222226

223227
/**
@@ -231,7 +235,7 @@ public Fault(String msg) {
231235
public Fault(String msg, Throwable t) {
232236
super(msg);
233237
this.t = t;
234-
// System.out.println(msg, t);
238+
// LOGGER.info(msg, t);
235239
}
236240

237241
/**

‎tck/tck-tests/src/main/java/jakarta/jsonp/tck/signaturetest/SigTestDriver.java

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import java.lang.reflect.Method;
2323
import java.util.ArrayList;
2424
import java.util.List;
25+
import java.util.logging.Logger;
26+
2527

2628

2729
/**
@@ -31,6 +33,9 @@
3133
*/
3234
public class SigTestDriver extends SignatureTestDriver {
3335

36+
private static final Logger LOGGER = Logger.getLogger(SigTestDriver.class.getName());
37+
38+
3439
private static final String CLASSPATH_FLAG = "-Classpath";
3540

3641
private static final String FILENAME_FLAG = "-FileName";
@@ -108,7 +113,7 @@ protected String[] createTestArguments(String packageListFile, String mapFile,
108113
if (bStaticMode) {
109114
// static mode allows finer level of constants checking
110115
// -CheckValue says to check the actual const values
111-
System.out.println("Setting static mode flag to allow constant checking.");
116+
LOGGER.info("Setting static mode flag to allow constant checking.");
112117
command.add(STATIC_FLAG);
113118
command.add(CHECKVALUE_FLAG);
114119

@@ -119,7 +124,7 @@ protected String[] createTestArguments(String packageListFile, String mapFile,
119124
// command.add("bin");
120125
command.add("src");
121126
} else {
122-
System.out.println("Not Setting static mode flag to allow constant checking.");
127+
LOGGER.info("Not Setting static mode flag to allow constant checking.");
123128
}
124129

125130
command.add("-Verbose");
@@ -162,10 +167,10 @@ protected boolean runSignatureTest(String packageOrClassName,
162167
ByteArrayOutputStream output = new ByteArrayOutputStream();
163168

164169
// do some logging to help with troubleshooting
165-
System.out.println(
170+
LOGGER.info(
166171
"\nCalling: com.sun.tdk.signaturetest.SignatureTest() with following args:");
167172
for (int ii = 0; ii < testArguments.length; ii++) {
168-
System.out.println(" testArguments[" + ii + "] = " + testArguments[ii]);
173+
LOGGER.info(" testArguments[" + ii + "] = " + testArguments[ii]);
169174
}
170175

171176
@SuppressWarnings("unchecked")
@@ -178,9 +183,9 @@ protected boolean runSignatureTest(String packageOrClassName,
178183

179184
// currently, there is no way to determine if there are error msgs in
180185
// the rawmessages, so we will always dump this and call it a status.
181-
System.out.println(
186+
LOGGER.info(
182187
"********** Status Report '" + packageOrClassName + "' **********\n");
183-
System.out.println(rawMessages);
188+
LOGGER.info(rawMessages);
184189

185190
return sigTestInstance.toString().substring(7).startsWith("Passed.");
186191
} // END runSignatureTest
@@ -207,10 +212,10 @@ protected boolean runPackageSearch(String packageOrClassName,
207212
}
208213

209214
// dump args for debugging aid
210-
System.out.println(
215+
LOGGER.info(
211216
"\nCalling: com.sun.tdk.signaturetest.SignatureTest() with following args:");
212217
for (int ii = 0; ii < testArguments.length; ii++) {
213-
System.out.println(" testArguments[" + ii + "] = " + testArguments[ii]);
218+
LOGGER.info(" testArguments[" + ii + "] = " + testArguments[ii]);
214219
}
215220

216221
@SuppressWarnings("unchecked")
@@ -223,9 +228,9 @@ protected boolean runPackageSearch(String packageOrClassName,
223228

224229
// currently, there is no way to determine if there are error msgs in
225230
// the rawmessages, so we will always dump this and call it a status.
226-
System.out.println(
231+
LOGGER.info(
227232
"********** Status Report '" + packageOrClassName + "' **********\n");
228-
System.out.println(rawMessages);
233+
LOGGER.info(rawMessages);
229234

230235
return sigTestInstance.toString().substring(7).startsWith("Passed.");
231236
}
@@ -236,7 +241,7 @@ protected boolean runPackageSearch(String packageOrClassName,
236241
*/
237242
protected boolean verifyJTAJarForNoXA(String classpath, String repositoryDir) throws Exception {
238243

239-
System.out.println("SigTestDriver#verifyJTAJarForNoXA - Starting:");
244+
LOGGER.info("SigTestDriver#verifyJTAJarForNoXA - Starting:");
240245
boolean result = false;
241246
List command = new ArrayList();
242247

@@ -252,9 +257,9 @@ protected boolean verifyJTAJarForNoXA(String classpath, String repositoryDir) th
252257
String testArguments [] = (String[]) command.toArray(new String[command.size()]);
253258

254259
// do some logging to help with troubleshooting
255-
System.out.println("\nCalling: com.sun.tdk.signaturetest.SignatureTest() with following args:");
260+
LOGGER.info("\nCalling: com.sun.tdk.signaturetest.SignatureTest() with following args:");
256261
for (int ii=0; ii < testArguments.length; ii++) {
257-
System.out.println(" testArguments[" +ii+ "] = " + testArguments[ii]);
262+
LOGGER.info(" testArguments[" +ii+ "] = " + testArguments[ii]);
258263
}
259264

260265
Class sigTestClass = Class.forName("com.sun.tdk.signaturetest.SignatureTest");
@@ -274,8 +279,8 @@ protected boolean verifyJTAJarForNoXA(String classpath, String repositoryDir) th
274279

275280
// currently, there is no way to determine if there are error msgs in
276281
// the rawmessages, so we will always dump this and call it a status.
277-
System.out.println("********** Status Report JTA JAR validation **********\n");
278-
System.out.println(rawMessages);
282+
LOGGER.info("********** Status Report JTA JAR validation **********\n");
283+
LOGGER.info(rawMessages);
279284
return sigTestInstance.toString().substring(7).startsWith("Passed.");
280285
}
281286
}

0 commit comments

Comments
 (0)