Spring/spring-test-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch use of Descriptable.as(String description, Object... args) to Descriptable.describedAs(String description, Object... args).

Browse Source
This commit is contained in:
John Blum
2020-01-31 11:28:14 -08:00
parent b7923b25bb
commit 8c0739cb44
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java
View File

@@ -31,6 +31,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.GemFireCache;
@@ -39,10 +43,6 @@ import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.net.SSLConfigurationFactory;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.springframework.data.gemfire.GemfireUtils;
import org.springframework.data.gemfire.support.GemfireBeanFactoryLocator;
import org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport;
@@ -265,7 +265,7 @@ public abstract class IntegrationTestsSupport {
protected static File createDirectory(File directory) {
assertThat(directory.isDirectory() || directory.mkdirs())
.as(String.format("Failed to create directory [%s]", directory)).isTrue();
.describedAs(String.format("Failed to create directory [%s]", directory)).isTrue();
if (isDeleteDirectoryOnExit()) {
directory.deleteOnExit();
@@ -275,13 +275,15 @@ public abstract class IntegrationTestsSupport {
}
protected static boolean isDeleteDirectoryOnExit() {
return Boolean.valueOf(System.getProperty(DIRECTORY_DELETE_ON_EXIT_PROPERTY, Boolean.TRUE.toString()));
return !System.getProperties().containsKey(DIRECTORY_DELETE_ON_EXIT_PROPERTY)
|| Boolean.getBoolean(DIRECTORY_DELETE_ON_EXIT_PROPERTY);
}
protected boolean isQueryDebuggingEnabled() {
return DEBUG_GEMFIRE_QUERIES || withQueryDebugging();
}
@SuppressWarnings("rawtypes")
protected static String getClassNameAsPath(Class type) {
return type.getName().replaceAll("\\.", "/");
}
@@ -290,6 +292,7 @@ public abstract class IntegrationTestsSupport {
return getClassNameAsPath(obj.getClass());
}
@SuppressWarnings("rawtypes")
protected static String getPackageNameAsPath(Class type) {
return type.getPackage().getName().replaceAll("\\.", "/");
}
@@ -298,10 +301,12 @@ public abstract class IntegrationTestsSupport {
return getPackageNameAsPath(obj.getClass());
}
@SuppressWarnings("rawtypes")
protected static String getContextXmlFileLocation(Class type) {
return getClassNameAsPath(type).concat("-context.xml");
}
@SuppressWarnings("rawtypes")
protected static String getServerContextXmlFileLocation(Class type) {
return getClassNameAsPath(type).concat("-server-context.xml");
}