root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Polish tests for configuration constants 

See gh-30851
This commit is contained in:
Sam Brannen 2023-07-31 15:11:35 +03:00
parent 48eb477755
commit 0eda44186a
6 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java
View File

@ -179,7 +179,7 @@ class CustomizableTraceInterceptorTests {
@Test @Test
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
void supportedPlaceholderValues() { void supportedPlaceholderValues() {
assertThat(ALLOWED_PLACEHOLDERS).containsAll(getPlaceholderConstantValues()); assertThat(ALLOWED_PLACEHOLDERS).containsExactlyInAnyOrderElementsOf(getPlaceholderConstantValues());
} }
private List<String> getPlaceholderConstantValues() { private List<String> getPlaceholderConstantValues() {

5
spring-jdbc/src/test/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapterTests.java
View File

@ -63,14 +63,15 @@ class IsolationLevelDataSourceAdapterTests {
Integer isolationLevel = adapter.getIsolationLevel(); Integer isolationLevel = adapter.getIsolationLevel();
if ("ISOLATION_DEFAULT".equals(name)) { if ("ISOLATION_DEFAULT".equals(name)) {
assertThat(isolationLevel).isNull(); assertThat(isolationLevel).isNull();
uniqueValues.add(ISOLATION_DEFAULT);
} }
else { else {
Integer expected = IsolationLevelDataSourceAdapter.constants.get(name); Integer expected = IsolationLevelDataSourceAdapter.constants.get(name);
assertThat(isolationLevel).isEqualTo(expected); assertThat(isolationLevel).isEqualTo(expected);
uniqueValues.add(isolationLevel);
} }
uniqueValues.add(isolationLevel);
}); });
assertThat(uniqueValues).hasSize(IsolationLevelDataSourceAdapter.constants.size()); assertThat(uniqueValues).containsExactlyInAnyOrderElementsOf(IsolationLevelDataSourceAdapter.constants.values());
} }
@Test @Test

18
spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java
View File

