Skip to content

Commit 477d6ec

Browse files
fioan89fioan89
committed
fix: non-code files needed at runtime should be under resources/ folder
- in Java/Kotlin, the resources folder is a directory used to store non-code files that are needed by an application at runtime. - in Maven/Gradle world, the resources folder is typically located under: * src/main/resources/ * src/test/resources/
1 parent 142a587 commit 477d6ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+10
-10
lines changed

‎src/test/kotlin/com/coder/toolbox/cli/CoderCLIManagerTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,15 +455,15 @@ internal class CoderCLIManagerTest {
455455
if (it.input != null) {
456456
settings.sshConfigPath.parent.toFile().mkdirs()
457457
val originalConf =
458-
Path.of("src/test/fixtures/inputs").resolve(it.input + ".conf").toFile().readText()
458+
Path.of("src/test/resources/fixtures/inputs").resolve(it.input + ".conf").toFile().readText()
459459
.replace(newlineRe, System.lineSeparator())
460460
settings.sshConfigPath.toFile().writeText(originalConf)
461461
}
462462

463463
// Output is the configuration we expect to have after configuring.
464464
val coderConfigPath = ccm.localBinaryPath.parent.resolve("config")
465465
val expectedConf =
466-
Path.of("src/test/fixtures/outputs/").resolve(it.output + ".conf").toFile().readText()
466+
Path.of("src/test/resources/fixtures/outputs/").resolve(it.output + ".conf").toFile().readText()
467467
.replace(newlineRe, System.lineSeparator())
468468
.replace("/tmp/coder-toolbox/test.coder.invalid/config", escape(coderConfigPath.toString()))
469469
.replace(
@@ -494,7 +494,7 @@ internal class CoderCLIManagerTest {
494494
// Remove is the configuration we expect after removing.
495495
assertEquals(
496496
settings.sshConfigPath.toFile().readText(),
497-
Path.of("src/test/fixtures/inputs").resolve(it.remove + ".conf").toFile()
497+
Path.of("src/test/resources/fixtures/inputs").resolve(it.remove + ".conf").toFile()
498498
.readText().replace(newlineRe, System.lineSeparator()),
499499
)
500500
}
@@ -518,7 +518,7 @@ internal class CoderCLIManagerTest {
518518
sshConfigPath = tmpdir.resolve("configured$it.conf"),
519519
)
520520
settings.sshConfigPath.parent.toFile().mkdirs()
521-
Path.of("src/test/fixtures/inputs").resolve("$it.conf").toFile().copyTo(
521+
Path.of("src/test/resources/fixtures/inputs").resolve("$it.conf").toFile().copyTo(
522522
settings.sshConfigPath.toFile(),
523523
true,
524524
)

‎src/test/kotlin/com/coder/toolbox/sdk/CoderRestClientTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ class CoderRestClientTest {
117117
val srv = HttpsServer.create(InetSocketAddress(0), 0)
118118
val sslContext =
119119
sslContextFromPEMs(
120-
Path.of("src/test/fixtures/tls", "$certName.crt").toString(),
121-
Path.of("src/test/fixtures/tls", "$certName.key").toString(),
120+
Path.of("src/test/resources/fixtures/tls", "$certName.crt").toString(),
121+
Path.of("src/test/resources/fixtures/tls", "$certName.key").toString(),
122122
"",
123123
)
124124
srv.httpsConfigurator = HttpsConfigurator(sslContext)
@@ -431,7 +431,7 @@ class CoderRestClientTest {
431431
val settings =
432432
CoderSettings(
433433
CoderSettingsState(
434-
tlsCAPath = Path.of("src/test/fixtures/tls", "self-signed.crt").toString(),
434+
tlsCAPath = Path.of("src/test/resources/fixtures/tls", "self-signed.crt").toString(),
435435
tlsAlternateHostname = "localhost",
436436
),
437437
context.logger
@@ -458,7 +458,7 @@ class CoderRestClientTest {
458458
val settings =
459459
CoderSettings(
460460
CoderSettingsState(
461-
tlsCAPath = Path.of("src/test/fixtures/tls", "self-signed.crt").toString(),
461+
tlsCAPath = Path.of("src/test/resources/fixtures/tls", "self-signed.crt").toString(),
462462
tlsAlternateHostname = "fake.example.com",
463463
),
464464
context.logger
@@ -479,7 +479,7 @@ class CoderRestClientTest {
479479
val settings =
480480
CoderSettings(
481481
CoderSettingsState(
482-
tlsCAPath = Path.of("src/test/fixtures/tls", "self-signed.crt").toString(),
482+
tlsCAPath = Path.of("src/test/resources/fixtures/tls", "self-signed.crt").toString(),
483483
),
484484
context.logger
485485
)
@@ -499,7 +499,7 @@ class CoderRestClientTest {
499499
val settings =
500500
CoderSettings(
501501
CoderSettingsState(
502-
tlsCAPath = Path.of("src/test/fixtures/tls", "chain-root.crt").toString(),
502+
tlsCAPath = Path.of("src/test/resources/fixtures/tls", "chain-root.crt").toString(),
503503
),
504504
context.logger
505505
)

‎src/test/fixtures/inputs/blank-newlines.conf renamed to ‎src/test/resources/fixtures/inputs/blank-newlines.conf

File renamed without changes.

‎src/test/fixtures/inputs/blank.conf renamed to ‎src/test/resources/fixtures/inputs/blank.conf

File renamed without changes.

‎src/test/fixtures/inputs/existing-end-no-newline.conf renamed to ‎src/test/resources/fixtures/inputs/existing-end-no-newline.conf

File renamed without changes.

‎src/test/fixtures/inputs/existing-end.conf renamed to ‎src/test/resources/fixtures/inputs/existing-end.conf

File renamed without changes.

‎src/test/fixtures/inputs/existing-middle-and-unrelated.conf renamed to ‎src/test/resources/fixtures/inputs/existing-middle-and-unrelated.conf

File renamed without changes.

‎src/test/fixtures/inputs/existing-middle.conf renamed to ‎src/test/resources/fixtures/inputs/existing-middle.conf

File renamed without changes.

‎src/test/fixtures/inputs/existing-only.conf renamed to ‎src/test/resources/fixtures/inputs/existing-only.conf

File renamed without changes.

‎src/test/fixtures/inputs/existing-start.conf renamed to ‎src/test/resources/fixtures/inputs/existing-start.conf

File renamed without changes.

‎src/test/fixtures/inputs/malformed-mismatched-start.conf renamed to ‎src/test/resources/fixtures/inputs/malformed-mismatched-start.conf

File renamed without changes.

‎src/test/fixtures/inputs/malformed-no-end.conf renamed to ‎src/test/resources/fixtures/inputs/malformed-no-end.conf

File renamed without changes.

‎src/test/fixtures/inputs/malformed-no-start.conf renamed to ‎src/test/resources/fixtures/inputs/malformed-no-start.conf

File renamed without changes.

‎src/test/fixtures/inputs/malformed-start-after-end.conf renamed to ‎src/test/resources/fixtures/inputs/malformed-start-after-end.conf

File renamed without changes.

‎src/test/fixtures/inputs/no-blocks.conf renamed to ‎src/test/resources/fixtures/inputs/no-blocks.conf

File renamed without changes.

‎src/test/fixtures/inputs/no-newline.conf renamed to ‎src/test/resources/fixtures/inputs/no-newline.conf

File renamed without changes.

‎src/test/fixtures/inputs/no-related-blocks.conf renamed to ‎src/test/resources/fixtures/inputs/no-related-blocks.conf

File renamed without changes.

‎src/test/fixtures/outputs/append-blank-newlines.conf renamed to ‎src/test/resources/fixtures/outputs/append-blank-newlines.conf

File renamed without changes.

‎src/test/fixtures/outputs/append-blank.conf renamed to ‎src/test/resources/fixtures/outputs/append-blank.conf

File renamed without changes.

‎src/test/fixtures/outputs/append-no-blocks.conf renamed to ‎src/test/resources/fixtures/outputs/append-no-blocks.conf

File renamed without changes.

‎src/test/fixtures/outputs/append-no-newline.conf renamed to ‎src/test/resources/fixtures/outputs/append-no-newline.conf

File renamed without changes.

‎src/test/fixtures/outputs/append-no-related-blocks.conf renamed to ‎src/test/resources/fixtures/outputs/append-no-related-blocks.conf

File renamed without changes.

‎src/test/fixtures/outputs/disable-autostart.conf renamed to ‎src/test/resources/fixtures/outputs/disable-autostart.conf

File renamed without changes.

‎src/test/fixtures/outputs/extra-config.conf renamed to ‎src/test/resources/fixtures/outputs/extra-config.conf

File renamed without changes.

‎src/test/fixtures/outputs/header-command-windows.conf renamed to ‎src/test/resources/fixtures/outputs/header-command-windows.conf

File renamed without changes.

‎src/test/fixtures/outputs/header-command.conf renamed to ‎src/test/resources/fixtures/outputs/header-command.conf

File renamed without changes.

‎src/test/fixtures/outputs/log-dir.conf renamed to ‎src/test/resources/fixtures/outputs/log-dir.conf

File renamed without changes.

‎src/test/fixtures/outputs/multiple-workspaces.conf renamed to ‎src/test/resources/fixtures/outputs/multiple-workspaces.conf

File renamed without changes.

‎src/test/fixtures/outputs/no-disable-autostart.conf renamed to ‎src/test/resources/fixtures/outputs/no-disable-autostart.conf

File renamed without changes.

‎src/test/fixtures/outputs/no-report-usage.conf renamed to ‎src/test/resources/fixtures/outputs/no-report-usage.conf

File renamed without changes.

‎src/test/fixtures/outputs/replace-end-no-newline.conf renamed to ‎src/test/resources/fixtures/outputs/replace-end-no-newline.conf

File renamed without changes.

‎src/test/fixtures/outputs/replace-end.conf renamed to ‎src/test/resources/fixtures/outputs/replace-end.conf

File renamed without changes.

‎src/test/fixtures/outputs/replace-middle-ignore-unrelated.conf renamed to ‎src/test/resources/fixtures/outputs/replace-middle-ignore-unrelated.conf

File renamed without changes.

‎src/test/fixtures/outputs/replace-middle.conf renamed to ‎src/test/resources/fixtures/outputs/replace-middle.conf

File renamed without changes.

‎src/test/fixtures/outputs/replace-only.conf renamed to ‎src/test/resources/fixtures/outputs/replace-only.conf

File renamed without changes.

‎src/test/fixtures/outputs/replace-start.conf renamed to ‎src/test/resources/fixtures/outputs/replace-start.conf

File renamed without changes.

‎src/test/fixtures/tls/chain-intermediate.crt renamed to ‎src/test/resources/fixtures/tls/chain-intermediate.crt

File renamed without changes.

‎src/test/fixtures/tls/chain-intermediate.key renamed to ‎src/test/resources/fixtures/tls/chain-intermediate.key

File renamed without changes.

‎src/test/fixtures/tls/chain-leaf.crt renamed to ‎src/test/resources/fixtures/tls/chain-leaf.crt

File renamed without changes.

‎src/test/fixtures/tls/chain-leaf.key renamed to ‎src/test/resources/fixtures/tls/chain-leaf.key

File renamed without changes.

‎src/test/fixtures/tls/chain-root.crt renamed to ‎src/test/resources/fixtures/tls/chain-root.crt

File renamed without changes.

‎src/test/fixtures/tls/chain-root.key renamed to ‎src/test/resources/fixtures/tls/chain-root.key

File renamed without changes.

‎src/test/fixtures/tls/chain.crt renamed to ‎src/test/resources/fixtures/tls/chain.crt

File renamed without changes.

‎src/test/fixtures/tls/chain.key renamed to ‎src/test/resources/fixtures/tls/chain.key

File renamed without changes.

‎src/test/fixtures/tls/generate.bash renamed to ‎src/test/resources/fixtures/tls/generate.bash

File renamed without changes.

‎src/test/fixtures/tls/no-signing.crt renamed to ‎src/test/resources/fixtures/tls/no-signing.crt

File renamed without changes.

‎src/test/fixtures/tls/no-signing.key renamed to ‎src/test/resources/fixtures/tls/no-signing.key

File renamed without changes.

‎src/test/fixtures/tls/self-signed.crt renamed to ‎src/test/resources/fixtures/tls/self-signed.crt

File renamed without changes.

‎src/test/fixtures/tls/self-signed.key renamed to ‎src/test/resources/fixtures/tls/self-signed.key

File renamed without changes.

0 commit comments

Comments
 (0)