[GitHub] storm pull request #2698: STORM-2882: shade storm-client dependencies

[revans2]

Github user revans2 commented on a diff in the pull request:

    https://github.com/apache/storm/pull/2698#discussion_r193081199
  
    --- Diff: 
storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java 
---
    @@ -172,59 +178,47 @@ public void makeDigestPayloadTest() throws 
NoSuchAlgorithmException {
         public void invalidConfigResultsInIOException() throws 
RuntimeException {
             HashMap<String, Object> conf = new HashMap<>();
             conf.put("java.security.auth.login.config", "__FAKE_FILE__");
    -        Assert.assertNotNull(AuthUtils.GetConfiguration(conf));
    +        Assert.assertNotNull(ClientAuthUtils.getConfiguration(conf));
         }
     
         @Test
         public void validConfigResultsInNotNullConfigurationTest() throws 
IOException {
             File file1 = folder.newFile("mockfile.txt");
             HashMap<String, Object> conf = new HashMap<>();
             conf.put("java.security.auth.login.config", 
file1.getAbsolutePath());
    -        Assert.assertNotNull(AuthUtils.GetConfiguration(conf));
    -    }
    -
    -    @Test
    -    public void uiHttpCredentialsPluginTest() {
    -        Map<String, Object> conf = new HashMap<>();
    -        conf.put(
    -            Config.UI_HTTP_CREDS_PLUGIN,
    -            "org.apache.storm.security.auth.AuthUtilsTestMock");
    -        conf.put(
    -            Config.DRPC_HTTP_CREDS_PLUGIN,
    -            "org.apache.storm.security.auth.AuthUtilsTestMock");
    -        conf.put(
    -            Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN,
    -            "org.apache.storm.security.auth.AuthUtilsTestMock");
    -        conf.put(
    -            Config.STORM_GROUP_MAPPING_SERVICE_PROVIDER_PLUGIN,
    -            "org.apache.storm.security.auth.AuthUtilsTestMock");
    -
    -        Assert.assertTrue(
    -            AuthUtils.GetUiHttpCredentialsPlugin(conf).getClass() == 
AuthUtilsTestMock.class);
    -        Assert.assertTrue(
    -            AuthUtils.GetDrpcHttpCredentialsPlugin(conf).getClass() == 
AuthUtilsTestMock.class);
    -        Assert.assertTrue(
    -            AuthUtils.GetPrincipalToLocalPlugin(conf).getClass() == 
AuthUtilsTestMock.class);
    -        Assert.assertTrue(
    -            
AuthUtils.GetGroupMappingServiceProviderPlugin(conf).getClass() == 
AuthUtilsTestMock.class);
    +        Assert.assertNotNull(ClientAuthUtils.getConfiguration(conf));
         }
     
         @Test(expected = RuntimeException.class)
         public void updateSubjectWithNullThrowsTest() {
    -        AuthUtils.updateSubject(null, null, null);
    +        ClientAuthUtils.updateSubject(null, null, null);
         }
     
         @Test(expected = RuntimeException.class)
         public void updateSubjectWithNullAutosThrowsTest() {
    -        AuthUtils.updateSubject(new Subject(), null, null);
    +        ClientAuthUtils.updateSubject(new Subject(), null, null);
         }
     
         @Test
         public void updateSubjectWithNullAutosTest() {
             AuthUtilsTestMock mock = Mockito.mock(AuthUtilsTestMock.class);
             Collection<IAutoCredentials> autos = Arrays.asList(new 
IAutoCredentials[]{ mock });
             Subject s = new Subject();
    -        AuthUtils.updateSubject(s, autos, null);
    +        ClientAuthUtils.updateSubject(s, autos, null);
             Mockito.verify(mock, Mockito.times(1)).updateSubject(s, null);
         }
    +
    +    @Test
    +    public void uiHttpCredentialsPluginTest() {
    --- End diff --
    
    It used to be, but not any more.  I'll fix it.


---