Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<argLine />

<!-- utils -->
<gson.version>2.13.2</gson.version>
<gson.version>2.14.0</gson.version>
<commons-lang3.version>3.20.0</commons-lang3.version>
<commons-net.version>3.13.0</commons-net.version>
<slf4j-api.version>2.0.17</slf4j-api.version>
Expand All @@ -69,7 +69,7 @@
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
<maven-surefire-plugin.version>3.5.5</maven-surefire-plugin.version>
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
<sonar-maven-plugin.version>5.5.0.6356</sonar-maven-plugin.version>
<sonar-maven-plugin.version>5.6.0.6792</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
<central-publishing-maven-plugin.version>0.10.0</central-publishing-maven-plugin.version>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ public AsyncSwitcher(final Switcher switcher, long delay) {
* Switcher result for the Switcher executions map.
*/
public void execute() {
SwitcherUtils.debug(logger, "nextRun: {} - currentTimeMillis: {}", nextRun, System.currentTimeMillis());
if (logger.isDebugEnabled()) {
SwitcherUtils.debug(logger, "nextRun: {} - currentTimeMillis: {}", nextRun, System.currentTimeMillis());
}

if (nextRun < System.currentTimeMillis()) {
SwitcherUtils.debug(logger, "Running AsyncSwitcher");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
package com.switcherapi.client;

import com.switcherapi.Switchers;
import com.switcherapi.fixture.CountDownHelper;
import com.switcherapi.fixture.MockWebServerHelper;
import mockwebserver3.QueueDispatcher;
import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import java.io.IOException;
import java.nio.file.Paths;

import static org.junit.jupiter.api.Assertions.assertEquals;

class SwitcherSnapshotAutoUpdate2Test extends MockWebServerHelper {

private static final String SNAPSHOTS_LOCAL = Paths.get(StringUtils.EMPTY).toAbsolutePath() + "/src/test/resources/update";

@BeforeAll
static void setup() throws IOException {
setupMockServer();
Switchers.loadProperties();
}

@AfterAll
static void tearDown() {
tearDownMockServer();
SwitcherContextBase.terminateSnapshotAutoUpdateWorker();
}

@BeforeEach
void restoreStubs() {
((QueueDispatcher) mockBackEnd.getDispatcher()).clear();
SwitcherContextBase.terminateSnapshotAutoUpdateWorker();

CountDownHelper.wait(1);
}

@Test
void shouldNotKillThread_whenAPI_wentLocal() {
//given
givenResponse(generateMockAuth(10)); //auth
givenResponse(generateSnapshotResponse("default_outdated.json", SNAPSHOTS_LOCAL)); //graphql

//that
Switchers.configure(ContextBuilder.builder(true)
.context(Switchers.class.getName())
.url(String.format("http://localhost:%s", mockBackEnd.getPort()))
.apiKey("[API_KEY]")
.environment("generated_mock_default_6")
.local(true)
.snapshotAutoLoad(true)
.snapshotAutoUpdateInterval("1s"));

Switchers.initializeClient();
assertEquals(1, Switchers.getSnapshotVersion());

CountDownHelper.wait(1);

//given - API is remote again
givenResponse(generateCheckSnapshotVersionResponse(Boolean.toString(false))); //criteria/snapshot_check
givenResponse(generateSnapshotResponse("default.json", SNAPSHOTS_LOCAL)); //graphql

//test
CountDownHelper.wait(2);
assertEquals(2, Switchers.getSnapshotVersion());
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -185,37 +185,6 @@ void shouldUpdateSnapshot_remote_inMemory() {

@Test
@Order(5)
void shouldNotKillThread_whenAPI_wentLocal() {
//given
givenResponse(generateMockAuth(10)); //auth
givenResponse(generateSnapshotResponse("default_outdated.json", SNAPSHOTS_LOCAL)); //graphql

//that
Switchers.configure(ContextBuilder.builder(true)
.context(Switchers.class.getName())
.url(String.format("http://localhost:%s", mockBackEnd.getPort()))
.apiKey("[API_KEY]")
.environment("generated_mock_default_6")
.local(true)
.snapshotAutoLoad(true)
.snapshotAutoUpdateInterval("1s"));

Switchers.initializeClient();
assertEquals(1, Switchers.getSnapshotVersion());

CountDownHelper.wait(1);

//given - API is remote again
givenResponse(generateCheckSnapshotVersionResponse(Boolean.toString(false))); //criteria/snapshot_check
givenResponse(generateSnapshotResponse("default.json", SNAPSHOTS_LOCAL)); //graphql

//test
CountDownHelper.wait(2);
assertEquals(2, Switchers.getSnapshotVersion());
}

@Test
@Order(6)
void shouldRestartSnapshotAutoUpdate_whenAlreadySetup() {
//given - initialize (snapshot autoload)
givenResponse(generateMockAuth(10)); //auth
Expand Down
17 changes: 17 additions & 0 deletions src/test/resources/simplelogger.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# SLF4J SimpleLogger configuration
# https://www.slf4j.org/api/org/slf4j/simple/SimpleLogger.html

# Default log level for all loggers
org.slf4j.simpleLogger.defaultLogLevel=info

# DEBUG for the playground and the client library
org.slf4j.simpleLogger.log.com.switcherapi.playground=debug
org.slf4j.simpleLogger.log.com.switcherapi.client=debug

# Date/time format
org.slf4j.simpleLogger.showDateTime=true
org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss.SSS

# Show the logger name (abbreviated)
org.slf4j.simpleLogger.showShortLogName=true

Loading