Skip to content

Commit 0c20b59

Browse files
committed
BUILD-4823 Fix code missed during rename
1 parent dc0f809 commit 0c20b59

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

lib/src/main/java/org/sonarsource/scanner/lib/internal/TempCleaning.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void clean() {
5656

5757
try (Stream<Path> files = Files.list(tempDir)) {
5858
files
59-
.filter(p -> p.getFileName().toString().startsWith("sonar-scanner-api-batch"))
59+
.filter(p -> p.getFileName().toString().startsWith("sonar-scanner-java-library-batch"))
6060
.filter(p -> lastModifiedTime(p) < cutoff)
6161
.forEach(Utils::deleteQuietly);
6262
logger.debug("Temp cleaning done");

lib/src/test/java/org/sonarsource/scanner/lib/internal/TempCleaningTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@
1919
*/
2020
package org.sonarsource.scanner.lib.internal;
2121

22-
import static org.assertj.core.api.Assertions.assertThat;
23-
import static org.mockito.Mockito.mock;
24-
2522
import java.nio.charset.StandardCharsets;
2623
import java.nio.file.Files;
2724
import java.nio.file.Path;
2825
import java.nio.file.attribute.FileTime;
29-
3026
import org.junit.Rule;
3127
import org.junit.Test;
3228
import org.junit.rules.TemporaryFolder;
3329
import org.sonarsource.scanner.lib.internal.cache.Logger;
3430

31+
import static org.assertj.core.api.Assertions.assertThat;
32+
import static org.mockito.Mockito.mock;
33+
3534
public class TempCleaningTest {
3635

3736
@Rule
@@ -46,12 +45,12 @@ public void should_clean_jvm_tmp_dir() {
4645
@Test
4746
public void should_clean() throws Exception {
4847
Path dir = temp.newFolder().toPath();
49-
Path oldBatch = dir.resolve("sonar-scanner-api-batch656.jar");
48+
Path oldBatch = dir.resolve("sonar-scanner-java-library-batch656.jar");
5049
Files.write(oldBatch, "foo".getBytes(StandardCharsets.UTF_8));
5150
FileTime fTime = FileTime.fromMillis(System.currentTimeMillis() - 3 * TempCleaning.ONE_DAY_IN_MILLISECONDS);
5251
Files.setLastModifiedTime(oldBatch, fTime);
5352

54-
Path youngBatch = dir.resolve("sonar-scanner-api-batch123.jar");
53+
Path youngBatch = dir.resolve("sonar-scanner-java-library-batch123.jar");
5554
Files.write(youngBatch, "foo".getBytes(StandardCharsets.UTF_8));
5655

5756
Path doNotDelete = dir.resolve("jacoco.txt");

0 commit comments

Comments
 (0)