Skip to content

Commit 6287914

Browse files
committed
Removed logVerbosity from tests
1 parent 703ff47 commit 6287914

File tree

14 files changed

+11
-30
lines changed

14 files changed

+11
-30
lines changed

pubnub-gson/pubnub-gson-docs/src/main/java/com/pubnub/docs/presence/HereNowApp.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import com.pubnub.api.PubNubException;
66
import com.pubnub.api.UserId;
7-
import com.pubnub.api.enums.PNLogVerbosity;
87
import com.pubnub.api.java.PubNub;
98
import com.pubnub.api.java.v2.PNConfiguration;
109
import com.pubnub.api.models.consumer.presence.PNHereNowChannelData;

pubnub-gson/pubnub-gson-impl/src/integrationTest/java/com/pubnub/api/integration/managers/subscription/ReconnectionProblemWithoutRetryConfigurationIT.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
import java.util.UUID;
1010

11-
import static com.pubnub.api.enums.PNLogVerbosity.BODY;
12-
13-
1411
public class ReconnectionProblemWithoutRetryConfigurationIT extends AbstractReconnectionProblemIT {
1512
@Override
1613
protected @NotNull PubNub privilegedClientPubNub() {

pubnub-gson/pubnub-gson-impl/src/integrationTest/java/com/pubnub/api/integration/objects/ObjectsApiBaseIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.pubnub.api.PubNubException;
44
import com.pubnub.api.UserId;
5-
import com.pubnub.api.enums.PNLogVerbosity;
65
import com.pubnub.api.integration.util.ITTestConfig;
76
import com.pubnub.api.java.PubNub;
87
import com.pubnub.api.java.v2.PNConfiguration;

pubnub-gson/pubnub-gson-impl/src/integrationTest/java/com/pubnub/api/integration/pam/GrantTokenIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.pubnub.api.PubNubException;
44
import com.pubnub.api.UserId;
5-
import com.pubnub.api.enums.PNLogVerbosity;
65
import com.pubnub.api.integration.util.BaseIntegrationTest;
76
import com.pubnub.api.java.PubNub;
87
import com.pubnub.api.java.SpaceId;

pubnub-gson/pubnub-gson-impl/src/integrationTest/java/com/pubnub/api/integration/util/BaseIntegrationTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
import com.pubnub.api.PubNubError;
55
import com.pubnub.api.PubNubException;
66
import com.pubnub.api.UserId;
7-
import com.pubnub.api.enums.PNLogVerbosity;
87
import com.pubnub.api.enums.PNStatusCategory;
98
import com.pubnub.api.java.PubNub;
109
import com.pubnub.api.java.callbacks.SubscribeCallback;
1110
import com.pubnub.api.java.v2.PNConfiguration;
1211
import com.pubnub.api.models.consumer.PNStatus;
1312
import com.pubnub.api.retry.RetryConfiguration;
14-
import okhttp3.logging.HttpLoggingInterceptor;
1513
import org.aeonbits.owner.ConfigFactory;
1614
import org.awaitility.Awaitility;
1715
import org.awaitility.Durations;
@@ -23,8 +21,6 @@
2321
import org.junit.After;
2422
import org.junit.Before;
2523
import org.junit.BeforeClass;
26-
import org.slf4j.Logger;
27-
import org.slf4j.LoggerFactory;
2824

2925
import java.time.Duration;
3026
import java.util.ArrayList;
@@ -146,7 +142,6 @@ private PNConfiguration getBasicPnConfiguration(@Nullable Consumer<PNConfigurati
146142
throw new RuntimeException(e);
147143
}
148144
pnConfiguration.retryConfiguration(RetryConfiguration.None.INSTANCE);
149-
pnConfiguration.logVerbosity(PNLogVerbosity.NONE);
150145
if (action != null) {
151146
action.accept(pnConfiguration);
152147
}
@@ -162,7 +157,6 @@ private PNConfiguration getServerPnConfiguration(@Nullable Consumer<PNConfigurat
162157
}
163158
pnConfiguration.publishKey(PAM_PUB_KEY);
164159
pnConfiguration.secretKey(PAM_SEC_KEY);
165-
pnConfiguration.logVerbosity(PNLogVerbosity.NONE);
166160
if (action != null) {
167161
action.accept(pnConfiguration);
168162
}

pubnub-kotlin/pubnub-kotlin-api/src/jsMain/kotlin/com/pubnub/api/PubNubImpl.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ class PubNubImpl(val jsPubNub: PubNubJs) : PubNub {
146146
subscribeKey = jsPubNub.asDynamic().configuration.subscribeKey,
147147
publishKey = jsPubNub.asDynamic().configuration.publishKey,
148148
secretKey = jsPubNub.asDynamic().configuration.secretKey,
149-
logLevel = jsPubNub.asDynamic().configuration.logLevel as? com.pubnub.api.enums.LogLevel,
149+
logLevel = jsPubNub.asDynamic().configuration.logLevel as com.pubnub.api.enums.LogLevel,
150150
authToken = jsPubNub.asDynamic().configuration.authToken
151151
)
152152

@@ -1481,4 +1481,5 @@ internal fun com.pubnub.api.enums.LogLevel.toJsEnum(): dynamic = when (this) {
14811481
com.pubnub.api.enums.LogLevel.INFO -> PubNubJs.LogLevel.Info
14821482
com.pubnub.api.enums.LogLevel.DEBUG -> PubNubJs.LogLevel.Debug
14831483
com.pubnub.api.enums.LogLevel.TRACE -> PubNubJs.LogLevel.Trace
1484+
else -> {}
14841485
}

pubnub-kotlin/pubnub-kotlin-core-api/src/jvmMain/kotlin/com/pubnub/api/v2/PNConfiguration.jvm.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ actual fun createPNConfiguration(
3737
subscribeKey: String,
3838
publishKey: String,
3939
secretKey: String?,
40-
logLevel: LogLevel,
40+
logLevel: LogLevel, // jvm doesn't have logLevel. Slf4j implementation (logback, log4j2) should be used to enable logging.
4141
authToken: String?
4242
): PNConfiguration {
4343
return PNConfiguration.builder(userId, subscribeKey) {

pubnub-kotlin/pubnub-kotlin-impl/src/integrationTest/kotlin/com/pubnub/api/integration/AppTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class AppTest {
2424
PubNub.create(
2525
PNConfiguration.builder(userId = UserId(PubNub.generateUUID()), subscribeKey = Keys.subKey) {
2626
publishKey = Keys.pubKey
27-
logVerbosity = PNLogVerbosity.BODY
2827
}.build(),
2928
)
3029
}

pubnub-kotlin/pubnub-kotlin-impl/src/integrationTest/kotlin/com/pubnub/api/integration/BaseIntegrationTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ abstract class BaseIntegrationTest {
9191
clientConfig.authKey = provideAuthKey()!!
9292
}
9393
clientConfig.retryConfiguration = RetryConfiguration.None
94-
clientConfig.logVerbosity = PNLogVerbosity.NONE
9594

9695
return clientConfig
9796
}
@@ -100,7 +99,6 @@ abstract class BaseIntegrationTest {
10099
serverConfig.subscribeKey = Keys.pamSubKey
101100
serverConfig.publishKey = Keys.pamPubKey
102101
serverConfig.secretKey = Keys.pamSecKey
103-
serverConfig.logVerbosity = PNLogVerbosity.NONE
104102
serverConfig.httpLoggingInterceptor = HttpLoggingInterceptor()
105103
serverConfig.action()
106104

pubnub-kotlin/pubnub-kotlin-impl/src/integrationTest/kotlin/com/pubnub/api/integration/PNConfigurationIntegrationTests.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class PNConfigurationIntegrationTests : BaseIntegrationTest() {
3636
val configBuilder = PNConfiguration.builder(UserId(expectedUuid), Keys.subKey) {
3737
publishKey = Keys.pubKey
3838
authToken = expectedAuthToken
39-
logVerbosity = PNLogVerbosity.NONE
4039
customLoggers = listOf(CustomLoggerTestImpl())
4140
}
4241
val pubNub = PubNub.create(configBuilder.build())

0 commit comments

Comments
 (0)