From f98fd9563b054d7fa3d9e7c876f3db3e3472ae59 Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Fri, 8 Dec 2017 13:38:22 -0500 Subject: [PATCH] Remove duplicate userAgent string Fixes: #135 --- .../okta/sdk/impl/http/support/UserAgent.java | 5 ++--- .../impl/http/support/UserAgentTest.groovy | 20 +++++++++++++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/impl/src/main/java/com/okta/sdk/impl/http/support/UserAgent.java b/impl/src/main/java/com/okta/sdk/impl/http/support/UserAgent.java index 96d0a5cb10d..c08bf70eb83 100644 --- a/impl/src/main/java/com/okta/sdk/impl/http/support/UserAgent.java +++ b/impl/src/main/java/com/okta/sdk/impl/http/support/UserAgent.java @@ -130,9 +130,8 @@ public static String getUserAgentString() { private static String createUserAgentString() { String userAgent = getIntegrationString() + // okta-shiro | okta-spring-security - getOktaSDKComponentsString() + // okta-servlet-java | okta-spring-boot-starter - getOktaSdkString() + // okta-sdk-java - getOktaSdkString() + // okta-oktagration + getOktaSDKComponentsString() + // okta-servlet-java | okta-spring-boot-starter + getOktaSdkString() + // okta-sdk-java getSecurityFrameworkString() + // shiro | spring-security getIntegrationRuntimeString() + // spring getSpringBootString() + // spring-boot diff --git a/impl/src/test/groovy/com/okta/sdk/impl/http/support/UserAgentTest.groovy b/impl/src/test/groovy/com/okta/sdk/impl/http/support/UserAgentTest.groovy index eae5ed28cd9..213c336709a 100644 --- a/impl/src/test/groovy/com/okta/sdk/impl/http/support/UserAgentTest.groovy +++ b/impl/src/test/groovy/com/okta/sdk/impl/http/support/UserAgentTest.groovy @@ -15,22 +15,30 @@ */ package com.okta.sdk.impl.http.support -import com.okta.sdk.lang.Assert +import com.okta.sdk.lang.Strings import org.testng.annotations.Test +import static org.hamcrest.MatcherAssert.assertThat +import static org.hamcrest.Matchers.* + /** * @since 0.5.0 */ class UserAgentTest { - private static final String VERSION_SEPARATOR = "/"; - private static final String ENTRY_SEPARATOR = " "; + private static final String VERSION_SEPARATOR = "/" + private static final String ENTRY_SEPARATOR = " " + private static final String SDK_KEY = "okta-sdk-java" @Test void testGetUserAgentString() { + String userAgent = UserAgent.getUserAgentString() - Assert.hasText(userAgent) - Assert.isTrue(userAgent.contains("okta-sdk-java" + VERSION_SEPARATOR + Version.getClientVersion() + ENTRY_SEPARATOR)) - Assert.isTrue(userAgent.contains("java" + VERSION_SEPARATOR + System.getProperty("java.version") + ENTRY_SEPARATOR)) + assertThat userAgent, allOf( + not(emptyString()), + containsString(SDK_KEY + VERSION_SEPARATOR + Version.getClientVersion() + ENTRY_SEPARATOR), + containsString("java" + VERSION_SEPARATOR + System.getProperty("java.version") + ENTRY_SEPARATOR) + ) + assertThat "Expected '${SDK_KEY}' to appear in userAgent once once.", Strings.countOccurrencesOf(userAgent, SDK_KEY), equalTo(1) } }