minor cleanups in tests

hosh-shell · Dec 22, 2023 · 3032c20 · 3032c20
1 parent 1d39fc0
commit 3032c20
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/modules/system/src/main/java/hosh/modules/system/DurationParsing.java b/modules/system/src/main/java/hosh/modules/system/DurationParsing.java
@@ -34,7 +34,6 @@ public class DurationParsing {
 
 	/**
 	 * Parsing duration ISO 8601 format with possibility to omit leading 'PT' prefix.
-	 *
 	 * Any invalid input, including null, returns empty.
 	 */
 	public static Optional<Duration> parse(String value) {

diff --git a/runtime/src/test/java/hosh/runtime/ExternalCommandTest.java b/runtime/src/test/java/hosh/runtime/ExternalCommandTest.java
@@ -102,13 +102,14 @@ void processNoArgs() throws Exception {
 		given(process.getOutputStream()).willReturn(OutputStream.nullOutputStream());
 		given(process.getInputStream()).willReturn(InputStream.nullInputStream());
 		given(process.getErrorStream()).willReturn(InputStream.nullInputStream());
-		given(state.getCwd()).willReturn(Paths.get("."));
+		Path cwd = temporaryFolder.toPath();
+		given(state.getCwd()).willReturn(cwd);
 		given(state.getVariables()).willReturn(Collections.emptyMap());
 		ExitStatus exitStatus = sut.run(Collections.emptyList(), in, out, err);
 		assertThat(exitStatus).isSuccess();
 		then(processFactory).should().create(
 			List.of(executable.toString()),
-			Paths.get("."),
+			cwd,
 			Collections.emptyMap(),
 			Position.SOLE);
 		then(in).should().recv();
@@ -123,13 +124,14 @@ void processWithArgs() throws Exception {
 		given(process.getOutputStream()).willReturn(OutputStream.nullOutputStream());
 		given(process.getInputStream()).willReturn(InputStream.nullInputStream());
 		given(process.getErrorStream()).willReturn(InputStream.nullInputStream());
-		given(state.getCwd()).willReturn(Paths.get("."));
+		Path cwd = temporaryFolder.toPath();
+		given(state.getCwd()).willReturn(cwd);
 		given(state.getVariables()).willReturn(Collections.emptyMap());
 		ExitStatus exitStatus = sut.run(Collections.singletonList("file.hosh"), in, out, err);
 		assertThat(exitStatus).isSuccess();
 		then(processFactory).should().create(
 			List.of(executable.toString(), "file.hosh"),
-			Paths.get("."),
+			cwd,
 			Collections.emptyMap(),
 			Position.SOLE);
 		then(in).should().recv();
@@ -144,13 +146,14 @@ void processExitsWithError() throws Exception {
 		given(process.getInputStream()).willReturn(InputStream.nullInputStream());
 		given(process.getErrorStream()).willReturn(InputStream.nullInputStream());
 		given(process.getOutputStream()).willReturn(OutputStream.nullOutputStream());
-		given(state.getCwd()).willReturn(Paths.get("."));
+		Path cwd = temporaryFolder.toPath();
+		given(state.getCwd()).willReturn(cwd);
 		given(state.getVariables()).willReturn(Collections.emptyMap());
 		ExitStatus exitStatus = sut.run(Collections.singletonList("file.hosh"), in, out, err);
 		assertThat(exitStatus).isError();
 		then(processFactory).should().create(
 			List.of(executable.toString(), "file.hosh"),
-			Paths.get("."),
+			cwd,
 			Collections.emptyMap(),
 			Position.SOLE);
 		then(in).should(times(1)).recv();
@@ -165,13 +168,14 @@ void processException() throws Exception {
 		given(process.getInputStream()).willReturn(InputStream.nullInputStream());
 		given(process.getErrorStream()).willReturn(InputStream.nullInputStream());
 		given(process.getOutputStream()).willReturn(OutputStream.nullOutputStream());
-		given(state.getCwd()).willReturn(Paths.get("."));
+		Path cwd = temporaryFolder.toPath();
+		given(state.getCwd()).willReturn(cwd);
 		given(state.getVariables()).willReturn(Collections.emptyMap());
 		ExitStatus exitStatus = sut.run(Collections.singletonList("file.hosh"), in, out, err);
 		assertThat(exitStatus).isError();
 		then(processFactory).should().create(
 			List.of(executable.toString(), "file.hosh"),
-			Paths.get("."),
+			cwd,
 			Collections.emptyMap(),
 			Position.SOLE);
 		then(in).should(times(1)).recv();
@@ -202,7 +206,8 @@ void processSendRecordsToErr() throws Exception {
 		given(process.getOutputStream()).willReturn(OutputStream.nullOutputStream());
 		given(process.getInputStream()).willReturn(InputStream.nullInputStream());
 		given(process.getErrorStream()).willReturn(new ByteArrayInputStream("test".getBytes(StandardCharsets.UTF_8)));
-		given(state.getCwd()).willReturn(Paths.get("."));
+		Path cwd = temporaryFolder.toPath();
+		given(state.getCwd()).willReturn(cwd);
 		given(state.getVariables()).willReturn(Collections.emptyMap());
 		ExitStatus exitStatus = sut.run(Collections.singletonList("file.hosh"), in, out, err);
 		assertThat(exitStatus).isSuccess();
@@ -236,7 +241,8 @@ void processRecordsFromIn() throws Exception {
 	@Test
 	void throwsIoException() throws Exception {
 		given(processFactory.create(any(), any(), any(), any())).willThrow(new IOException("simulated error"));
-		given(state.getCwd()).willReturn(Paths.get("."));
+		Path cwd = temporaryFolder.toPath();
+		given(state.getCwd()).willReturn(cwd);
 		given(state.getVariables()).willReturn(Collections.emptyMap());
 		ExitStatus exitStatus = sut.run(Collections.singletonList("file.hosh"), in, out, err);
 		assertThat(exitStatus).isError();