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

Refactor IntegrationTestsSupport.asDirectoryName(:Class) logic into descriptive methods.

Browse Source 
Adds the asTimestampedDirectoryName(:Class) and asUniqueDirectoryName(:Class) methods to uniquely and temporally identify a forked JVM (child) process (test) working directory.
This commit is contained in:
John Blum
2022-10-17 11:42:03 -07:00
parent 0905fd091d
commit c9cb51b52f
2 changed files with 14 additions and 9 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

@@ -39,6 +39,8 @@ import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;
import com.sun.istack.NotNull;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -535,11 +537,7 @@ public abstract class IntegrationTestsSupport {
}
protected static @NonNull String asDirectoryName(@NonNull Class<?> type) {
String baseDirectoryName = String.format(DIRECTORY_NAME_FORMAT, asQualifiedDirectoryName(type),
LocalDateTime.now().format(DateTimeFormatter.ofPattern(DATE_TIME_PATTERN)));
return baseDirectoryName.concat(File.separator).concat(UUID.randomUUID().toString());
return asUniqueDirectoryName(type);
}
private static @NonNull String asQualifiedDirectoryName(@NonNull Class<?> type) {
@@ -556,6 +554,15 @@ public abstract class IntegrationTestsSupport {
return qualifiedDirectoryName;
}
private static @NotNull String asTimestampedDirectoryName(@NonNull Class<?> type) {
return String.format(DIRECTORY_NAME_FORMAT, asQualifiedDirectoryName(type),
LocalDateTime.now().format(DateTimeFormatter.ofPattern(DATE_TIME_PATTERN)));
}
private static @NotNull String asUniqueDirectoryName(@NonNull Class<?> type) {
return String.format(DIRECTORY_NAME_FORMAT, asTimestampedDirectoryName(type), UUID.randomUUID());
}
protected static @NonNull File createDirectory(@NonNull String pathname) {
return createDirectory(new File(pathname));
}

6
spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupportUnitTests.java
View File

@@ -17,7 +17,6 @@ package org.springframework.data.gemfire.tests.integration;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.File;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -41,10 +40,9 @@ public class IntegrationTestsSupportUnitTests {
String directoryName = IntegrationTestsSupport.asDirectoryName(OuterType.InnerType.class);
assertThat(directoryName).isNotBlank();
assertThat(directoryName).startsWith(String.format("%s.%s.%s-%s%s",
assertThat(directoryName).matches(String.format("%s\\.%s\\.%s-%s-",
IntegrationTestsSupportUnitTests.class.getSimpleName(), OuterType.class.getSimpleName(), OuterType.InnerType.class.getSimpleName(),
DateTimeFormatter.ofPattern(IntegrationTestsSupport.DATE_TIME_PATTERN).format(now),
File.separator));
DateTimeFormatter.ofPattern(IntegrationTestsSupport.DATE_TIME_PATTERN).format(now)).concat("[\\w-]+"));
}