Skip to content

Commit 1fa72f2

Browse files
committed
fix sonar error
1 parent c55bec8 commit 1fa72f2

File tree

2 files changed

+38
-2
lines changed

2 files changed

+38
-2
lines changed

dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/src/test/java/org/apache/dolphinscheduler/plugin/storage/api/local/LocalStorageOperatorTest.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@
2828
import org.apache.dolphinscheduler.spi.enums.ResourceType;
2929

3030
import java.nio.file.FileAlreadyExistsException;
31+
import java.nio.file.FileVisitResult;
3132
import java.nio.file.Files;
33+
import java.nio.file.Path;
3234
import java.nio.file.Paths;
35+
import java.nio.file.SimpleFileVisitor;
36+
import java.nio.file.attribute.BasicFileAttributes;
3337
import java.util.List;
3438

3539
import lombok.SneakyThrows;
@@ -244,8 +248,40 @@ void testFetchFileContent() {
244248

245249
}
246250

251+
@SneakyThrows
247252
@Test
248253
void testListStorageEntity_directoryNotEmpty() {
254+
Path tenantBasePath = Paths.get(TENANT_BASE_DIR);
255+
if (Files.exists(tenantBasePath)) {
256+
Files.walkFileTree(tenantBasePath, new SimpleFileVisitor<Path>() {
257+
258+
@Override
259+
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
260+
try {
261+
Files.delete(file);
262+
} catch (Exception e) {
263+
throw new RuntimeException(e);
264+
}
265+
return FileVisitResult.CONTINUE;
266+
}
267+
268+
public FileVisitResult postVisitDirectory(Path dir, Exception exc) {
269+
try {
270+
Files.delete(dir);
271+
} catch (Exception e) {
272+
throw new RuntimeException(e);
273+
}
274+
return FileVisitResult.CONTINUE;
275+
}
276+
});
277+
}
278+
279+
// 重新创建当前测试所需的干净目录结构
280+
Files.createDirectories(tenantBasePath);
281+
Files.createDirectories(tenantBasePath.resolve("emptyDirectory"));
282+
Files.createDirectories(tenantBasePath.resolve("sqlDirectory"));
283+
284+
// 原测试逻辑不变
249285
List<StorageEntity> storageEntities = storageOperator.listStorageEntity(TENANT_BASE_DIR);
250286
assertThat(storageEntities.size()).isEqualTo(2);
251287

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,8 +610,8 @@
610610
<jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
611611
</systemPropertyVariables>
612612
<parallel>methods</parallel>
613-
<threadCount>4</threadCount>
614-
<forkCount>4</forkCount>
613+
<threadCount>6</threadCount>
614+
<forkCount>6</forkCount>
615615
<reuseForks>true</reuseForks>
616616
</configuration>
617617
</plugin>

0 commit comments

Comments
 (0)