@@ -74,7 +74,7 @@ public void testBadFileFormatFails() throws Exception {
7474 Files .write (ca , generateRandomByteArrayOfLength (128 ), StandardOpenOption .APPEND );
7575 final PemTrustConfig trustConfig = new PemTrustConfig (Collections .singletonList (ca ));
7676 assertThat (trustConfig .getDependentFiles (), Matchers .containsInAnyOrder (ca ));
77- assertFailedToParse (trustConfig , ca );
77+ assertFailedToParseOrInvalidFileFormat (trustConfig , ca );
7878 }
7979
8080 public void testEmptyFileFails () throws Exception {
@@ -121,34 +121,38 @@ public void testTrustConfigReloadsFileContents() throws Exception {
121121 assertFileNotFound (trustConfig , ca1 );
122122
123123 Files .write (ca1 , generateRandomByteArrayOfLength (128 ), StandardOpenOption .CREATE );
124+ assertFailedToParseOrInvalidFileFormat (trustConfig , ca1 );
125+ }
126+
127+ private void assertCertificateChain (PemTrustConfig trustConfig , String ... caNames ) {
128+ final X509ExtendedTrustManager trustManager = trustConfig .createTrustManager ();
129+ final X509Certificate [] issuers = trustManager .getAcceptedIssuers ();
130+ final Set <String > issuerNames = Stream .of (issuers )
131+ .map (X509Certificate ::getSubjectDN )
132+ .map (Principal ::getName )
133+ .collect (Collectors .toSet ());
134+
135+ assertThat (issuerNames , Matchers .containsInAnyOrder (caNames ));
136+ }
137+
138+ private void assertFailedToParseOrInvalidFileFormat (PemTrustConfig trustConfig , Path file ) {
124139 boolean isFailedToParse = false ;
125140 boolean isInvalidFileFormat = false ;
126141 try {
127- assertFailedToParse (trustConfig , ca1 );
142+ assertFailedToParse (trustConfig , file );
128143 isFailedToParse = true ;
129144 } catch (Throwable t ) {
130145 // do nothing
131146 }
132147 try {
133- assertInvalidFileFormat (trustConfig , ca1 );
148+ assertInvalidFileFormat (trustConfig , file );
134149 isInvalidFileFormat = true ;
135150 } catch (Throwable t ) {
136151 // do nothing
137152 }
138153 assert isFailedToParse || isInvalidFileFormat ;
139154 }
140155
141- private void assertCertificateChain (PemTrustConfig trustConfig , String ... caNames ) {
142- final X509ExtendedTrustManager trustManager = trustConfig .createTrustManager ();
143- final X509Certificate [] issuers = trustManager .getAcceptedIssuers ();
144- final Set <String > issuerNames = Stream .of (issuers )
145- .map (X509Certificate ::getSubjectDN )
146- .map (Principal ::getName )
147- .collect (Collectors .toSet ());
148-
149- assertThat (issuerNames , Matchers .containsInAnyOrder (caNames ));
150- }
151-
152156 private void assertFailedToParse (PemTrustConfig trustConfig , Path file ) {
153157 final SslConfigException exception = expectThrows (SslConfigException .class , trustConfig ::createTrustManager );
154158 logger .info ("failure" , exception );
0 commit comments