Skip to content

Commit

Permalink
style: simplify calculator name
Browse files Browse the repository at this point in the history
  • Loading branch information
wzieba committed Oct 26, 2023
1 parent d151d73 commit cda6762
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ class EngagementManager {
private TimerTask waitingTimerTask;
private long latestDelayMillis, totalTime;
private Calendar startTime;
private final UpdateEngagementIntervalCalculator intervalCalculator;
private final HeartbeatIntervalCalculator intervalCalculator;

public EngagementManager(
ParselyTracker parselyTracker,
Timer parentTimer,
long intervalMillis,
Map<String, Object> baseEvent,
UpdateEngagementIntervalCalculator intervalCalculator
HeartbeatIntervalCalculator intervalCalculator
) {
this.parselyTracker = parselyTracker;
this.baseEvent = baseEvent;
Expand Down Expand Up @@ -70,7 +70,7 @@ private void scheduleNextExecution(long delay) {
TimerTask task = new TimerTask() {
public void run() {
doEnqueue(scheduledExecutionTime());
latestDelayMillis = intervalCalculator.updateLatestInterval(startTime);
latestDelayMillis = intervalCalculator.calculate(startTime);
scheduleNextExecution(latestDelayMillis);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import kotlin.time.Duration.Companion.hours
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.seconds

internal open class UpdateEngagementIntervalCalculator(private val clock: Clock) {
internal open class HeartbeatIntervalCalculator(private val clock: Clock) {

open fun updateLatestInterval(startTime: Calendar): Long {
open fun calculate(startTime: Calendar): Long {
val startTimeDuration = startTime.time.time.milliseconds
val nowDuration = clock.now

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public class ParselyTracker {
private String lastPageviewUuid = null;
@NonNull
private final EventsBuilder eventsBuilder;
@NonNull final UpdateEngagementIntervalCalculator intervalCalculator = new UpdateEngagementIntervalCalculator(new Clock());
@NonNull final HeartbeatIntervalCalculator intervalCalculator = new HeartbeatIntervalCalculator(new Clock());

/**
* Create a new ParselyTracker instance.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ internal class EngagementManagerTest {
}
}

class FakeIntervalCalculator : UpdateEngagementIntervalCalculator(Clock()) {
override fun updateLatestInterval(startTime: Calendar): Long {
class FakeIntervalCalculator : HeartbeatIntervalCalculator(Clock()) {
override fun calculate(startTime: Calendar): Long {
return DEFAULT_INTERVAL_MILLIS
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
package com.parsely.parselyandroid

import com.parsely.parselyandroid.UpdateEngagementIntervalCalculator.Companion.BACKOFF_PROPORTION
import com.parsely.parselyandroid.UpdateEngagementIntervalCalculator.Companion.MAX_TIME_BETWEEN_HEARTBEATS
import com.parsely.parselyandroid.UpdateEngagementIntervalCalculator.Companion.OFFSET_MATCHING_BASE_INTERVAL
import com.parsely.parselyandroid.HeartbeatIntervalCalculator.Companion.BACKOFF_PROPORTION
import com.parsely.parselyandroid.HeartbeatIntervalCalculator.Companion.MAX_TIME_BETWEEN_HEARTBEATS
import com.parsely.parselyandroid.HeartbeatIntervalCalculator.Companion.OFFSET_MATCHING_BASE_INTERVAL
import java.util.Calendar
import kotlin.time.Duration
import kotlin.time.Duration.Companion.seconds
import org.assertj.core.api.Assertions.assertThat
import org.junit.Before
import org.junit.Test

internal class UpdateEngagementIntervalCalculatorTest {
internal class HeartbeatIntervalCalculatorTest {

private lateinit var sut: UpdateEngagementIntervalCalculator
val fakeClock = FakeClock()
private lateinit var sut: HeartbeatIntervalCalculator
private val fakeClock = FakeClock()

@Before
fun setUp() {
sut = UpdateEngagementIntervalCalculator(fakeClock)
sut = HeartbeatIntervalCalculator(fakeClock)
}

@Test
Expand All @@ -29,7 +29,7 @@ internal class UpdateEngagementIntervalCalculatorTest {
}

// when
val result = sut.updateLatestInterval(startTime)
val result = sut.calculate(startTime)

// then
// ((currentTime + offset) * BACKOFF_PROPORTION) * 1000
Expand All @@ -49,7 +49,7 @@ internal class UpdateEngagementIntervalCalculatorTest {
}

// when
val result = sut.updateLatestInterval(startTime)
val result = sut.calculate(startTime)

// then
assertThat(result).isEqualTo(MAX_TIME_BETWEEN_HEARTBEATS.inWholeMilliseconds)
Expand All @@ -64,7 +64,7 @@ internal class UpdateEngagementIntervalCalculatorTest {
fakeClock.fakeNow = 2.seconds

// when
val result = sut.updateLatestInterval(startTime)
val result = sut.calculate(startTime)

// then
// ((currentTime + offset) * BACKOFF_PROPORTION) * 1000
Expand Down

0 comments on commit cda6762

Please sign in to comment.