@ -18,6 +18,8 @@ package org.springframework.jms.listener;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -37,7 +39,6 @@ import org.springframework.util.backoff.FixedBackOff;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatNoException;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
@ -160,16 +161,23 @@ class DefaultMessageListenerContainerTests {
@Test @Test
void setCacheLevelNameToAllSupportedValues() { void setCacheLevelNameToAllSupportedValues() {
DefaultMessageListenerContainer container = new DefaultMessageListenerContainer(); DefaultMessageListenerContainer container = new DefaultMessageListenerContainer();
Set<Integer> uniqueValues = new HashSet<>();
streamCacheConstants() streamCacheConstants()
.map(Field::getName) .forEach(name -> {
.forEach(name -> assertThatNoException().isThrownBy(() -> container.setCacheLevelName(name))); container.setCacheLevelName(name);
int cacheLevel = container.getCacheLevel();
assertThat(cacheLevel).isBetween(0, 4);
uniqueValues.add(cacheLevel);
});
assertThat(uniqueValues).hasSize(5);
} }
private static Stream<Field> streamCacheConstants() { private static Stream<String> streamCacheConstants() {
return Arrays.stream(DefaultMessageListenerContainer.class.getFields()) return Arrays.stream(DefaultMessageListenerContainer.class.getFields())
.filter(ReflectionUtils::isPublicStaticFinal) .filter(ReflectionUtils::isPublicStaticFinal)
.filter(field -> field.getName().startsWith("CACHE_")); .filter(field -> field.getName().startsWith("CACHE_"))
.map(Field::getName);
} }
private static DefaultMessageListenerContainer createRunningContainer() { private static DefaultMessageListenerContainer createRunningContainer() {

20
spring-jms/src/test/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfigTests.java
View File

@ -18,6 +18,8 @@ package org.springframework.jms.listener.endpoint;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Stream; import java.util.stream.Stream;
import jakarta.jms.Session; import jakarta.jms.Session;
@ -25,8 +27,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatNoException;
/** /**
* Tests for {@link JmsActivationSpecConfig}. * Tests for {@link JmsActivationSpecConfig}.
@ -53,15 +55,21 @@ class JmsActivationSpecConfigTests {
*/ */
@Test @Test
void setAcknowledgeModeNameToAllSupportedValues() { void setAcknowledgeModeNameToAllSupportedValues() {
streamAcknowledgeModeConstants() Set<Integer> uniqueValues = new HashSet<>();
.map(Field::getName) streamAcknowledgeModeConstants().forEach(name -> {
.forEach(name -> assertThatNoException().isThrownBy(() -> specConfig.setAcknowledgeModeName(name))); specConfig.setAcknowledgeModeName(name);
int acknowledgeMode = specConfig.getAcknowledgeMode();
assertThat(acknowledgeMode).isBetween(0, 3);
uniqueValues.add(acknowledgeMode);
});
assertThat(uniqueValues).hasSize(4);
} }
private static Stream<Field> streamAcknowledgeModeConstants() { private static Stream<String> streamAcknowledgeModeConstants() {
return Arrays.stream(Session.class.getFields()) return Arrays.stream(Session.class.getFields())
.filter(ReflectionUtils::isPublicStaticFinal); .filter(ReflectionUtils::isPublicStaticFinal)
.map(Field::getName);
} }
} }

18
spring-jms/src/test/java/org/springframework/jms/support/JmsAccessorTests.java
View File

@ -18,6 +18,8 @@ package org.springframework.jms.support;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Stream; import java.util.stream.Stream;
import jakarta.jms.Session; import jakarta.jms.Session;
@ -27,7 +29,6 @@ import org.springframework.util.ReflectionUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatNoException;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@ -84,15 +85,22 @@ class JmsAccessorTests {
*/ */
@Test @Test
void setSessionAcknowledgeModeNameToAllSupportedValues() { void setSessionAcknowledgeModeNameToAllSupportedValues() {
Set<Integer> uniqueValues = new HashSet<>();
streamAcknowledgeModeConstants() streamAcknowledgeModeConstants()
.map(Field::getName) .forEach(name -> {
.forEach(name -> assertThatNoException().isThrownBy(() -> accessor.setSessionAcknowledgeModeName(name))); accessor.setSessionAcknowledgeModeName(name);
int sessionAcknowledgeMode = accessor.getSessionAcknowledgeMode();
assertThat(sessionAcknowledgeMode).isBetween(0, 3);
uniqueValues.add(sessionAcknowledgeMode);
});
assertThat(uniqueValues).hasSize(4);
} }
private static Stream<Field> streamAcknowledgeModeConstants() { private static Stream<String> streamAcknowledgeModeConstants() {
return Arrays.stream(Session.class.getFields()) return Arrays.stream(Session.class.getFields())
.filter(ReflectionUtils::isPublicStaticFinal); .filter(ReflectionUtils::isPublicStaticFinal)
.map(Field::getName);
} }
@Test @Test

6
spring-tx/src/test/java/org/springframework/transaction/support/TransactionSupportTests.java
View File

@ -293,7 +293,7 @@ class TransactionSupportTests {
assertThat(transactionSynchronization).isEqualTo(expected); assertThat(transactionSynchronization).isEqualTo(expected);
uniqueValues.add(transactionSynchronization); uniqueValues.add(transactionSynchronization);
}); });
assertThat(uniqueValues).hasSize(AbstractPlatformTransactionManager.constants.size()); assertThat(uniqueValues).containsExactlyInAnyOrderElementsOf(AbstractPlatformTransactionManager.constants.values());
} }
@Test @Test
@ -348,7 +348,7 @@ class TransactionSupportTests {
assertThat(propagationBehavior).isEqualTo(expected); assertThat(propagationBehavior).isEqualTo(expected);
uniqueValues.add(propagationBehavior); uniqueValues.add(propagationBehavior);
}); });
assertThat(uniqueValues).hasSize(DefaultTransactionDefinition.propagationConstants.size()); assertThat(uniqueValues).containsExactlyInAnyOrderElementsOf(DefaultTransactionDefinition.propagationConstants.values());
} }
@Test @Test
@ -383,7 +383,7 @@ class TransactionSupportTests {
assertThat(isolationLevel).isEqualTo(expected); assertThat(isolationLevel).isEqualTo(expected);
uniqueValues.add(isolationLevel); uniqueValues.add(isolationLevel);
}); });
assertThat(uniqueValues).hasSize(DefaultTransactionDefinition.isolationConstants.size()); assertThat(uniqueValues).containsExactlyInAnyOrderElementsOf(DefaultTransactionDefinition.isolationConstants.values());
} }
@Test @Test