-
Notifications
You must be signed in to change notification settings - Fork 238
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Corrected empty bucket get assignment bug and removed extra method fr…
…om interface Assignment
- Loading branch information
1 parent
bf74eb3
commit ea41cdf
Showing
5 changed files
with
190 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
...-test/src/main/java/com/intuit/wasabi/tests/service/EmptyBucketGetUserAssignmentTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| package com.intuit.wasabi.tests.service; | ||
| /******************************************************************************* | ||
| * Copyright 2016 Intuit | ||
| * | ||
| * 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. | ||
| *******************************************************************************/ | ||
|
|
||
| import static com.intuit.wasabi.tests.library.util.ModelAssert.assertEqualModelItems; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import org.testng.Assert; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import com.intuit.wasabi.tests.library.TestBase; | ||
| import com.intuit.wasabi.tests.library.util.Constants; | ||
| import com.intuit.wasabi.tests.library.util.serialstrategies.DefaultNameExclusionStrategy; | ||
| import com.intuit.wasabi.tests.library.util.serialstrategies.DefaultNameInclusionStrategy; | ||
| import com.intuit.wasabi.tests.model.Assignment; | ||
| import com.intuit.wasabi.tests.model.Bucket; | ||
| import com.intuit.wasabi.tests.model.Experiment; | ||
| import com.intuit.wasabi.tests.model.User; | ||
| import com.intuit.wasabi.tests.model.factory.AssignmentFactory; | ||
| import com.intuit.wasabi.tests.model.factory.BucketFactory; | ||
| import com.intuit.wasabi.tests.model.factory.ExperimentFactory; | ||
| import com.intuit.wasabi.tests.model.factory.UserFactory; | ||
|
|
||
| /** | ||
| * A test to check if user can be assigned if the previous assignment bucket is empty | ||
| */ | ||
| public class EmptyBucketGetUserAssignmentTest extends TestBase { | ||
|
|
||
| private Experiment experiment; | ||
| private List<Bucket> buckets = new ArrayList<>(); | ||
| private User specialUser = UserFactory.createUser("SpecialForBucketTest"); | ||
| private User specialUser2 = UserFactory.createUser("Special2ForBucketTest"); | ||
|
|
||
| /** | ||
| * Initializes a default experiment. | ||
| */ | ||
| public EmptyBucketGetUserAssignmentTest() { | ||
| setResponseLogLengthLimit(1000); | ||
|
|
||
| experiment = ExperimentFactory.createExperiment(); | ||
|
|
||
| DefaultNameExclusionStrategy experimentComparisonStrategy = new DefaultNameExclusionStrategy("creationTime", "modificationTime", "ruleJson"); | ||
| experiment.setSerializationStrategy(experimentComparisonStrategy); | ||
|
|
||
| } | ||
|
|
||
| @Test(dependsOnGroups = {"ping"}) | ||
| public void t_GetUserAssignmentEmptyBucket() { | ||
| Experiment exp = postExperiment(experiment); | ||
| Assert.assertNotNull(exp.creationTime, "Experiment creation failed (No creationTime)."); | ||
| Assert.assertNotNull(exp.modificationTime, "Experiment creation failed (No modificationTime)."); | ||
| Assert.assertNotNull(exp.state, "Experiment creation failed (No state)."); | ||
| experiment.update(exp); | ||
| buckets = BucketFactory.createBuckets(experiment, 3); | ||
| postBuckets(buckets); | ||
|
|
||
| experiment.state = Constants.EXPERIMENT_STATE_RUNNING; | ||
| Experiment exp2 = putExperiment(experiment); | ||
| assertEqualModelItems(exp2, experiment); | ||
| experiment.update(exp); | ||
|
|
||
| // special user 2 assigned to bucket 0 | ||
| Assignment assignment = AssignmentFactory.createAssignment() | ||
| .setAssignment(buckets.get(0).label) | ||
| .setExperimentLabel(experiment.label) | ||
| .setOverwrite(true); | ||
| Assignment putAssignmentFor2 = putAssignment(experiment, assignment, specialUser2); | ||
| assertEqualModelItems(putAssignmentFor2, assignment, new DefaultNameInclusionStrategy("assignment")); | ||
|
|
||
| // Empty bucke to which use is assigned | ||
| List<Bucket> emptyBucket = new ArrayList<>(); | ||
| emptyBucket.add(buckets.get(0)); | ||
| emptyBucket = putBucketsState(emptyBucket, Constants.BUCKET_STATE_EMPTY); | ||
|
|
||
| // Get assignment after emptying bucket | ||
| Assignment getAssignmentAfterEmpty = getAssignment(experiment, specialUser2); | ||
|
|
||
| Assignment assignmentForSpecialAfterReassignment = getAssignment(experiment, specialUser2); | ||
|
|
||
| assertEqualModelItems(assignmentForSpecialAfterReassignment, getAssignmentAfterEmpty, new DefaultNameInclusionStrategy("assignment")); | ||
| } | ||
| } |
85 changes: 85 additions & 0 deletions
85
...n/java/com/intuit/wasabi/tests/service/EmptyBucketGetUserAssignmentToEmptyBucketTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| package com.intuit.wasabi.tests.service; | ||
|
|
||
| import static com.intuit.wasabi.tests.library.util.ModelAssert.assertEqualModelItems; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import org.apache.http.HttpStatus; | ||
| import org.testng.Assert; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import com.intuit.wasabi.tests.library.TestBase; | ||
| import com.intuit.wasabi.tests.library.util.Constants; | ||
| import com.intuit.wasabi.tests.library.util.serialstrategies.DefaultNameExclusionStrategy; | ||
| import com.intuit.wasabi.tests.library.util.serialstrategies.DefaultNameInclusionStrategy; | ||
| import com.intuit.wasabi.tests.model.Assignment; | ||
| import com.intuit.wasabi.tests.model.Bucket; | ||
| import com.intuit.wasabi.tests.model.Experiment; | ||
| import com.intuit.wasabi.tests.model.User; | ||
| import com.intuit.wasabi.tests.model.factory.AssignmentFactory; | ||
| import com.intuit.wasabi.tests.model.factory.BucketFactory; | ||
| import com.intuit.wasabi.tests.model.factory.ExperimentFactory; | ||
| import com.intuit.wasabi.tests.model.factory.UserFactory; | ||
|
|
||
| /** | ||
| * A test to check if user can be assigned if the previous assignment bucket is empty | ||
| */ | ||
| public class EmptyBucketGetUserAssignmentToEmptyBucketTest extends TestBase { | ||
|
|
||
| private Experiment experiment; | ||
| private List<Bucket> buckets = new ArrayList<>(); | ||
| private User specialUser = UserFactory.createUser("SpecialForBucketTest"); | ||
|
|
||
| /** | ||
| * Initializes a default experiment. | ||
| */ | ||
| public EmptyBucketGetUserAssignmentToEmptyBucketTest() { | ||
| setResponseLogLengthLimit(1000); | ||
|
|
||
| experiment = ExperimentFactory.createExperiment(); | ||
|
|
||
| DefaultNameExclusionStrategy experimentComparisonStrategy = new DefaultNameExclusionStrategy("creationTime", "modificationTime", "ruleJson"); | ||
| experiment.setSerializationStrategy(experimentComparisonStrategy); | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * Test scenario where user is being reassigned from empty bucket to another empty bucket | ||
| */ | ||
| @Test(dependsOnGroups = {"ping"}) | ||
| public void t_AddUserToExperimentWith2BucektsAndEmptyBucketBothAndReassignToAnotherEmptyBucket() { | ||
| Experiment exp = postExperiment(experiment); | ||
| Assert.assertNotNull(exp.creationTime, "Experiment creation failed."); | ||
| Assert.assertNotNull(exp.modificationTime, "Experiment creation failed (No modificationTime)."); | ||
| Assert.assertNotNull(exp.state, "Experiment creation failed (No state)."); | ||
| experiment.update(exp); | ||
| buckets = BucketFactory.createBuckets(experiment, 2); | ||
| postBuckets(buckets); | ||
|
|
||
| experiment.state = Constants.EXPERIMENT_STATE_RUNNING; | ||
| Experiment exp2 = putExperiment(experiment); | ||
| assertEqualModelItems(exp2, experiment); | ||
| experiment.update(exp); | ||
|
|
||
| // Assign special user to bucket 0 | ||
| Assignment assignment = AssignmentFactory.createAssignment() | ||
| .setAssignment(buckets.get(0).label) | ||
| .setExperimentLabel(experiment.label) | ||
| .setOverwrite(true); | ||
| Assignment putAssignment = putAssignment(experiment, assignment, specialUser); | ||
| assertEqualModelItems(putAssignment, assignment, new DefaultNameInclusionStrategy("assignment")); | ||
|
|
||
| // Empty both buckets | ||
| List<Bucket> emptyBucket = new ArrayList<>(); | ||
| emptyBucket.add(buckets.get(0)); | ||
| emptyBucket.add(buckets.get(1)); | ||
| emptyBucket = putBucketsState(emptyBucket, Constants.BUCKET_STATE_EMPTY); | ||
|
|
||
| // There should be no bucket available for user | ||
| Assignment getAssignmentAfterAllEmptyBuckets = getAssignment(experiment, specialUser); | ||
| Assert.assertEquals(getAssignmentAfterAllEmptyBuckets.status, Constants.NO_OPEN_BUCKETS); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters