@@ -58,7 +58,7 @@ public class DebugPropertyValuesTest extends SSLSocketTemplate {
5858 debugMessages .put ("handshake" ,
5959 List .of ("Produced ClientHello handshake message" ,
6060 "supported_versions" ));
61- debugMessages .put ("keymanager" , List .of ("choosing key:" ));
61+ debugMessages .put ("keymanager" , List .of ("Choosing key:" ));
6262 debugMessages .put ("packet" , List .of ("Raw write" ));
6363 debugMessages .put ("plaintext" ,
6464 List .of ("Plaintext before ENCRYPTION" ));
@@ -108,30 +108,30 @@ private static Stream<Arguments> patternMatches() {
108108 return Stream .of (
109109 // all should print everything
110110 Arguments .of (List .of ("-Djavax.net.debug=all" ),
111- List .of ("handshake" , "ssl, keymanager" , "packet" ,
111+ List .of ("handshake" , "keymanager" , "packet" ,
112112 "plaintext" , "record" , "session" , "ssl" ,
113113 "sslctx" , "trustmanager" , "verbose" )),
114114 // ssl should print most details except verbose details
115115 Arguments .of (List .of ("-Djavax.net.debug=ssl" ),
116- List .of ("handshake" , "ssl, keymanager" ,
116+ List .of ("handshake" , "keymanager" ,
117117 "record" , "session" , "ssl" ,
118118 "sslctx" , "trustmanager" , "verbose" )),
119119 // allow expand option for more verbose output
120120 Arguments .of (
121121 List .of ("-Djavax.net.debug=ssl,handshake,expand" ),
122122 List .of ("handshake" , "handshake-expand" ,
123- "ssl, keymanager" , "record" , "session" ,
123+ "keymanager" , "record" , "session" ,
124124 "record-expand" , "ssl" , "sslctx" ,
125125 "trustmanager" , "verbose" )),
126126 // filtering on record option, with expand
127127 Arguments .of (List .of ("-Djavax.net.debug=ssl:record,expand" ),
128128 List .of ("handshake" , "handshake-expand" ,
129- "ssl, keymanager" , "record" , "record-expand" ,
129+ "keymanager" , "record" , "record-expand" ,
130130 "session" , "ssl" , "sslctx" , "trustmanager" ,
131131 "verbose" )),
132132 // this test is equivalent to ssl:record mode
133133 Arguments .of (List .of ("-Djavax.net.debug=ssl,record" ),
134- List .of ("handshake" , "ssl, keymanager" , "record" ,
134+ List .of ("handshake" , "keymanager" , "record" ,
135135 "session" , "ssl" , "sslctx" ,
136136 "trustmanager" , "verbose" )),
137137 // example of test where no "ssl" value is passed
@@ -144,26 +144,26 @@ private static Stream<Arguments> patternMatches() {
144144 List .of ("record" )),
145145 // ignore bad sub-option. treat like "ssl"
146146 Arguments .of (List .of ("-Djavax.net.debug=ssl,typo" ),
147- List .of ("handshake" , "ssl, keymanager" ,
147+ List .of ("handshake" , "keymanager" ,
148148 "record" , "session" , "ssl" ,
149149 "sslctx" , "trustmanager" , "verbose" )),
150150 // ssltypo contains "ssl". Treat like "ssl"
151151 Arguments .of (List .of ("-Djavax.net.debug=ssltypo" ),
152- List .of ("handshake" , "ssl, keymanager" ,
152+ List .of ("handshake" , "keymanager" ,
153153 "record" , "session" , "ssl" ,
154154 "sslctx" , "trustmanager" , "verbose" )),
155155 // plaintext is valid for record option
156156 Arguments .of (
157157 List .of ("-Djavax.net.debug=ssl:record:plaintext" ),
158- List .of ("handshake" , "ssl, keymanager" , "plaintext" ,
158+ List .of ("handshake" , "keymanager" , "plaintext" ,
159159 "record" , "session" , "ssl" ,
160160 "sslctx" , "trustmanager" , "verbose" )),
161161 Arguments .of (List .of ("-Djavax.net.debug=ssl:trustmanager" ),
162- List .of ("handshake" , "ssl, keymanager" , "record" ,
162+ List .of ("handshake" , "keymanager" , "record" ,
163163 "session" , "ssl" , "sslctx" , "trustmanager" ,
164164 "verbose" )),
165165 Arguments .of (List .of ("-Djavax.net.debug=ssl:sslctx" ),
166- List .of ("handshake" , "ssl, keymanager" , "record" ,
166+ List .of ("handshake" , "keymanager" , "record" ,
167167 "session" , "ssl" , "sslctx" , "trustmanager" ,
168168 "verbose" )),
169169 // help message test. Should exit without running test
@@ -173,13 +173,13 @@ private static Stream<Arguments> patternMatches() {
173173 Arguments .of (List .of ("-Djavax.net.debug=ssl:trustmanager" ,
174174 "-Djava.security.debug=all" ),
175175 List .of ("handshake" , "java.security.debug" ,
176- "ssl, keymanager" , "record" , "session" , "ssl" ,
176+ "keymanager" , "record" , "session" , "ssl" ,
177177 "sslctx" , "trustmanager" , "verbose" )),
178178 // empty invokes System.Logger use
179179 Arguments .of (List .of ("-Djavax.net.debug" ,
180180 "-Djava.util.logging.config.file=" + LOG_FILE ),
181181 List .of ("handshake" , "javax.net.debug.logger" ,
182- "ssl, keymanager" , "packet" , "plaintext" ,
182+ "keymanager" , "packet" , "plaintext" ,
183183 "record" , "session" , "ssl" ,
184184 "sslctx" , "trustmanager" , "verbose" ))
185185 );
0 commit comments