Skip to content

Commit c36c030

Browse files
code-ashercode-asher
committed
Clean up some trailing parentheses
1 parent 4400bb5 commit c36c030

File tree

2 files changed

+23
-40
lines changed

2 files changed

+23
-40
lines changed

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ internal class CoderCLIManagerTest {
120120

121121
val (srv, url) = mockServer()
122122
val ccm = CoderCLIManager(url, CoderSettings(CoderSettingsState(
123-
dataDirectory = tmpdir.resolve("cli-dir-fail-to-write").toString()))
124-
)
123+
dataDirectory = tmpdir.resolve("cli-dir-fail-to-write").toString())))
125124

126125
ccm.localBinaryPath.parent.toFile().mkdirs()
127126
ccm.localBinaryPath.parent.toFile().setWritable(false)
@@ -146,8 +145,7 @@ internal class CoderCLIManagerTest {
146145
}
147146

148147
val ccm = CoderCLIManager(url.toURL(), CoderSettings(CoderSettingsState(
149-
dataDirectory = tmpdir.resolve("real-cli").toString()))
150-
)
148+
dataDirectory = tmpdir.resolve("real-cli").toString())))
151149

152150
assertTrue(ccm.download())
153151
assertDoesNotThrow { ccm.version() }
@@ -165,11 +163,10 @@ internal class CoderCLIManagerTest {
165163
fun testDownloadMockCLI() {
166164
val (srv, url) = mockServer()
167165
var ccm = CoderCLIManager(url, CoderSettings(CoderSettingsState(
168-
dataDirectory = tmpdir.resolve("mock-cli").toString()))
169-
)
166+
dataDirectory = tmpdir.resolve("mock-cli").toString()),
167+
binaryName = "coder.bat"))
170168

171169
assertEquals(true, ccm.download())
172-
173170
assertEquals(SemVer(url.port.toLong(), 0, 0), ccm.version())
174171

175172
// It should skip the second attempt.
@@ -189,8 +186,7 @@ internal class CoderCLIManagerTest {
189186
@Test
190187
fun testRunNonExistentBinary() {
191188
val ccm = CoderCLIManager(URL("https://foo"), CoderSettings(CoderSettingsState(
192-
dataDirectory = tmpdir.resolve("does-not-exist").toString()))
193-
)
189+
dataDirectory = tmpdir.resolve("does-not-exist").toString())))
194190

195191
assertFailsWith(
196192
exceptionClass = ProcessInitException::class,
@@ -201,8 +197,7 @@ internal class CoderCLIManagerTest {
201197
fun testOverwitesWrongVersion() {
202198
val (srv, url) = mockServer()
203199
val ccm = CoderCLIManager(url, CoderSettings(CoderSettingsState(
204-
dataDirectory = tmpdir.resolve("overwrite-cli").toString()))
205-
)
200+
dataDirectory = tmpdir.resolve("overwrite-cli").toString())))
206201

207202
ccm.localBinaryPath.parent.toFile().mkdirs()
208203
ccm.localBinaryPath.toFile().writeText("cli")
@@ -329,9 +324,7 @@ internal class CoderCLIManagerTest {
329324
sshConfigPath = tmpdir.resolve("configured$it.conf"))
330325
settings.sshConfigPath.parent.toFile().mkdirs()
331326
Path.of("src/test/fixtures/inputs").resolve("$it.conf").toFile().copyTo(
332-
settings.sshConfigPath.toFile(),
333-
true,
334-
)
327+
settings.sshConfigPath.toFile(), true)
335328

336329
val ccm = CoderCLIManager(URL("https://test.coder.invalid"), settings)
337330

@@ -349,8 +342,7 @@ internal class CoderCLIManagerTest {
349342

350343
tests.forEach {
351344
val ccm = CoderCLIManager(URL("https://test.coder.invalid"), CoderSettings(CoderSettingsState(
352-
headerCommand = it))
353-
)
345+
headerCommand = it)))
354346

