Add possibility to create Default Reviewers #82
Conversation
…o defaultReviewers
…o defaultReviewers-list
# Conflicts: # src/test/java/com/cdancy/bitbucket/rest/features/DefaultReviewersApiLiveTest.java
…o defaultReviewers-list
…o defaultReviewers-list # Conflicts: # src/test/java/com/cdancy/bitbucket/rest/features/RepositoryApiLiveTest.java
# Conflicts: # src/test/java/com/cdancy/bitbucket/rest/features/BranchApiLiveTest.java # src/test/java/com/cdancy/bitbucket/rest/features/DefaultReviewersApiLiveTest.java
| Matcher matcherSrc = Matcher.create(Matcher.MatcherId.ANY, true); | ||
| Matcher matcherDst = Matcher.create(Matcher.MatcherId.ANY, true); | ||
| List<User> listUser = new ArrayList<>(); | ||
| listUser.add(User.create("test", "test@test.com", 1, "test", true, "test", "NORMAL")); |
There was a problem hiding this comment.
Will this work if you just add any user? If not we can always use the default logged in user we are running these tests with.
There was a problem hiding this comment.
Ok, I will change it for defaultUser.
|
|
||
| private GeneratedTestContents generatedTestContents; | ||
|
|
||
|
|
| @Test(groups = "live", testName = "DefaultReviewersApiLiveTest", singleThreaded = true) | ||
| public class DefaultReviewersApiLiveTest extends BaseBitbucketApiLiveTest { | ||
|
|
||
|
|
…o defaultReviewers-create # Conflicts: # src/main/java/com/cdancy/bitbucket/rest/domain/defaultreviewers/Condition.java # src/main/java/com/cdancy/bitbucket/rest/features/DefaultReviewersApi.java # src/test/java/com/cdancy/bitbucket/rest/features/DefaultReviewersApiLiveTest.java # src/test/java/com/cdancy/bitbucket/rest/features/DefaultReviewersApiMockTest.java
| return defaultUserAsString; | ||
| } | ||
|
|
||
| protected synchronized User getDefaultUser() { |
There was a problem hiding this comment.
I like this better. Would you mind just removing the defaultUserAsString and we will standardize on just using the User object across the board. All classes can then just query the User object for its actual name.
| if (username.equals(user.slug())) { | ||
| defaultUser = user; | ||
| break; | ||
| } | ||
| } |
There was a problem hiding this comment.
I would just return once we've found the correct user and throw an exception if somehow we get past the for loop.
| validCondition(returnCondition, requiredApprover, Matcher.MatcherId.ANY_REF, Matcher.MatcherId.ANY_REF); | ||
| } | ||
|
|
||
| @Test(dependsOnMethods = {"testListDefaultReviewersOnNewRepo", "testCreateCondition"}) |
There was a problem hiding this comment.
We only need to depend on method testCreateCondition as it in turn depends on method testListDefaultReviewersOnNewRepo .
| validCondition(returnCondition, requiredApprover, Matcher.MatcherId.MASTER, Matcher.MatcherId.DEVELOPMENT); | ||
| } | ||
|
|
||
| @Test(dependsOnMethods = {"testListDefaultReviewersOnNewRepo", "testCreateCondition", "testCreateConditionMatcherDifferent"}) |
There was a problem hiding this comment.
We only need to depend on method testCreateConditionMatcherDifferent if I'm not mistaken?
There was a problem hiding this comment.
No, I need to depend on method testCreateCondition and testCreateConditionMatcherDifferent because testListConditions do check if It have 2 conditions return by api. I will remove third.
|
LGTM. @j0nathan33 merging this now but am making one minor change to the |
No description provided.