@@ -198,7 +198,7 @@ public void evaluateWithPrerequisites() {
198198 List <Prerequisite > prerequisites = Arrays .asList (new Prerequisite ("split1" , Arrays .asList (TREATMENT_VALUE )));
199199
200200 ParsedSplit split = new ParsedSplit (SPLIT_NAME , 0 , false , DEFAULT_TREATMENT_VALUE , _conditions , TRAFFIC_TYPE_VALUE , CHANGE_NUMBER , 60 , 18 , 2 , _configurations , new HashSet <>(), true , new PrerequisitesMatcher (prerequisites ));
201- ParsedSplit split1 = new ParsedSplit ("split1" , 0 , false , DEFAULT_TREATMENT_VALUE , _conditions , TRAFFIC_TYPE_VALUE , CHANGE_NUMBER , 60 , 18 , 2 , _configurations , new HashSet <>(), true , new PrerequisitesMatcher (null ));
201+ ParsedSplit split1 = new ParsedSplit ("split1" , 0 , false , TREATMENT_VALUE , _conditions , TRAFFIC_TYPE_VALUE , CHANGE_NUMBER , 60 , 18 , 2 , _configurations , new HashSet <>(), true , new PrerequisitesMatcher (null ));
202202
203203 Mockito .when (_splitCacheConsumer .get (SPLIT_NAME )).thenReturn (split );
204204 Mockito .when (_splitCacheConsumer .get ("split1" )).thenReturn (split1 );
@@ -208,11 +208,6 @@ public void evaluateWithPrerequisites() {
208208 assertEquals ("test whitelist label" , result .label );
209209 assertEquals (CHANGE_NUMBER , result .changeNumber );
210210
211- result = _evaluator .evaluateFeature (MATCHING_KEY , BUCKETING_KEY , SPLIT_NAME , null );
212- assertEquals (DEFAULT_TREATMENT_VALUE , result .treatment );
213- assertEquals (Labels .PREREQUISITES_NOT_MET , result .label );
214- assertEquals (CHANGE_NUMBER , result .changeNumber );
215-
216211 // if split is killed, label should be killed.
217212 split = new ParsedSplit (SPLIT_NAME , 0 , true , DEFAULT_TREATMENT_VALUE , _conditions , TRAFFIC_TYPE_VALUE , CHANGE_NUMBER , 60 , 18 , 2 , _configurations , new HashSet <>(), true , new PrerequisitesMatcher (prerequisites ));
218213 Mockito .when (_splitCacheConsumer .get (SPLIT_NAME )).thenReturn (split );
@@ -233,64 +228,14 @@ public void evaluateFallbackTreatmentWorks() {
233228 assertEquals ("on" , result .treatment );
234229 assertEquals ("fallback - definition not found" , result .label );
235230
236- ParsedSplit split = new ParsedSplit (SPLIT_NAME , 0 , false , DEFAULT_TREATMENT_VALUE , _conditions , null , CHANGE_NUMBER , 60 , 18 , 2 , _configurations , new HashSet <>(), false , null );
237- Mockito .when (_splitCacheConsumer .get (SPLIT_NAME )).thenReturn (split );
238- result = _evaluator .evaluateFeature (MATCHING_KEY , BUCKETING_KEY , SPLIT_NAME , null );
239- assertEquals ("on" , result .treatment );
240- assertEquals ("fallback - exception" , result .label );
241-
242- // using byflag only
231+ // using by-flag fallback
243232 Mockito .when (_splitCacheConsumer .get (SPLIT_NAME )).thenReturn (null );
244- Mockito .when (_splitCacheConsumer .get ("another_name" )).thenReturn (null );
245233 fallbackTreatmentsConfiguration = new FallbackTreatmentsConfiguration (new HashMap <String , FallbackTreatment >() {{ put (SPLIT_NAME , new FallbackTreatment ("off" )); }} );
246234 fallbackTreatmentCalculator = new FallbackTreatmentCalculatorImp (fallbackTreatmentsConfiguration );
247235 _evaluator = new EvaluatorImp (_splitCacheConsumer , _segmentCacheConsumer , _ruleBasedSegmentCacheConsumer , fallbackTreatmentCalculator );
248236
249237 result = _evaluator .evaluateFeature (MATCHING_KEY , BUCKETING_KEY , SPLIT_NAME , null );
250238 assertEquals ("off" , result .treatment );
251239 assertEquals ("fallback - definition not found" , result .label );
252-
253- result = _evaluator .evaluateFeature (MATCHING_KEY , BUCKETING_KEY , "another_name" , null );
254- assertEquals ("control" , result .treatment );
255- assertEquals ("definition not found" , result .label );
256-
257- split = new ParsedSplit (SPLIT_NAME , 0 , false , DEFAULT_TREATMENT_VALUE , _conditions , null , CHANGE_NUMBER , 60 , 18 , 2 , _configurations , new HashSet <>(), false , null );
258- Mockito .when (_splitCacheConsumer .get (SPLIT_NAME )).thenReturn (split );
259- result = _evaluator .evaluateFeature (MATCHING_KEY , BUCKETING_KEY , SPLIT_NAME , null );
260- assertEquals ("off" , result .treatment );
261- assertEquals ("fallback - exception" , result .label );
262-
263- split = new ParsedSplit ("another_name" , 0 , false , DEFAULT_TREATMENT_VALUE , _conditions , null , CHANGE_NUMBER , 60 , 18 , 2 , _configurations , new HashSet <>(), false , null );
264- Mockito .when (_splitCacheConsumer .get ("another_name" )).thenReturn (split );
265- result = _evaluator .evaluateFeature (MATCHING_KEY , BUCKETING_KEY , "another_name" , null );
266- assertEquals ("control" , result .treatment );
267- assertEquals ("exception" , result .label );
268-
269- // with byflag
270- Mockito .when (_splitCacheConsumer .get (SPLIT_NAME )).thenReturn (null );
271- Mockito .when (_splitCacheConsumer .get ("another_name" )).thenReturn (null );
272- fallbackTreatmentsConfiguration = new FallbackTreatmentsConfiguration (new FallbackTreatment ("on" ), new HashMap <String , FallbackTreatment >() {{ put (SPLIT_NAME , new FallbackTreatment ("off" )); }} );
273- fallbackTreatmentCalculator = new FallbackTreatmentCalculatorImp (fallbackTreatmentsConfiguration );
274- _evaluator = new EvaluatorImp (_splitCacheConsumer , _segmentCacheConsumer , _ruleBasedSegmentCacheConsumer , fallbackTreatmentCalculator );
275-
276- result = _evaluator .evaluateFeature (MATCHING_KEY , BUCKETING_KEY , SPLIT_NAME , null );
277- assertEquals ("off" , result .treatment );
278- assertEquals ("fallback - definition not found" , result .label );
279-
280- result = _evaluator .evaluateFeature (MATCHING_KEY , BUCKETING_KEY , "another_name" , null );
281- assertEquals ("on" , result .treatment );
282- assertEquals ("fallback - definition not found" , result .label );
283-
284- split = new ParsedSplit (SPLIT_NAME , 0 , false , DEFAULT_TREATMENT_VALUE , _conditions , null , CHANGE_NUMBER , 60 , 18 , 2 , _configurations , new HashSet <>(), false , null );
285- Mockito .when (_splitCacheConsumer .get (SPLIT_NAME )).thenReturn (split );
286- result = _evaluator .evaluateFeature (MATCHING_KEY , BUCKETING_KEY , SPLIT_NAME , null );
287- assertEquals ("off" , result .treatment );
288- assertEquals ("fallback - exception" , result .label );
289-
290- split = new ParsedSplit ("another_name" , 0 , false , DEFAULT_TREATMENT_VALUE , _conditions , null , CHANGE_NUMBER , 60 , 18 , 2 , _configurations , new HashSet <>(), false , null );
291- Mockito .when (_splitCacheConsumer .get ("another_name" )).thenReturn (split );
292- result = _evaluator .evaluateFeature (MATCHING_KEY , BUCKETING_KEY , "another_name" , null );
293- assertEquals ("on" , result .treatment );
294- assertEquals ("fallback - exception" , result .label );
295240 }
296241}
0 commit comments