Skip to content

Commit 794e082

Browse files
NomanShoaibNomanShoaib
committed
test
1 parent 49bc637 commit 794e082

File tree

2 files changed

+40
-39
lines changed

2 files changed

+40
-39
lines changed

‎core-api/src/test/java/com/optimizely/ab/config/DatafileProjectConfigTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
import com.optimizely.ab.internal.LogbackVerifier;
3535
import com.optimizely.ab.internal.ControlAttribute;
36+
import org.junit.Assert;
3637
import org.junit.Before;
3738
import org.junit.Rule;
3839
import org.junit.Test;
@@ -74,11 +75,11 @@ public void verifyGetExperimentsForValidEvent() throws Exception {
7475
Experiment experiment118 = projectConfig.getExperimentIdMapping().get("118");
7576
List<Experiment> expectedSingleExperiment = asList(experiment223);
7677
List<Experiment> actualSingleExperiment = projectConfig.getExperimentsForEventKey("clicked_cart");
77-
assertThat(actualSingleExperiment, is(expectedSingleExperiment));
78+
Assert.assertEquals(actualSingleExperiment, expectedSingleExperiment);
7879

7980
List<Experiment> expectedMultipleExperiments = asList(experiment118, experiment223);
8081
List<Experiment> actualMultipleExperiments = projectConfig.getExperimentsForEventKey("clicked_purchase");
81-
assertThat(actualMultipleExperiments, is(expectedMultipleExperiments));
82+
Assert.assertEquals(actualMultipleExperiments, expectedMultipleExperiments);
8283
}
8384

