onobc commented on code in PR #18358:
URL: https://github.com/apache/pulsar/pull/18358#discussion_r1017401563
##########
pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ClientConfigurationDataTest.java:
##########
@@ -18,38 +18,109 @@
*/
package org.apache.pulsar.client.impl.conf;
+import static org.assertj.core.api.Assertions.assertThat;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
import com.fasterxml.jackson.databind.SerializationFeature;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.client.impl.auth.AuthenticationBasic;
+import org.apache.pulsar.client.impl.auth.AuthenticationDisabled;
import org.apache.pulsar.client.impl.auth.AuthenticationToken;
-import org.testng.Assert;
import org.testng.annotations.Test;
/**
* Unit test {@link ClientConfigurationData}.
*/
public class ClientConfigurationDataTest {
- private final ObjectWriter w;
-
- {
- ObjectMapper m = new ObjectMapper();
- m.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
- w = m.writer();
- }
-
+ private static final String BASIC_AUTH_PLUGIN_CLASS =
AuthenticationBasic.class.getName();
@Test
public void testDoNotPrintSensitiveInfo() throws JsonProcessingException {
ClientConfigurationData clientConfigurationData = new
ClientConfigurationData();
clientConfigurationData.setTlsTrustStorePassword("xxxx");
clientConfigurationData.setSocks5ProxyPassword("yyyy");
clientConfigurationData.setAuthentication(new
AuthenticationToken("zzzz"));
- String s = w.writeValueAsString(clientConfigurationData);
- Assert.assertFalse(s.contains("xxxx"));
- Assert.assertFalse(s.contains("yyyy"));
- Assert.assertFalse(s.contains("zzzz"));
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS,
false);
+ String serializedConf =
objectMapper.writeValueAsString(clientConfigurationData);
+ assertThat(serializedConf).doesNotContain("xxxx", "yyyy", "zzzz");
+ }
+
+ @Test
+ public void testSetAuthFromPropsUsingAuthParams() throws
PulsarClientException {
+ ClientConfigurationData conf = new ClientConfigurationData();
+ conf.setAuthPluginClassName(BASIC_AUTH_PLUGIN_CLASS);
+ conf.setAuthParams(basicAuthParams("user1", "pass1"));
+ conf.setAuthenticationFromPropsIfAvailable();
+ assertThatConfHasBasicAuth(conf, "user1", "pass1");
+ }
+
+ @Test
+ public void testSetAuthFromPropsUsingAuthParamMap() throws
PulsarClientException {
+ ClientConfigurationData conf = new ClientConfigurationData();
+ conf.setAuthPluginClassName(BASIC_AUTH_PLUGIN_CLASS);
+ conf.setAuthParamMap(basicAuthParamMap("user1", "pass1"));
+ conf.setAuthenticationFromPropsIfAvailable();
+ assertThatConfHasBasicAuth(conf, "user1", "pass1");
+ }
+
+ @Test
+ public void testSetAuthFromPropsWithAllPropsAvailable() throws
PulsarClientException {
+ ClientConfigurationData conf = new ClientConfigurationData();
+ conf.setAuthPluginClassName(BASIC_AUTH_PLUGIN_CLASS);
+ conf.setAuthParams(basicAuthParams("user1", "pass1"));
+ conf.setAuthParamMap(basicAuthParamMap("user2", "pass2"));
+ conf.setAuthenticationFromPropsIfAvailable();
+ assertThatConfHasBasicAuth(conf, "user1", "pass1");
+ }
+
+ private void assertThatConfHasBasicAuth(ClientConfigurationData conf,
String userId, String password) {
+ assertThat(conf.getAuthentication())
+ .isInstanceOf(AuthenticationBasic.class)
+ .hasFieldOrPropertyWithValue("userId", userId)
+ .hasFieldOrPropertyWithValue("password", password);
+ }
+
+ @Test
+ public void testSetAuthFromPropsWithNoPropsAvailable() throws
PulsarClientException {
+ ClientConfigurationData conf = new ClientConfigurationData();
+ conf.setAuthenticationFromPropsIfAvailable();
+ assertThatConfHasNoAuth(conf);
+ }
+
+ @Test
+ public void testSetAuthFromPropsWithOnlyPluginClassNameAvailable() throws
PulsarClientException {
+ ClientConfigurationData conf = new ClientConfigurationData();
+ conf.setAuthPluginClassName(BASIC_AUTH_PLUGIN_CLASS);
+ conf.setAuthenticationFromPropsIfAvailable();
+ assertThatConfHasNoAuth(conf);
+ }
+
+ @Test
+ public void testSetAuthFromPropsWithNoPluginClassNameAvailable() throws
PulsarClientException {
+ ClientConfigurationData conf = new ClientConfigurationData();
+ conf.setAuthParams(basicAuthParams("user1", "pass1"));
+ conf.setAuthenticationFromPropsIfAvailable();
+ assertThatConfHasNoAuth(conf);
+ }
+
+ private void assertThatConfHasNoAuth(ClientConfigurationData conf) {
+ // getAuthentication() returns disabled when null
+
assertThat(conf.getAuthentication()).isInstanceOf(AuthenticationDisabled.class);
+ }
+
+ private String basicAuthParams(String userId, String password) {
Review Comment:
I am aware that `userId/password` is always `user1/pass1`. However, I left
it as such for readability in the test cases. I find that
```java
conf.setAuthParams(basicAuthParams("user1", "pass1"));
assertThatConfHasBasicAuth("user1", "pass1");
```
is easier to resonate w/ than:
```java
conf.setAuthParams(BASIC_AUTH_PARAMS);
assertThatConfHasBasicAuth();
```
especially when the testing is focusing on what happens when we set these
differing auth properties.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
