Skip to content

Commit 735d420

Browse files
authored
spring-cloudGH-373: Re-enable aggregator tests (spring-cloud#377)
Fixes spring-cloud#373 The fix in Spring Integration has made it into the latest SNAPSHOT. See more info in the linked issue * Update to the latest Testcontainers: it does not require credential for pull command any more * Remove obsolete `MessageStoreType.GEMFIRE` * Add `<doclint>syntax</doclint>` to ignore missed javadocs on public methods
1 parent f17a0b3 commit 735d420

File tree

5 files changed

+2
-9
lines changed

5 files changed

+2
-9
lines changed

Diff for: functions/function/aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionProperties.java

-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ static final class MessageStoreType {
117117

118118
static final String REDIS = "redis";
119119

120-
static final String GEMFIRE = "gemfire";
121-
122120
}
123121

124122
}

Diff for: functions/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.time.Duration;
2020
import java.util.List;
2121

22-
import org.junit.jupiter.api.Disabled;
2322
import org.junit.jupiter.api.Test;
2423
import reactor.core.publisher.Flux;
2524
import reactor.test.StepVerifier;
@@ -47,7 +46,6 @@
4746
"aggregator.message-store-entity=aggregatorTest"
4847
})
4948
@AutoConfigureDataMongo
50-
@Disabled
5149
public class CustomPropsAndMongoMessageStoreAggregatorTests extends AbstractAggregatorFunctionTests
5250
implements MongoDbTestContainerSupport {
5351

Diff for: functions/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/DefaultAggregatorTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.time.Duration;
2020
import java.util.List;
2121

22-
import org.junit.jupiter.api.Disabled;
2322
import org.junit.jupiter.api.Test;
2423
import reactor.core.publisher.Flux;
2524
import reactor.test.StepVerifier;
@@ -35,7 +34,6 @@
3534
* @author Artem Bilan
3635
* @author Corneil du Plessis
3736
*/
38-
@Disabled
3937
public class DefaultAggregatorTests extends AbstractAggregatorFunctionTests {
4038

4139
@Test

Diff for: functions/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/JdbcMessageStoreAggregatorTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.time.Duration;
2020
import java.util.List;
2121

22-
import org.junit.jupiter.api.Disabled;
2322
import org.junit.jupiter.api.Test;
2423
import reactor.core.publisher.Flux;
2524
import reactor.test.StepVerifier;
@@ -37,7 +36,6 @@
3736
* @author Corneil du Plessis
3837
*/
3938
@TestPropertySource(properties = "aggregator.message-store-type=jdbc")
40-
@Disabled
4139
public class JdbcMessageStoreAggregatorTests extends AbstractAggregatorFunctionTests {
4240

4341
@Test

Diff for: stream-applications-build/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<spring-cloud-function.version>4.0.0-SNAPSHOT</spring-cloud-function.version>
5050
<spring-cloud-stream-dependencies.version>4.0.0-SNAPSHOT</spring-cloud-stream-dependencies.version>
5151
<spring-cloud-stream.version>4.0.0-SNAPSHOT</spring-cloud-stream.version>
52-
<test-containers.version>1.16.3</test-containers.version>
52+
<test-containers.version>1.17.5</test-containers.version>
5353
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
5454
<mockserver.version>5.13.2</mockserver.version>
5555

@@ -135,6 +135,7 @@
135135
</executions>
136136
<configuration>
137137
<quiet>true</quiet>
138+
<doclint>syntax</doclint>
138139
</configuration>
139140
</plugin>
140141
<plugin>

0 commit comments

Comments
 (0)