Skip to content

Adjust code for Kiwi TCMS v9.0 #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2021
Merged

Adjust code for Kiwi TCMS v9.0 #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/main/java/org/kiwitcms/java/api/RpcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,10 @@ public Build[] getBuilds(Map<String, Object> filter) {
}
}

public Build createBuild(String name, int productId) {
public Build createBuild(String name, int versionId) {
Map<String, Object> params = new HashMap<>();
params.put("name", name);
params.put("product", productId);
params.put("version", versionId);
JSONObject json = (JSONObject) executeViaPositionalParams(CREATE_BUILD_METHOD, Arrays.asList((Object) params));
try {
return new ObjectMapper().readValue(json.toJSONString(), Build.class);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/kiwitcms/java/junit/TestDataEmitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public int getTestRunId() {
//TODO: this must check if this TR is already available in the DB
// and not create a new TR for the same product, version and build
if (runId == null) {
runId = client.createNewRun(getBuild(getProductId()),
runId = client.createNewRun(getBuild(getVersion(getProductId())),
config.getUsername(),
getPlanId(),
String.format("[JUnit] Results for %s, %s, %s",
Expand Down Expand Up @@ -109,17 +109,17 @@ public void addTestResultsToRun(int runId, List<TestMethod> tests) {
}
}

public int getBuild(int productId) {
public int getBuild(int versionId) {
String confBuild = config.getBuild();
Map<String, Object> filter = new HashMap<>();
filter.put("product", productId);
filter.put("version", versionId);
if (confBuild != null) {
filter.put("name", confBuild);
Build[] existingBuilds = client.getBuilds(filter);
if (existingBuilds.length > 0) {
return existingBuilds[0].getId();
} else {
Build newBuild = client.createBuild(confBuild, productId);
Build newBuild = client.createBuild(confBuild, versionId);
if (newBuild != null) {
return newBuild.getId();
}
Expand Down