opendev/gerrit
Code Issues Proposed changes

Move custom Truth subjects to gerrit-test-util

Browse Source 
To simplify and encourage writing unit tests, the custom Truth subjects
are moved to a Bazel/Buck package which is available to the IT tests as
well as the unit tests.

Change-Id: I529bfa5e8b566a17a05a2ba33c884655bb454dcf
This commit is contained in:
Alice Kober-Sotzek 2016-12-08 11:54:42 +01:00
parent bc8186ad79
commit 4f8edafb7c
7 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/BUCK
View File

@ -4,11 +4,4 @@ acceptance_tests(
group = 'api_revision',
srcs = glob(['*IT.java']),
labels = ['api'],
deps = [':custom_truth_subjects'],
)
java_library(
name = 'custom_truth_subjects',
srcs = glob(['*Subject.java']),
deps = ['//gerrit-acceptance-tests:lib'],
)

8
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/BUILD
View File

@ -4,12 +4,4 @@ acceptance_tests(
srcs = glob(["*IT.java"]),
group = "api_revision",
labels = ["api"],
deps = [":custom_truth_subjects"],
)
java_library(
name = "custom_truth_subjects",
testonly = 1,
srcs = glob(["*Subject.java"]),
deps = ["//gerrit-acceptance-tests:lib"],
)

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java
View File

@ -17,7 +17,7 @@ package com.google.gerrit.acceptance.api.revision;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.acceptance.PushOneCommit.FILE_NAME;
import static com.google.gerrit.acceptance.api.revision.RobotCommentInfoSubject.assertThatList;
import static com.google.gerrit.extensions.common.RobotCommentInfoSubject.assertThatList;
import com.google.common.collect.Iterables;
import com.google.gerrit.acceptance.AbstractDaemonTest;

3
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/FixReplacementInfoSubject.java → gerrit-test-util/src/main/java/com/google/gerrit/extensions/common/FixReplacementInfoSubject.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.acceptance.api.revision;
package com.google.gerrit.extensions.common;
import static com.google.common.truth.Truth.assertAbout;
@ -22,7 +22,6 @@ import com.google.common.truth.Subject;
import com.google.common.truth.SubjectFactory;
import com.google.common.truth.Truth;
import com.google.gerrit.extensions.client.RangeSubject;
import com.google.gerrit.extensions.common.FixReplacementInfo;
public class FixReplacementInfoSubject
extends Subject<FixReplacementInfoSubject, FixReplacementInfo> {

6
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/FixSuggestionInfoSubject.java → gerrit-test-util/src/main/java/com/google/gerrit/extensions/common/FixSuggestionInfoSubject.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.acceptance.api.revision;
package com.google.gerrit.extensions.common;
import static com.google.common.truth.Truth.assertAbout;
@ -21,9 +21,7 @@ import com.google.common.truth.StringSubject;
import com.google.common.truth.Subject;
import com.google.common.truth.SubjectFactory;
import com.google.common.truth.Truth;
import com.google.gerrit.acceptance.ListSubject;
import com.google.gerrit.extensions.common.FixReplacementInfo;
import com.google.gerrit.extensions.common.FixSuggestionInfo;
import com.google.gerrit.truth.ListSubject;
public class FixSuggestionInfoSubject
extends Subject<FixSuggestionInfoSubject, FixSuggestionInfo> {

8
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentInfoSubject.java → gerrit-test-util/src/main/java/com/google/gerrit/extensions/common/RobotCommentInfoSubject.java
View File

@ -12,20 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.acceptance.api.revision;
package com.google.gerrit.extensions.common;
import static com.google.common.truth.Truth.assertAbout;
import com.google.common.truth.FailureStrategy;
import com.google.common.truth.Subject;
import com.google.common.truth.SubjectFactory;
import com.google.gerrit.acceptance.ListSubject;
import com.google.gerrit.extensions.common.FixSuggestionInfo;
import com.google.gerrit.extensions.common.RobotCommentInfo;
import com.google.gerrit.truth.ListSubject;
import java.util.List;
class RobotCommentInfoSubject
public class RobotCommentInfoSubject
extends Subject<RobotCommentInfoSubject, RobotCommentInfo> {
private static final SubjectFactory<RobotCommentInfoSubject, RobotCommentInfo>

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ListSubject.java → gerrit-test-util/src/main/java/com/google/gerrit/truth/ListSubject.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.acceptance;
package com.google.gerrit.truth;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.truth.Truth.assertAbout;