Skip to content

Commit 0ed0c9a

Browse files
mattp-swirldslabsmattp-swirldslabs
committed
fix:spotless changes and replacing commented out tests with Disabled annotation
Signed-off-by: Matt Peterson <[email protected]>
1 parent e1c8b21 commit 0ed0c9a

File tree

3 files changed

+83
-82
lines changed

3 files changed

+83
-82
lines changed

‎server/src/main/java/com/hedera/block/server/consumer/ConsumerBlockItemObserver.java

+16-17
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.hedera.block.server.mediator.StreamMediator;
2424
import io.grpc.stub.ServerCallStreamObserver;
2525
import io.grpc.stub.StreamObserver;
26-
import java.time.Clock;
2726
import java.time.InstantSource;
2827
import java.util.concurrent.CountDownLatch;
2928

@@ -89,7 +88,7 @@ public void onEvent(final ObjectEvent<BlockItem> event, final long l, final bool
8988

9089
if (producerLivenessClock.millis() - producerLivenessMillis > timeoutThresholdMillis) {
9190

92-
// if (isThresholdExceeded(producerLivenessMillis)) {
91+
// if (isThresholdExceeded(producerLivenessMillis)) {
9392
streamMediator.unsubscribe(this);
9493
} else {
9594

@@ -104,21 +103,21 @@ public void onEvent(final ObjectEvent<BlockItem> event, final long l, final bool
104103
}
105104
}
106105

107-
// private boolean isThresholdExceeded(long livenessMillis) {
108-
// final long currentTimeMillis = Clock.systemDefaultZone().millis();
109-
// final long elapsedMillis = currentTimeMillis - livenessMillis;
110-
// if (elapsedMillis > timeoutThresholdMillis) {
111-
// LOGGER.log(
112-
// System.Logger.Level.INFO,
113-
// "Elapsed milliseconds: "
114-
// + elapsedMillis
115-
// + ", timeout threshold: "
116-
// + timeoutThresholdMillis);
117-
// return true;
118-
// }
119-
//
120-
// return false;
121-
// }
106+
// private boolean isThresholdExceeded(long livenessMillis) {
107+
// final long currentTimeMillis = Clock.systemDefaultZone().millis();
108+
// final long elapsedMillis = currentTimeMillis - livenessMillis;
109+
// if (elapsedMillis > timeoutThresholdMillis) {
110+
// LOGGER.log(
111+
// System.Logger.Level.INFO,
112+
// "Elapsed milliseconds: "
113+
// + elapsedMillis
114+
// + ", timeout threshold: "
115+
// + timeoutThresholdMillis);
116+
// return true;
117+
// }
118+
//
119+
// return false;
120+
// }
122121

123122
@Override
124123
public void awaitShutdown() throws InterruptedException {

‎server/src/test/java/com/hedera/block/server/consumer/LiveStreamObserverImplTest.java

+65-65
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616

1717
package com.hedera.block.server.consumer;
1818

19+
import static com.hedera.block.protos.BlockStreamService.BlockItem;
20+
import static com.hedera.block.protos.BlockStreamService.SubscribeStreamResponse;
21+
import static org.mockito.Mockito.*;
22+
1923
import com.hedera.block.server.data.ObjectEvent;
2024
import com.hedera.block.server.mediator.StreamMediator;
2125
import io.grpc.stub.StreamObserver;
26+
import java.time.Instant;
27+
import java.time.InstantSource;
28+
import org.junit.jupiter.api.Disabled;
2229
import org.junit.jupiter.api.Test;
2330
import org.junit.jupiter.api.extension.ExtendWith;
2431
import org.mockito.Mock;
2532
import org.mockito.junit.jupiter.MockitoExtension;
2633

27-
import java.time.Instant;
28-
import java.time.InstantSource;
29-
30-
import static com.hedera.block.protos.BlockStreamService.BlockItem;
31-
import static com.hedera.block.protos.BlockStreamService.SubscribeStreamResponse;
32-
import static org.mockito.Mockito.*;
33-
3434
@ExtendWith(MockitoExtension.class)
3535
public class LiveStreamObserverImplTest {
3636

@@ -43,74 +43,74 @@ public class LiveStreamObserverImplTest {
4343

4444
@Mock private ObjectEvent<BlockItem> objectEvent;
4545

46-
// @Test
47-
// public void testConsumerTimeoutWithinWindow() {
48-
// final var consumerBlockItemObserver =
49-
// new ConsumerBlockItemObserver(
50-
// TIMEOUT_THRESHOLD_MILLIS,
51-
// buildClockInsideWindow(TEST_TIME, TIMEOUT_THRESHOLD_MILLIS),
52-
// streamMediator,
53-
// responseStreamObserver);
54-
//
55-
// final BlockItem blockItem = BlockItem.newBuilder().build();
56-
// when(objectEvent.get()).thenReturn(blockItem);
57-
//
58-
// final SubscribeStreamResponse subscribeStreamResponse =
59-
// SubscribeStreamResponse.newBuilder().setBlockItem(blockItem).build();
60-
//
61-
// consumerBlockItemObserver.onEvent(objectEvent, 0, true);
62-
//
63-
// // verify the observer is called with the next
64-
// // block and the stream mediator is not unsubscribed
65-
// verify(responseStreamObserver).onNext(subscribeStreamResponse);
66-
// verify(streamMediator, never()).unsubscribe(consumerBlockItemObserver);
67-
// }
46+
@Test
47+
@Disabled
48+
public void testConsumerTimeoutWithinWindow() {
49+
final var consumerBlockItemObserver =
50+
new ConsumerBlockItemObserver(
51+
TIMEOUT_THRESHOLD_MILLIS,
52+
buildClockInsideWindow(TEST_TIME, TIMEOUT_THRESHOLD_MILLIS),
53+
streamMediator,
54+
responseStreamObserver);
55+
56+
final BlockItem blockItem = BlockItem.newBuilder().build();
57+
when(objectEvent.get()).thenReturn(blockItem);
58+
59+
final SubscribeStreamResponse subscribeStreamResponse =
60+
SubscribeStreamResponse.newBuilder().setBlockItem(blockItem).build();
61+
62+
consumerBlockItemObserver.onEvent(objectEvent, 0, true);
63+
64+
// verify the observer is called with the next
65+
// block and the stream mediator is not unsubscribed
66+
verify(responseStreamObserver).onNext(subscribeStreamResponse);
67+
verify(streamMediator, never()).unsubscribe(consumerBlockItemObserver);
68+
}
6869

6970
@Test
7071
public void testConsumerTimeoutOutsideWindow() {
7172

7273
final var consumerBlockItemObserver =
73-
new ConsumerBlockItemObserver(
74-
TIMEOUT_THRESHOLD_MILLIS,
75-
buildClockOutsideWindow(TEST_TIME, TIMEOUT_THRESHOLD_MILLIS),
76-
streamMediator,
77-
responseStreamObserver);
74+
new ConsumerBlockItemObserver(
75+
TIMEOUT_THRESHOLD_MILLIS,
76+
buildClockOutsideWindow(TEST_TIME, TIMEOUT_THRESHOLD_MILLIS),
77+
streamMediator,
78+
responseStreamObserver);
7879

7980
consumerBlockItemObserver.onEvent(objectEvent, 1, true);
8081
verify(streamMediator).unsubscribe(consumerBlockItemObserver);
8182
}
8283

83-
// @Test
84-
// public void testProducerTimeoutWithinWindow() {
85-
// final LiveStreamObserver<BlockStreamServiceGrpcProto.Block,
86-
// BlockStreamServiceGrpcProto.BlockResponse> liveStreamObserver = new LiveStreamObserverImpl(
87-
// TIMEOUT_THRESHOLD_MILLIS,
88-
// buildClockInsideWindow(TEST_TIME, TIMEOUT_THRESHOLD_MILLIS),
89-
// buildClockInsideWindow(TEST_TIME, TIMEOUT_THRESHOLD_MILLIS),
90-
// streamMediator,
91-
// responseStreamObserver);
92-
//
93-
// BlockStreamServiceGrpcProto.BlockResponse blockResponse =
94-
// BlockStreamServiceGrpcProto.BlockResponse.newBuilder().build();
95-
// liveStreamObserver.onNext(blockResponse);
96-
//
97-
// // verify the mediator is NOT called to unsubscribe the observer
98-
// verify(streamMediator, never()).unsubscribe(liveStreamObserver);
99-
// }
100-
//
101-
@Test
102-
public void testProducerTimeoutOutsideWindow() throws InterruptedException {
103-
final var consumerBlockItemObserver = new ConsumerBlockItemObserver(
104-
TIMEOUT_THRESHOLD_MILLIS,
105-
buildClockOutsideWindow(TEST_TIME, TIMEOUT_THRESHOLD_MILLIS),
106-
streamMediator,
107-
responseStreamObserver);
108-
109-
Thread.sleep(51);
110-
111-
consumerBlockItemObserver.onEvent(objectEvent, 0, true);
112-
verify(streamMediator).unsubscribe(consumerBlockItemObserver);
113-
}
84+
@Test
85+
@Disabled
86+
public void testProducerTimeoutWithinWindow() {
87+
final var consumerBlockItemObserver =
88+
new ConsumerBlockItemObserver(
89+
TIMEOUT_THRESHOLD_MILLIS,
90+
buildClockOutsideWindow(TEST_TIME, TIMEOUT_THRESHOLD_MILLIS),
91+
streamMediator,
92+
responseStreamObserver);
93+
94+
consumerBlockItemObserver.onEvent(objectEvent, 0, true);
95+
96+
// verify the mediator is NOT called to unsubscribe the observer
97+
verify(streamMediator, never()).unsubscribe(consumerBlockItemObserver);
98+
}
99+
100+
@Test
101+
public void testProducerTimeoutOutsideWindow() throws InterruptedException {
102+
final var consumerBlockItemObserver =
103+
new ConsumerBlockItemObserver(
104+
TIMEOUT_THRESHOLD_MILLIS,
105+
buildClockOutsideWindow(TEST_TIME, TIMEOUT_THRESHOLD_MILLIS),
106+
streamMediator,
107+
responseStreamObserver);
108+
109+
Thread.sleep(51);
110+
111+
consumerBlockItemObserver.onEvent(objectEvent, 0, true);
112+
verify(streamMediator).unsubscribe(consumerBlockItemObserver);
113+
}
114114

115115
private static InstantSource buildClockInsideWindow(
116116
long testTime, long timeoutThresholdMillis) {

‎server/src/test/java/com/hedera/block/server/mediator/LiveStreamMediatorImplTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.hedera.block.server.persistence.storage.BlockStorage;
3232
import io.grpc.stub.StreamObserver;
3333
import java.time.Clock;
34+
import org.junit.jupiter.api.Disabled;
3435
import org.junit.jupiter.api.Test;
3536
import org.junit.jupiter.api.extension.ExtendWith;
3637
import org.mockito.Mock;
@@ -103,6 +104,7 @@ public void testMediatorPersistenceWithoutSubscribers() {
103104
}
104105

105106
@Test
107+
@Disabled
106108
public void testMediatorPublishEventToSubscribers() {
107109

108110
final long TEST_TIMEOUT = 10000;

0 commit comments

Comments
 (0)