Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,9 @@ public void testCreateTool() throws Exception {
try {
CreateToolOptions createToolOptions = new CreateToolOptions.Builder()
.toolchainId(toolchainIdLink)
.toolTypeId("draservicebroker")
.toolTypeId("pipeline")
.name("testString")
.parameters(java.util.Collections.singletonMap("anyKey", "anyValue"))
.parameters(java.util.Collections.singletonMap("type", "tekton"))
.build();

// Invoke operation
Expand Down Expand Up @@ -495,8 +495,8 @@ public void testUpdateTool() throws Exception {
try {
ToolchainToolPrototypePatch toolchainToolPrototypePatchModel = new ToolchainToolPrototypePatch.Builder()
.name("MyTool")
.toolTypeId("draservicebroker")
.parameters(java.util.Collections.singletonMap("anyKey", "anyValue"))
.toolTypeId("pipeline")
.parameters(java.util.Collections.singletonMap("type", "tekton"))
.build();
Map<String, Object> toolchainToolPrototypePatchModelAsPatch = toolchainToolPrototypePatchModel.asPatch();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -628,9 +628,9 @@ public void testCreateToolWOptions() throws Throwable {
// Construct an instance of the CreateToolOptions model
CreateToolOptions createToolOptionsModel = new CreateToolOptions.Builder()
.toolchainId("testString")
.toolTypeId("draservicebroker")
.toolTypeId("pipeline")
.name("testString")
.parameters(java.util.Collections.singletonMap("anyKey", "anyValue"))
.parameters(java.util.Collections.singletonMap("type", "tekton"))
.build();

// Invoke createTool() with a valid options model and verify the result
Expand Down Expand Up @@ -785,8 +785,8 @@ public void testUpdateToolWOptions() throws Throwable {
// Construct an instance of the ToolchainToolPrototypePatch model
ToolchainToolPrototypePatch toolchainToolPrototypePatchModel = new ToolchainToolPrototypePatch.Builder()
.name("MyTool")
.toolTypeId("draservicebroker")
.parameters(java.util.Collections.singletonMap("anyKey", "anyValue"))
.toolTypeId("pipeline")
.parameters(java.util.Collections.singletonMap("type", "tekton"))
.build();
Map<String, Object> toolchainToolPrototypePatchModelAsPatch = toolchainToolPrototypePatchModel.asPatch();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ public class CreateToolOptionsTest {
public void testCreateToolOptions() throws Throwable {
CreateToolOptions createToolOptionsModel = new CreateToolOptions.Builder()
.toolchainId("testString")
.toolTypeId("draservicebroker")
.toolTypeId("pipeline")
.name("testString")
.parameters(java.util.Collections.singletonMap("anyKey", "anyValue"))
.parameters(java.util.Collections.singletonMap("type", "tekton"))
.build();
assertEquals(createToolOptionsModel.toolchainId(), "testString");
assertEquals(createToolOptionsModel.toolTypeId(), "draservicebroker");
assertEquals(createToolOptionsModel.toolTypeId(), "pipeline");
assertEquals(createToolOptionsModel.name(), "testString");
assertEquals(createToolOptionsModel.parameters(), java.util.Collections.singletonMap("anyKey", "anyValue"));
assertEquals(createToolOptionsModel.parameters(), java.util.Collections.singletonMap("type", "tekton"));
}

@Test(expectedExceptions = IllegalArgumentException.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,33 +34,33 @@ public class ToolchainToolPrototypePatchTest {
public void testToolchainToolPrototypePatch() throws Throwable {
ToolchainToolPrototypePatch toolchainToolPrototypePatchModel = new ToolchainToolPrototypePatch.Builder()
.name("MyTool")
.toolTypeId("draservicebroker")
.parameters(java.util.Collections.singletonMap("anyKey", "anyValue"))
.toolTypeId("pipeline")
.parameters(java.util.Collections.singletonMap("type", "tekton"))
.build();
assertEquals(toolchainToolPrototypePatchModel.name(), "MyTool");
assertEquals(toolchainToolPrototypePatchModel.toolTypeId(), "draservicebroker");
assertEquals(toolchainToolPrototypePatchModel.parameters(), java.util.Collections.singletonMap("anyKey", "anyValue"));
assertEquals(toolchainToolPrototypePatchModel.toolTypeId(), "pipeline");
assertEquals(toolchainToolPrototypePatchModel.parameters(), java.util.Collections.singletonMap("type", "tekton"));

String json = TestUtilities.serialize(toolchainToolPrototypePatchModel);

ToolchainToolPrototypePatch toolchainToolPrototypePatchModelNew = TestUtilities.deserialize(json, ToolchainToolPrototypePatch.class);
assertTrue(toolchainToolPrototypePatchModelNew instanceof ToolchainToolPrototypePatch);
assertEquals(toolchainToolPrototypePatchModelNew.name(), "MyTool");
assertEquals(toolchainToolPrototypePatchModelNew.toolTypeId(), "draservicebroker");
assertEquals(toolchainToolPrototypePatchModelNew.parameters().toString(), java.util.Collections.singletonMap("anyKey", "anyValue").toString());
assertEquals(toolchainToolPrototypePatchModelNew.toolTypeId(), "pipeline");
assertEquals(toolchainToolPrototypePatchModelNew.parameters().toString(), java.util.Collections.singletonMap("type", "tekton").toString());
}
@Test
public void testToolchainToolPrototypePatchAsPatch() throws Throwable {
ToolchainToolPrototypePatch toolchainToolPrototypePatchModel = new ToolchainToolPrototypePatch.Builder()
.name("MyTool")
.toolTypeId("draservicebroker")
.parameters(java.util.Collections.singletonMap("anyKey", "anyValue"))
.toolTypeId("pipeline")
.parameters(java.util.Collections.singletonMap("type", "tekton"))
.build();

Map<String, Object> mergePatch = toolchainToolPrototypePatchModel.asPatch();

assertEquals(mergePatch.get("name"), "MyTool");
assertEquals(mergePatch.get("tool_type_id"), "draservicebroker");
assertEquals(mergePatch.get("tool_type_id"), "pipeline");
assertTrue(mergePatch.containsKey("parameters"));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ public static void main(String[] args) throws Exception {
// begin-create_tool
CreateToolOptions createToolOptions = new CreateToolOptions.Builder()
.toolchainId(toolchainIdLink)
.toolTypeId("draservicebroker")
.toolTypeId("pipeline")
.parameters(java.util.Collections.singletonMap("type", "tekton"))
.build();

Response<ToolchainToolPost> response = cdToolchainService.createTool(createToolOptions).execute();
Expand Down