cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhtyd <...@git.apache.org>
Subject [GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Date Thu, 01 Dec 2016 09:03:23 GMT
Github user rhtyd commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/1799#discussion_r90405628
  
    --- Diff: server/test/org/apache/cloudstack/network/lb/CertServiceTest.java ---
    @@ -245,48 +245,48 @@ public void runUploadSslCertSelfSignedNoPassword() throws Exception
{
         public void runUploadSslCertBadChain() throws IOException, IllegalAccessException,
NoSuchFieldException {
             Assume.assumeTrue(isOpenJdk() || isJCEInstalled());
     
    -        String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.crt").getFile(),Charset.defaultCharset().name());
    -        String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.key").getFile(),Charset.defaultCharset().name());
    -        String chainFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.crt").getFile(),Charset.defaultCharset().name());
    +        final String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.crt").getFile(),Charset.defaultCharset().name());
    +        final String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.key").getFile(),Charset.defaultCharset().name());
    +        final String chainFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.crt").getFile(),Charset.defaultCharset().name());
     
    -        String cert = readFileToString(new File(certFile));
    -        String key = readFileToString(new File(keyFile));
    -        String chain = readFileToString(new File(chainFile));
    +        final String cert = readFileToString(new File(certFile));
    +        final String key = readFileToString(new File(keyFile));
    +        final String chain = readFileToString(new File(chainFile));
     
    -        CertServiceImpl certService = new CertServiceImpl();
    +        final CertServiceImpl certService = new CertServiceImpl();
     
             //setting mock objects
             certService._accountMgr = Mockito.mock(AccountManager.class);
    -        Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0,
UUID.randomUUID().toString());
    +        final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0,
UUID.randomUUID().toString());
             when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
     
             certService._domainDao = Mockito.mock(DomainDao.class);
    -        DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
    +        final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
             when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
     
             certService._sslCertDao = Mockito.mock(SslCertDao.class);
             when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO());
     
             //creating the command
    -        UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
    -        Class<?> _class = uploadCmd.getClass().getSuperclass();
    +        final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
    +        final Class<?> klazz = uploadCmd.getClass().getSuperclass();
     
    -        Field certField = _class.getDeclaredField("cert");
    +        final Field certField = klazz.getDeclaredField("cert");
             certField.setAccessible(true);
             certField.set(uploadCmd, cert);
     
    -        Field keyField = _class.getDeclaredField("key");
    +        final Field keyField = klazz.getDeclaredField("key");
             keyField.setAccessible(true);
             keyField.set(uploadCmd, key);
     
    -        Field chainField = _class.getDeclaredField("chain");
    +        final Field chainField = klazz.getDeclaredField("chain");
             chainField.setAccessible(true);
             chainField.set(uploadCmd, chain);
     
             try {
                 certService.uploadSslCert(uploadCmd);
                 fail("The chain given is not the correct chain for the certificate");
    -        } catch (Exception e) {
    +        } catch (final Exception e) {
    --- End diff --
    
    `@Test` annotation does not allow for validating the exception message without using any
`Rule`.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message