onobc commented on code in PR #18358:
URL: https://github.com/apache/pulsar/pull/18358#discussion_r1021114265
##########
pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ClientConfigurationDataTest.java:
##########
@@ -18,38 +18,102 @@
*/
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.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}.
+ * Unit tests for {@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 testGetAuthWhenSetFromPropsUsingAuthParams() {
+ ClientConfigurationData conf = new ClientConfigurationData();
+ conf.setAuthPluginClassName(BASIC_AUTH_PLUGIN_CLASS);
+ conf.setAuthParams(basicAuthParams("user1", "pass1"));
+ assertThatConfHasBasicAuth(conf, "user1", "pass1");
+ }
+
+ @Test
+ public void testGetAuthWhenSetFromPropsUsingAuthParamMap() {
+ ClientConfigurationData conf = new ClientConfigurationData();
+ conf.setAuthPluginClassName(BASIC_AUTH_PLUGIN_CLASS);
+ conf.setAuthParamMap(basicAuthParamMap("user1", "pass1"));
+ assertThatConfHasBasicAuth(conf, "user1", "pass1");
+ }
+
+ @Test
+ public void testGetAuthWhenSetFromPropsWithAllPropsAvailable() {
+ ClientConfigurationData conf = new ClientConfigurationData();
+ conf.setAuthPluginClassName(BASIC_AUTH_PLUGIN_CLASS);
+ conf.setAuthParams(basicAuthParams("user1", "pass1"));
+ conf.setAuthParamMap(basicAuthParamMap("user2", "pass2"));
+ assertThatConfHasBasicAuth(conf, "user1", "pass1");
+ }
+
+ private void assertThatConfHasBasicAuth(ClientConfigurationData conf,
String userId, String password) {
+ assertThat(conf.getAuthentication())
+ .isInstanceOf(AuthenticationBasic.class)
+ .hasFieldOrPropertyWithValue("userId", userId)
Review Comment:
@nodece the latest commit uses a local mock auth instead of basic auth. Its
a bit more code but I think its worth not relying on one of the auth impls as
well as not having to expose the fields of one of the auth impls. Lmk what you
think. If you want to go back to basic auth I can revert the commit.
--
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]