355347
assertFailsWith(
356348
exceptionClass = Exception::class,

‎src/test/kotlin/com/coder/gateway/settings/CoderSettingsTest.kt

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ internal class CoderSettingsTest {
3636
env = Environment(mapOf(
3737
"LOCALAPPDATA" to "/tmp/coder-gateway-test/localappdata",
3838
"HOME" to "/tmp/coder-gateway-test/home",
39-
"XDG_DATA_HOME" to "/tmp/coder-gateway-test/xdg-data"))
40-
)
39+
"XDG_DATA_HOME" to "/tmp/coder-gateway-test/xdg-data")))
4140
var expected = when(getOS()) {
4241
OS.WINDOWS -> "/tmp/coder-gateway-test/localappdata/coder-gateway/localhost"
4342
OS.MAC -> "/tmp/coder-gateway-test/home/Library/Application Support/coder-gateway/localhost"
@@ -52,8 +51,7 @@ internal class CoderSettingsTest {
5251
settings = CoderSettings(state,
5352
env = Environment(mapOf(
5453
"XDG_DATA_HOME" to "",
55-
"HOME" to "/tmp/coder-gateway-test/home"))
56-
)
54+
"HOME" to "/tmp/coder-gateway-test/home")))
5755
expected = "/tmp/coder-gateway-test/home/.local/share/coder-gateway/localhost"
5856

5957
assertEquals(Path.of(expected).toAbsolutePath(), settings.dataDir(url))
@@ -66,8 +64,7 @@ internal class CoderSettingsTest {
6664
env = Environment(mapOf(
6765
"LOCALAPPDATA" to "/ignore",
6866
"HOME" to "/ignore",
69-
"XDG_DATA_HOME" to "/ignore"))
70-
)
67+
"XDG_DATA_HOME" to "/ignore")))
7168
expected = "/tmp/coder-gateway-test/data-dir/localhost"
7269
assertEquals(Path.of(expected).toAbsolutePath(), settings.dataDir(url))
7370
assertEquals(Path.of(expected).toAbsolutePath(), settings.binPath(url).parent)
@@ -110,11 +107,10 @@ internal class CoderSettingsTest {
110107
fun testCoderConfigDir() {
111108
val state = CoderSettingsState()
112109
var settings = CoderSettings(state,
113-
env = Environment(
114-
mapOf("APPDATA" to "/tmp/coder-gateway-test/cli-appdata",
115-
"HOME" to "/tmp/coder-gateway-test/cli-home",
116-
"XDG_CONFIG_HOME" to "/tmp/coder-gateway-test/cli-xdg-config"))
117-
)
110+
env = Environment(mapOf(
111+
"APPDATA" to "/tmp/coder-gateway-test/cli-appdata",
112+
"HOME" to "/tmp/coder-gateway-test/cli-home",
113+
"XDG_CONFIG_HOME" to "/tmp/coder-gateway-test/cli-xdg-config")))
118114
var expected = when(getOS()) {
119115
OS.WINDOWS -> "/tmp/coder-gateway-test/cli-appdata/coderv2"
120116
OS.MAC -> "/tmp/coder-gateway-test/cli-home/Library/Application Support/coderv2"
@@ -125,25 +121,20 @@ internal class CoderSettingsTest {
125121
// Fall back to HOME on Linux.
126122
if (getOS() == OS.LINUX) {
127123
settings = CoderSettings(state,
128-
env = Environment(
129-
mapOf("XDG_CONFIG_HOME" to "",
130-
"HOME" to "/tmp/coder-gateway-test/cli-home",
131-
))
132-
)
124+
env = Environment(mapOf(
125+
"XDG_CONFIG_HOME" to "",
126+
"HOME" to "/tmp/coder-gateway-test/cli-home")))
133127
expected = "/tmp/coder-gateway-test/cli-home/.config/coderv2"
134128
assertEquals(Path.of(expected), settings.coderConfigDir)
135129
}
136130

137131
// Read CODER_CONFIG_DIR.
138132
settings = CoderSettings(state,
139-
env = Environment(
140-
mapOf(
141-
"CODER_CONFIG_DIR" to "/tmp/coder-gateway-test/coder-config-dir",
142-
"APPDATA" to "/ignore",
143-
"HOME" to "/ignore",
144-
"XDG_CONFIG_HOME" to "/ignore",
145-
))
146-
)
133+
env = Environment(mapOf(
134+
"CODER_CONFIG_DIR" to "/tmp/coder-gateway-test/coder-config-dir",
135+
"APPDATA" to "/ignore",
136+
"HOME" to "/ignore",
137+
"XDG_CONFIG_HOME" to "/ignore")))
147138
expected = "/tmp/coder-gateway-test/coder-config-dir"
148139
assertEquals(Path.of(expected), settings.coderConfigDir)
149140
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy