Skip to content

Commit 5d4fe1a

Browse files
Fixed invalid folder changing for gradle parser after cloning the repo
1 parent d28e8fc commit 5d4fe1a

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

src/main/java/io/micrometer/release/common/ProcessRunner.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ public String getOrgRepo() {
6969
return orgRepo;
7070
}
7171

72+
public File getDirectory() {
73+
return directory;
74+
}
75+
7276
public List<String> run(List<String> command) {
7377
return run(command.toArray(new String[0]));
7478
}

src/main/java/io/micrometer/release/train/DependencyVerifier.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717

1818
import com.fasterxml.jackson.core.JsonProcessingException;
1919
import com.fasterxml.jackson.databind.ObjectMapper;
20-
import io.micrometer.release.common.*;
20+
import io.micrometer.release.common.Dependency;
21+
import io.micrometer.release.common.GradleParser;
22+
import io.micrometer.release.common.Input;
23+
import io.micrometer.release.common.ProcessRunner;
2124
import io.micrometer.release.train.TrainOptions.ProjectSetup;
2225
import org.slf4j.Logger;
2326
import org.slf4j.LoggerFactory;

src/main/java/io/micrometer/release/train/Git.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ File cloneRepo(String branch, String orgRepository) {
4242
}
4343

4444
File clonedDir(String subfolder) {
45-
return new File(subfolder);
45+
return new File(processRunner.getDirectory(), subfolder);
4646
}
4747

4848
}

src/test/java/io/micrometer/release/train/GitTests.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
import io.micrometer.release.common.ProcessRunner;
1717
import org.junit.jupiter.api.Test;
1818

19+
import java.io.File;
20+
21+
import static org.assertj.core.api.Assertions.assertThat;
22+
import static org.mockito.BDDMockito.given;
1923
import static org.mockito.BDDMockito.then;
2024
import static org.mockito.Mockito.mock;
2125

@@ -35,12 +39,15 @@ void should_checkout_tag() {
3539

3640
@Test
3741
void should_clone_a_repo() {
42+
File parentFile = new File("micrometer");
43+
given(processRunner.getDirectory()).willReturn(parentFile);
3844
Git git = new Git(processRunner);
3945

40-
git.cloneRepo("foo", "micrometer-metrics/micrometer");
46+
File clonedRepo = git.cloneRepo("foo", "micrometer-metrics/micrometer");
4147

4248
then(processRunner).should()
4349
.run("gh", "repo", "clone", "micrometer-metrics/micrometer", "foo", "--", "-b", "foo", "--single-branch");
50+
assertThat(clonedRepo).isEqualTo(new File(parentFile, "foo"));
4451
}
4552

4653
}

0 commit comments

Comments
 (0)