Skip to content

Force integrationTest compilation on ./gradlew build #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 10, 2022
Merged

Force integrationTest compilation on ./gradlew build #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0692f88
Force integrationTest compilation on ./gradlew build
marcin-cebo May 9, 2022
4915207
Merge branch 'master' into mcebo-haveIntegrationTestsCompiledDuringBuild
marcin-cebo May 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,3 +211,4 @@ test {


build.finalizedBy(shadowJar)
build.dependsOn compileIntegrationTestJava
3 changes: 2 additions & 1 deletion config/findbugs/excludeFilter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,5 @@
<Field name="affectedCall"/>
<Bug pattern="URF_UNREAD_FIELD"/>
</Match>
</FindBugsFilter>
</FindBugsFilter>

7 changes: 6 additions & 1 deletion ...st/java/com/pubnub/api/integration/managers/subscription/AbstractReconnectionProblem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,12 @@ protected void createChannelGroup(final PubNub pnClient, final String channelGro
protected abstract PubNub privilegedClientPubNub();

private PubNub adminPubNub() {
final PNConfiguration pnConfiguration = new PNConfiguration(PubNub.generateUUID());
PNConfiguration pnConfiguration = null;
try {
pnConfiguration = new PNConfiguration(PubNub.generateUUID());
} catch (PubNubException e) {
throw new RuntimeException(e);
}
pnConfiguration.setSubscribeKey(itPamTestConfig.pamSubKey());
pnConfiguration.setPublishKey(itPamTestConfig.pamPubKey());
pnConfiguration.setSecretKey(itPamTestConfig.pamSecKey());
Expand Down
8 changes: 7 additions & 1 deletion ...bnub/api/integration/managers/subscription/ReconnectionProblemWithReconnectionPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.pubnub.api.PNConfiguration;
import com.pubnub.api.PubNub;
import com.pubnub.api.PubNubException;
import com.pubnub.api.enums.PNLogVerbosity;

import static com.pubnub.api.enums.PNReconnectionPolicy.LINEAR;
Expand All @@ -10,7 +11,12 @@
public class ReconnectionProblemWithReconnectionPolicy extends AbstractReconnectionProblem {
@Override
protected PubNub privilegedClientPubNub() {
final PNConfiguration pnConfiguration = new PNConfiguration(PubNub.generateUUID());
PNConfiguration pnConfiguration = null;
try {
pnConfiguration = new PNConfiguration(PubNub.generateUUID());
} catch (PubNubException e) {
throw new RuntimeException(e);
}
pnConfiguration.setSubscribeKey(itPamTestConfig.pamSubKey());
pnConfiguration.setPublishKey(itPamTestConfig.pamPubKey());
pnConfiguration.setSubscribeTimeout(5);
Expand Down
8 changes: 7 additions & 1 deletion ...b/api/integration/managers/subscription/ReconnectionProblemWithoutReconnectionPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.pubnub.api.PNConfiguration;
import com.pubnub.api.PubNub;
import com.pubnub.api.PubNubException;

import static com.pubnub.api.enums.PNLogVerbosity.BODY;
import static com.pubnub.api.enums.PNReconnectionPolicy.NONE;
Expand All @@ -10,7 +11,12 @@
public class ReconnectionProblemWithoutReconnectionPolicy extends AbstractReconnectionProblem {
@Override
protected PubNub privilegedClientPubNub() {
final PNConfiguration pnConfiguration = new PNConfiguration(PubNub.generateUUID());
PNConfiguration pnConfiguration;
try {
pnConfiguration = new PNConfiguration(PubNub.generateUUID());
} catch (PubNubException e) {
throw new RuntimeException(e);
}
pnConfiguration.setSubscribeKey(itPamTestConfig.pamSubKey());
pnConfiguration.setPublishKey(itPamTestConfig.pamPubKey());
pnConfiguration.setSubscribeTimeout(SUBSCRIBE_TIMEOUT);
Expand Down
8 changes: 7 additions & 1 deletion src/integrationTest/java/com/pubnub/api/integration/objects/ObjectsApiBaseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.pubnub.api.PNConfiguration;
import com.pubnub.api.PubNub;
import com.pubnub.api.PubNubException;
import com.pubnub.api.enums.PNLogVerbosity;
import com.pubnub.api.integration.util.ITTestConfig;
import org.aeonbits.owner.ConfigFactory;
Expand All @@ -18,7 +19,12 @@ public abstract class ObjectsApiBaseIT {
protected final PubNub pubNubUnderTest = pubNub();

private PubNub pubNub() {
final PNConfiguration pnConfiguration = new PNConfiguration(PubNub.generateUUID());
PNConfiguration pnConfiguration;
try {
pnConfiguration = new PNConfiguration(PubNub.generateUUID());
} catch (PubNubException e) {
throw new RuntimeException(e);
}
pnConfiguration.setSubscribeKey(itTestConfig.subscribeKey());
pnConfiguration.setLogVerbosity(PNLogVerbosity.BODY);

Expand Down
22 changes: 16 additions & 6 deletions src/integrationTest/java/com/pubnub/api/integration/util/BaseIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,14 @@ protected void destroyClient(PubNub client) {
client.forceDestroy();
}

protected PNConfiguration getBasicPnConfiguration() throws PubNubException {
final PNConfiguration pnConfiguration = new PNConfiguration(PubNub.generateUUID());
protected PNConfiguration getBasicPnConfiguration() {
final PNConfiguration pnConfiguration;
try {
pnConfiguration = new PNConfiguration(PubNub.generateUUID());
pnConfiguration.setUuid("client-".concat(UUID.randomUUID().toString()));
} catch (PubNubException e) {
throw new RuntimeException(e);
}
if (!needsServer()) {
pnConfiguration.setSubscribeKey(SUB_KEY);
pnConfiguration.setPublishKey(PUB_KEY);
Expand All @@ -140,18 +146,22 @@ protected PNConfiguration getBasicPnConfiguration() throws PubNubException {
}
pnConfiguration.setLogVerbosity(PNLogVerbosity.NONE);
pnConfiguration.setHttpLoggingInterceptor(createInterceptor());
pnConfiguration.setUuid("client-".concat(UUID.randomUUID().toString()));
return pnConfiguration;
}

private PNConfiguration getServerPnConfiguration() throws PubNubException {
final PNConfiguration pnConfiguration = new PNConfiguration(PubNub.generateUUID());
private PNConfiguration getServerPnConfiguration(){
final PNConfiguration pnConfiguration;
try {
pnConfiguration = new PNConfiguration(PubNub.generateUUID());
pnConfiguration.setUuid("server-".concat(UUID.randomUUID().toString()));
} catch (PubNubException e) {
throw new RuntimeException(e);
}
pnConfiguration.setSubscribeKey(PAM_SUB_KEY);
pnConfiguration.setPublishKey(PAM_PUB_KEY);
pnConfiguration.setSecretKey(PAM_SEC_KEY);
pnConfiguration.setLogVerbosity(PNLogVerbosity.NONE);
pnConfiguration.setHttpLoggingInterceptor(createInterceptor());
pnConfiguration.setUuid("server-".concat(UUID.randomUUID().toString()));
return pnConfiguration;
}

Expand Down