8485
/**
@@ -89,7 +90,7 @@ public void verifyGetExperimentsForValidEvent() throws Exception {
8990
public void verifyGetExperimentsForInvalidEvent() throws Exception {
9091
List<Experiment> expectedExperiments = Collections.emptyList();
9192
List<Experiment> actualExperiments = projectConfig.getExperimentsForEventKey("a_fake_event");
92-
assertThat(actualExperiments, is(expectedExperiments));
93+
Assert.assertEquals(actualExperiments, expectedExperiments);
9394
}
9495

9596
/**
@@ -113,7 +114,7 @@ public void verifyGetAudienceConditionsFromValidId() throws Exception {
113114

114115
Condition expectedConditions = new AndCondition(andList);
115116
Condition actualConditions = projectConfig.getAudience("100").getConditions();
116-
assertThat(actualConditions, is(expectedConditions));
117+
Assert.assertEquals(actualConditions, expectedConditions);
117118
}
118119

119120
/**

‎core-api/src/test/java/com/optimizely/ab/config/DatafileProjectConfigTestUtils.java‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -462,10 +462,10 @@ public static void verifyProjectConfig(@CheckForNull ProjectConfig actual, @Nonn
462462
assertNotNull(actual);
463463

464464
// verify the project-level values
465-
assertThat(actual.getAccountId(), is(expected.getAccountId()));
466-
assertThat(actual.getProjectId(), is(expected.getProjectId()));
467-
assertThat(actual.getVersion(), is(expected.getVersion()));
468-
assertThat(actual.getRevision(), is(expected.getRevision()));
465+
Assert.assertEquals(actual.getAccountId(), expected.getAccountId());
466+
Assert.assertEquals(actual.getProjectId(), expected.getProjectId());
467+
Assert.assertEquals(actual.getVersion(), expected.getVersion());
468+
Assert.assertEquals(actual.getRevision(), expected.getRevision());
469469

470470
verifyAttributes(actual.getAttributes(), expected.getAttributes());
471471
verifyAudiences(actual.getAudiences(), expected.getAudiences());
@@ -481,20 +481,20 @@ public static void verifyProjectConfig(@CheckForNull ProjectConfig actual, @Nonn
481481
* Asserts that the provided experiment configs are equivalent.
482482
*/
483483
private static void verifyExperiments(List<Experiment> actual, List<Experiment> expected) {
484-
assertThat(actual.size(), is(expected.size()));
484+
Assert.assertEquals(actual.size(), expected.size());
485485

486486
for (int i = 0; i < actual.size(); i++) {
487487
Experiment actualExperiment = actual.get(i);
488488
Experiment expectedExperiment = expected.get(i);
489489

490-
assertThat(actualExperiment.getId(), is(expectedExperiment.getId()));
491-
assertThat(actualExperiment.getKey(), is(expectedExperiment.getKey()));
492-
assertThat(actualExperiment.getGroupId(), is(expectedExperiment.getGroupId()));
493-
assertThat(actualExperiment.getStatus(), is(expectedExperiment.getStatus()));
494-
assertThat(actualExperiment.getAudienceIds(), is(expectedExperiment.getAudienceIds()));
490+
Assert.assertEquals(actualExperiment.getId(), expectedExperiment.getId());
491+
Assert.assertEquals(actualExperiment.getKey(), expectedExperiment.getKey());
492+
Assert.assertEquals(actualExperiment.getGroupId(), expectedExperiment.getGroupId());
493+
Assert.assertEquals(actualExperiment.getStatus(), expectedExperiment.getStatus());
494+
Assert.assertEquals(actualExperiment.getAudienceIds(), expectedExperiment.getAudienceIds());
495495
Assert.assertEquals(actualExperiment.getAudienceConditions(), expectedExperiment.getAudienceConditions());
496-
assertThat(actualExperiment.getUserIdToVariationKeyMap(),
497-
is(expectedExperiment.getUserIdToVariationKeyMap()));
496+
Assert.assertEquals(actualExperiment.getUserIdToVariationKeyMap(),
497+
expectedExperiment.getUserIdToVariationKeyMap());
498498

499499
verifyVariations(actualExperiment.getVariations(), expectedExperiment.getVariations());
500500
verifyTrafficAllocations(actualExperiment.getTrafficAllocation(),
@@ -516,14 +516,14 @@ private static void verifyFeatureFlags(List<FeatureFlag> actual, List<FeatureFla
516516
* Asserts that the provided variation configs are equivalent.
517517
*/
518518
private static void verifyVariations(List<Variation> actual, List<Variation> expected) {
519-
assertThat(actual.size(), is(expected.size()));
519+
Assert.assertEquals(actual.size(), expected.size());
520520

521521
for (int i = 0; i < actual.size(); i++) {
522522
Variation actualVariation = actual.get(i);
523523
Variation expectedVariation = expected.get(i);
524524

525-
assertThat(actualVariation.getId(), is(expectedVariation.getId()));
526-
assertThat(actualVariation.getKey(), is(expectedVariation.getKey()));
525+
Assert.assertEquals(actualVariation.getId(), expectedVariation.getId());
526+
Assert.assertEquals(actualVariation.getKey(), expectedVariation.getKey());
527527
verifyFeatureVariableInstances(actualVariation.getFeatureVariableUsageInstances(),
528528
expectedVariation.getFeatureVariableUsageInstances());
529529
}
@@ -534,13 +534,13 @@ private static void verifyVariations(List<Variation> actual, List<Variation> exp
534534
*/
535535
private static void verifyTrafficAllocations(List<TrafficAllocation> actual,
536536
List<TrafficAllocation> expected) {
537-
assertThat(actual.size(), is(expected.size()));
537+
Assert.assertEquals(actual.size(), expected.size());
538538

539539
for (int i = 0; i < actual.size(); i++) {
540540
TrafficAllocation actualDistribution = actual.get(i);
541541
TrafficAllocation expectedDistribution = expected.get(i);
542542

543-
assertThat(actualDistribution.getEntityId(), is(expectedDistribution.getEntityId()));
543+
Assert.assertEquals(actualDistribution.getEntityId(), expectedDistribution.getEntityId());
544544
assertEquals("expectedDistribution: " + expectedDistribution.toString() +
545545
"is not equal to the actualDistribution: " + actualDistribution.toString(),
546546
expectedDistribution.getEndOfRange(), actualDistribution.getEndOfRange());
@@ -551,62 +551,62 @@ private static void verifyTrafficAllocations(List<TrafficAllocation> actual,
551551
* Asserts that the provided attributes configs are equivalent.
552552
*/
553553
private static void verifyAttributes(List<Attribute> actual, List<Attribute> expected) {
554-
assertThat(actual.size(), is(expected.size()));
554+
Assert.assertEquals(actual.size(), expected.size());
555555

556556
for (int i = 0; i < actual.size(); i++) {
557557
Attribute actualAttribute = actual.get(i);
558558
Attribute expectedAttribute = expected.get(i);
559559

560-
assertThat(actualAttribute.getId(), is(expectedAttribute.getId()));
561-
assertThat(actualAttribute.getKey(), is(expectedAttribute.getKey()));
562-
assertThat(actualAttribute.getSegmentId(), is(expectedAttribute.getSegmentId()));
560+
Assert.assertEquals(actualAttribute.getId(), expectedAttribute.getId());
561+
Assert.assertEquals(actualAttribute.getKey(), expectedAttribute.getKey());
562+
Assert.assertEquals(actualAttribute.getSegmentId(), expectedAttribute.getSegmentId());
563563
}
564564
}
565565

566566
/**
567567
* Asserts that the provided event configs are equivalent.
568568
*/
569569
private static void verifyEvents(List<EventType> actual, List<EventType> expected) {
570-
assertThat(actual.size(), is(expected.size()));
570+
Assert.assertEquals(actual.size(), expected.size());
571571

572572
for (int i = 0; i < actual.size(); i++) {
573573
EventType actualEvent = actual.get(i);
574574
EventType expectedEvent = expected.get(i);
575575

576-
assertThat(actualEvent.getExperimentIds(), is(expectedEvent.getExperimentIds()));
577-
assertThat(actualEvent.getId(), is(expectedEvent.getId()));
578-
assertThat(actualEvent.getKey(), is(expectedEvent.getKey()));
576+
Assert.assertEquals(actualEvent.getExperimentIds(), expectedEvent.getExperimentIds());
577+
Assert.assertEquals(actualEvent.getId(), expectedEvent.getId());
578+
Assert.assertEquals(actualEvent.getKey(), expectedEvent.getKey());
579579
}
580580
}
581581

582582
/**
583583
* Asserts that the provided audience configs are equivalent.
584584
*/
585585
private static void verifyAudiences(List<Audience> actual, List<Audience> expected) {
586-
assertThat(actual.size(), is(expected.size()));
586+
Assert.assertEquals(actual.size(), expected.size());
587587

588588
for (int i = 0; i < actual.size(); i++) {
589589
Audience actualAudience = actual.get(i);
590590
Audience expectedAudience = expected.get(i);
591591

592-
assertThat(actualAudience.getId(), is(expectedAudience.getId()));
593-
assertThat(actualAudience.getKey(), is(expectedAudience.getKey()));
594-
assertThat(actualAudience.getConditions(), is(expectedAudience.getConditions()));
592+
Assert.assertEquals(actualAudience.getId(), expectedAudience.getId());
593+
Assert.assertEquals(actualAudience.getKey(), expectedAudience.getKey());
594+
Assert.assertEquals(actualAudience.getConditions(), expectedAudience.getConditions());
595595
}
596596
}
597597

598598
/**
599599
* Assert that the provided group configs are equivalent.
600600
*/
601601
private static void verifyGroups(List<Group> actual, List<Group> expected) {
602-
assertThat(actual.size(), is(expected.size()));
602+
Assert.assertEquals(actual.size(), expected.size());
603603

604604
for (int i = 0; i < actual.size(); i++) {
605605
Group actualGroup = actual.get(i);
606606
Group expectedGroup = expected.get(i);
607607

608-
assertThat(actualGroup.getId(), is(expectedGroup.getId()));
609-
assertThat(actualGroup.getPolicy(), is(expectedGroup.getPolicy()));
608+
Assert.assertEquals(actualGroup.getId(), expectedGroup.getId());
609+
Assert.assertEquals(actualGroup.getPolicy(), expectedGroup.getPolicy());
610610
verifyTrafficAllocations(actualGroup.getTrafficAllocation(), expectedGroup.getTrafficAllocation());
611611
verifyExperiments(actualGroup.getExperiments(), expectedGroup.getExperiments());
612612
}
@@ -637,14 +637,14 @@ private static void verifyFeatureVariableInstances(List<FeatureVariableUsageInst
637637
if (expected == null) {
638638
assertNull(actual);
639639
} else {
640-
assertThat(actual.size(), is(expected.size()));
640+
Assert.assertEquals(actual.size(), expected.size());
641641

642642
for (int i = 0; i < actual.size(); i++) {
643643
FeatureVariableUsageInstance actualFeatureVariableUsageInstance = actual.get(i);
644644
FeatureVariableUsageInstance expectedFeatureVariableUsageInstance = expected.get(i);
645645

646-
assertThat(actualFeatureVariableUsageInstance.getId(), is(expectedFeatureVariableUsageInstance.getId()));
647-
assertThat(actualFeatureVariableUsageInstance.getValue(), is(expectedFeatureVariableUsageInstance.getValue()));
646+
Assert.assertEquals(actualFeatureVariableUsageInstance.getId(), expectedFeatureVariableUsageInstance.getId());
647+
Assert.assertEquals(actualFeatureVariableUsageInstance.getValue(), expectedFeatureVariableUsageInstance.getValue());
648648
}
649649
}
650650
}

0 commit comments

Comments
 (0)