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
30 changes: 0 additions & 30 deletions base-configuration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,36 +35,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>dependency-properties</id>
<goals>
<goal>properties</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<argLine>-XX:+EnableDynamicAgentLoading -javaagent:${org.mockito:mockito-core:jar}</argLine>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@
import java.util.function.Supplier;
import java.util.stream.Stream;

import java.util.concurrent.atomic.AtomicBoolean;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

/**
* Tests for {@link Configuration}s.
Expand Down Expand Up @@ -128,22 +126,19 @@ void shouldReturnSpecifiedDefaultEnumOption() {
* Ensure that a provided {@link Supplier} is not invoked when an {@link Option} is present.
*/
@Test
@SuppressWarnings("unchecked")
void shouldAvoidSupplierWhenNonNull() {
final var configuration = ConfigurationBuilder.create()
.add(Color.GREEN)
.build();

// establish a mock supplier for the Color.BLUE
// (so we can track interactions with the supplier)
final Supplier<Color> blueSupplier = mock(Supplier.class);
when(blueSupplier.get()).thenReturn(Color.BLUE);
final var supplierCalled = new AtomicBoolean(false);

assertThat(configuration.getOrDefault(Color.class, blueSupplier))
.isEqualTo(Color.GREEN);
assertThat(configuration.getOrDefault(Color.class, () -> {
supplierCalled.set(true);
return Color.BLUE;
})).isEqualTo(Color.GREEN);

// ensure the supplier was never used
verify(blueSupplier, times(0)).get();
assertThat(supplierCalled).isFalse();
}

/**
Expand Down
31 changes: 0 additions & 31 deletions base-flow/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,36 +35,5 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>dependency-properties</id>
<goals>
<goal>properties</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<argLine>-XX:+EnableDynamicAgentLoading -javaagent:${org.mockito:mockito-core:jar}</argLine>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package build.base.flow;

import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import static org.assertj.core.api.Assertions.assertThat;

Expand All @@ -13,6 +12,11 @@
*/
class FilteringSubscriberTests {

private static final Subscription NO_OP_SUBSCRIPTION = new Subscription() {
@Override public void request(final long number) {}
@Override public void cancel() {}
};

/**
* Ensure a {@link FilteringSubscriber} can be created.
*/
Expand All @@ -28,11 +32,10 @@ void shouldCreateAFilteringSubscriber() {
@Test
void shouldObserveFilteredValues() {

final var subscription = Mockito.mock(Subscription.class);
final var recordingSubscriber = new RecordingSubscriber<String>();
final var filteringObserver = FilteringSubscriber.of(s -> s.startsWith("Hello"), recordingSubscriber);

filteringObserver.onSubscribe(subscription);
filteringObserver.onSubscribe(NO_OP_SUBSCRIPTION);

assertThat(recordingSubscriber.isSubscribed())
.isTrue();
Expand Down Expand Up @@ -71,11 +74,10 @@ void shouldObserveFilteredValues() {
@Test
void shouldObserveCompletionWhenFilteringSubscriberObservesCompletion() {

final var subscription = Mockito.mock(Subscription.class);
final var recordingSubscriber = new RecordingSubscriber<String>();
final var filteringObserver = FilteringSubscriber.of(s -> s.startsWith("Hello"), recordingSubscriber);

filteringObserver.onSubscribe(subscription);
filteringObserver.onSubscribe(NO_OP_SUBSCRIPTION);

filteringObserver.onComplete();

Expand All @@ -89,12 +91,10 @@ void shouldObserveCompletionWhenFilteringSubscriberObservesCompletion() {
@Test
void shouldObserveAnErrorWhenFilteringObserverObservesAnError() {

final var subscription = Mockito.mock(Subscription.class);

final var recordingSubscriber = new RecordingSubscriber<String>();
final var filteringObserver = FilteringSubscriber.of(s -> s.startsWith("Hello"), recordingSubscriber);

filteringObserver.onSubscribe(subscription);
filteringObserver.onSubscribe(NO_OP_SUBSCRIPTION);

assertThat(recordingSubscriber.isSubscribed())
.isTrue();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package build.base.flow;

import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import static org.assertj.core.api.Assertions.assertThat;

Expand All @@ -13,6 +12,11 @@
*/
class MappingSubscriberTests {

private static final Subscription NO_OP_SUBSCRIPTION = new Subscription() {
@Override public void request(final long number) {}
@Override public void cancel() {}
};

/**
* Ensure a {@link MappingSubscriber} can be created.
*/
Expand All @@ -27,11 +31,10 @@ void shouldCreateAMappingSubscriber() {
@Test
void shouldObserveMapValues() {

final var subscription = Mockito.mock(Subscription.class);
final var recordingObserver = new RecordingSubscriber<Integer>();
final var mappingObserver = MappingSubscriber.of(String::length, recordingObserver);

mappingObserver.onSubscribe(subscription);
mappingObserver.onSubscribe(NO_OP_SUBSCRIPTION);

assertThat(recordingObserver.isSubscribed())
.isTrue();
Expand Down Expand Up @@ -59,11 +62,10 @@ void shouldObserveMapValues() {
@Test
void shouldObserveCompletionWhenMappingSubscriberObservesCompletion() {

final var subscription = Mockito.mock(Subscription.class);
final var recordingObserver = new RecordingSubscriber<Integer>();
final var mappingObserver = MappingSubscriber.of(String::length, recordingObserver);

mappingObserver.onSubscribe(subscription);
mappingObserver.onSubscribe(NO_OP_SUBSCRIPTION);

mappingObserver.onComplete();

Expand All @@ -77,11 +79,10 @@ void shouldObserveCompletionWhenMappingSubscriberObservesCompletion() {
@Test
void shouldObserveAnErrorWhenMappingSubscriberObservesAnError() {

final var subscription = Mockito.mock(Subscription.class);
final var recordingObserver = new RecordingSubscriber<Integer>();
final var mappingObserver = MappingSubscriber.of(String::length, recordingObserver);

mappingObserver.onSubscribe(subscription);
mappingObserver.onSubscribe(NO_OP_SUBSCRIPTION);

assertThat(recordingObserver.isSubscribed())
.isTrue();
Expand Down
Loading