Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility with the latest SF

Browse Source 
* Upgrade Spring dependencies to the latest SNAPSHOTs
* Fix tests to verify against stack traces: the message
of the `NestedRuntimeException`  does not include the nested exception information.
Related to https://github.com/spring-projects/spring-framework/issues/25162
* Fix `JdbcMessageStore` and `DefaultLockRepository` to rely on the `DataIntegrityViolationException`
instead of only its `DuplicateKeyException` extension.
This is the current behavior of the SQL errors translation
* Disable `WebFluxDslTests.testValidation()` - doesn't subscribe to the reply somehow...
* Refine `SimplePool.PoolSemaphore.reducePermits()`
This commit is contained in:
Artem Bilan
2022-06-27 20:26:13 -04:00
parent 979b8417ef
commit 2022c40d55
39 changed files with 278 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelectorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,17 +17,20 @@
package org.springframework.integration.xml.selector;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.Resource;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.integration.xml.selector.XmlValidatingMessageSelector.SchemaType;
/**
* @author Oleg Zhurakousky
* @author Artem Bilan
*
*/
public class XmlValidatingMessageSelectorTests {
@@ -35,34 +38,29 @@ public class XmlValidatingMessageSelectorTests {
@Test
public void validateCreationWithSchemaAndDefaultSchemaType() throws Exception {
Resource resource = new ByteArrayResource("<xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'/>".getBytes());
new XmlValidatingMessageSelector(resource, (SchemaType) null);
XmlValidatingMessageSelector messageSelector = new XmlValidatingMessageSelector(resource, (SchemaType) null);
assertThat(TestUtils.getPropertyValue(messageSelector, "xmlValidator.schema").getClass().getSimpleName())
.isEqualTo("SimpleXMLSchema");
}
@Test
public void validateCreationWithSchemaAndProvidedSchemaType() throws Exception {
Resource resource = new ByteArrayResource("<xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'/>".getBytes());
new XmlValidatingMessageSelector(resource, SchemaType.XML_SCHEMA);
XmlValidatingMessageSelector messageSelector = new XmlValidatingMessageSelector(resource, SchemaType.XML_SCHEMA);
assertThat(TestUtils.getPropertyValue(messageSelector, "xmlValidator.schema").getClass().getSimpleName())
.isEqualTo("SimpleXMLSchema");
}
@Test
public void validateFailureInvalidSchemaLanguage() throws Exception {
ConfigurableApplicationContext context = null;
try {
context = new ClassPathXmlApplicationContext("XmlValidatingMessageSelectorTests-context.xml", this.getClass());
}
catch (Exception e) {
assertThat(e.getMessage().contains("java.lang.IllegalArgumentException: No enum constant")).isTrue();
}
finally {
if (context != null) {
context.close();
}
}
public void validateFailureInvalidSchemaLanguage() {
assertThatThrownBy(() -> new ClassPathXmlApplicationContext("XmlValidatingMessageSelectorTests-context.xml",
getClass()))
.hasStackTraceContaining("java.lang.IllegalArgumentException: No enum constant");
}
@Test(expected = IllegalArgumentException.class)
public void validateFailureWhenNoSchemaResourceProvided() throws Exception {
new XmlValidatingMessageSelector(null, (SchemaType) null);
@Test
public void validateFailureWhenNoSchemaResourceProvided() {
assertThatIllegalArgumentException().isThrownBy(() -> new XmlValidatingMessageSelector(null, (SchemaType) null));
}
}