Skip to content

Commit c138d09

Browse files
committed
Extract randWorkspace to shared class
1 parent d2a3649 commit c138d09

File tree

2 files changed

+27
-25
lines changed

2 files changed

+27
-25
lines changed

src/test/groovy/CoderCLIManagerTest.groovy

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package com.coder.gateway.sdk
22

3-
import com.coder.gateway.models.WorkspaceAgentModel
4-
import com.coder.gateway.models.WorkspaceAndAgentStatus
5-
import com.coder.gateway.models.WorkspaceVersionStatus
6-
import com.coder.gateway.sdk.v2.models.WorkspaceStatus
7-
import com.coder.gateway.sdk.v2.models.WorkspaceTransition
83
import com.sun.net.httpserver.HttpExchange
94
import com.sun.net.httpserver.HttpHandler
105
import com.sun.net.httpserver.HttpServer
@@ -364,25 +359,6 @@ class CoderCLIManagerTest extends Specification {
364359
Path.of("/tmp/coder-gateway-test/localappdata/coder-gateway") == dataDir()
365360
}
366361

367-
private WorkspaceAgentModel randWorkspace(String name) {
368-
return new WorkspaceAgentModel(
369-
UUID.randomUUID(),
370-
name,
371-
name,
372-
UUID.randomUUID(),
373-
"template-name",
374-
"template-icon-path",
375-
null,
376-
WorkspaceVersionStatus.UPDATED,
377-
WorkspaceStatus.RUNNING,
378-
WorkspaceAndAgentStatus.READY,
379-
WorkspaceTransition.START,
380-
null,
381-
null,
382-
null
383-
)
384-
}
385-
386362
def "configures an SSH file"() {
387363
given:
388364
def sshConfigPath = tmpdir.resolve(input + "_to_" + output + ".conf")
@@ -401,7 +377,7 @@ class CoderCLIManagerTest extends Specification {
401377
.replace("/tmp/coder-gateway/test.coder.invalid/coder-linux-amd64", ccm.localBinaryPath.toString())
402378

403379
when:
404-
ccm.configSsh(workspaces.collect { randWorkspace(it) })
380+
ccm.configSsh(workspaces.collect { DataGen.workspace(it) })
405381

406382
then:
407383
sshConfigPath.toFile().text == expectedConf

src/test/groovy/DataGen.groovy

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import com.coder.gateway.models.WorkspaceAgentModel
2+
import com.coder.gateway.models.WorkspaceAndAgentStatus
3+
import com.coder.gateway.models.WorkspaceVersionStatus
4+
import com.coder.gateway.sdk.v2.models.WorkspaceStatus
5+
import com.coder.gateway.sdk.v2.models.WorkspaceTransition
6+
7+
class DataGen {
8+
static WorkspaceAgentModel workspace(String name, String workspaceName = name) {
9+
return new WorkspaceAgentModel(
10+
UUID.randomUUID(),
11+
workspaceName,
12+
name,
13+
UUID.randomUUID(),
14+
"template-name",
15+
"template-icon-path",
16+
null,
17+
WorkspaceVersionStatus.UPDATED,
18+
WorkspaceStatus.RUNNING,
19+
WorkspaceAndAgentStatus.READY,
20+
WorkspaceTransition.START,
21+
null,
22+
null,
23+
null
24+
)
25+
}
26+
}

0 commit comments

Comments
 (0)