opendev/gerrit
Code Issues Proposed changes

Convert ListBranchesTest into an acceptance test

Browse Source 
Add an acceptance test for the REST endpoint to list branches and
remove the old RPC implementation classes for listing branches
including the unit test.

Change-Id: Id5d18163871b78cf2fd6680cae5f1b5a89c40105
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2013-06-07 17:00:10 +02:00
committed by David Pursehouse
parent b5f15620b0
commit a7c0ba2b50
9 changed files with 335 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
gerrit-common/src/main/java/com/google/gerrit/common/data/AddBranchResult.java
View File

@@ -1,96 +0,0 @@
// Copyright (C) 2012 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.common.data;
public class AddBranchResult {
protected ListBranchesResult listBranchesResult;
protected Error error;
protected AddBranchResult() {
}
public AddBranchResult(final Error error) {
this.error = error;
}
public AddBranchResult(final ListBranchesResult listBranchesResult) {
this.listBranchesResult = listBranchesResult;
}
public ListBranchesResult getListBranchesResult() {
return listBranchesResult;
}
public boolean hasError() {
return error != null;
}
public Error getError() {
return error;
}
public static class Error {
public static enum Type {
/** The branch cannot be created because the given branch name is invalid. */
INVALID_NAME,
/** The branch cannot be created because the given revision is invalid. */
INVALID_REVISION,
/**
* The branch cannot be created under the given refname prefix (e.g
* branches cannot be created under magic refname prefixes).
*/
BRANCH_CREATION_NOT_ALLOWED_UNDER_REFNAME_PREFIX,
/** The branch that should be created exists already. */
BRANCH_ALREADY_EXISTS,
/**
* The branch cannot be created because it conflicts with an existing
* branch (branches cannot be nested).
*/
BRANCH_CREATION_CONFLICT
}
protected Type type;
protected String refname;
protected Error() {
}
public Error(final Type type) {
this(type, null);
}
public Error(final Type type, final String refname) {
this.type = type;
this.refname = refname;
}
public Type getType() {
return type;
}
public String getRefname() {
return refname;
}
@Override
public String toString() {
return type + " " + refname;
}
}
}

51
gerrit-common/src/main/java/com/google/gerrit/common/data/ListBranchesResult.java
View File

@@ -1,51 +0,0 @@
// Copyright (C) 2010 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.common.data;
import com.google.gerrit.reviewdb.client.Branch;
import java.util.List;
/**
* It holds list of branches and boolean to indicate if it is allowed to add new
* branches.
*/
public final class ListBranchesResult {
protected boolean noRepository;
protected boolean canAdd;
protected List<Branch> branches;
protected ListBranchesResult() {
}
public ListBranchesResult(List<Branch> branches, boolean canAdd,
boolean noRepository) {
this.branches = branches;
this.canAdd = canAdd;
this.noRepository = noRepository;
}
public boolean getNoRepository() {
return noRepository;
}
public boolean getCanAdd() {
return canAdd;
}
public List<Branch> getBranches() {
return branches;
}
}