Deleting deprecated Tests Classes.

Author: ldecheverz-split

client/src/main/java/io/split/cache/SegmentCacheInMemoryImpl.java

@@ -38,12 +38,11 @@ public boolean isInSegment(String segmentName, String key) {
 
     @Override
     public void setChangeNumber(String segmentName, long changeNumber) {
-        if(_segments.get(segmentName) != null){
-            _segments.get(segmentName).setChangeNumber(changeNumber);
-        }
-        else{
+        if(_segments.get(segmentName) == null){
             _log.error("Segment " + segmentName + "Not found.");
+            return ;
         }
+        _segments.get(segmentName).setChangeNumber(changeNumber);
     }
 
     @Override

client/src/main/java/io/split/client/jmx/SplitJmxMonitor.java

@@ -43,7 +43,7 @@ public boolean forceSyncFeatures() {
     public boolean forceSyncSegment(String segmentName) {
         SegmentFetcher fetcher = _segmentSynchronizationTask.getFetcher(segmentName);
         try{
-            fetcher.forceRefresh();
+            fetcher.fetch();
         }
         //We are sure this will never happen because getFetcher firts initiate the segment. This try/catch is for safe only.
         catch (NullPointerException np){

client/src/main/java/io/split/engine/common/SynchronizerImp.java

@@ -90,7 +90,7 @@ public void refreshSegment(String segmentName, long changeNumber) {
         if (changeNumber > _segmentCache.getChangeNumber(segmentName)) {
             SegmentFetcher fetcher = _segmentSynchronizationTaskImp.getFetcher(segmentName);
             try{
-                fetcher.forceRefresh();
+                fetcher.fetch();
             }
             //We are sure this will never happen because getFetcher firts initiate the segment. This try/catch is for safe only.
             catch (NullPointerException np){

client/src/main/java/io/split/engine/matchers/UserDefinedSegmentMatcher.java

@@ -2,7 +2,6 @@
 
 import io.split.cache.SegmentCache;
 import io.split.engine.evaluator.Evaluator;
-import io.split.engine.segments.Segment;
 
 import java.util.Map;
 

client/src/main/java/io/split/engine/segments/Segment.java

@@ -8,9 +8,4 @@ public interface SegmentFetcher {
      * fetch
      */
     void fetch();
-
-    /**
-     * forceRefresh
-     */
-    void forceRefresh();
 }

client/src/main/java/io/split/engine/segments/SegmentFetcher.java

@@ -37,12 +37,13 @@ public SegmentFetcherImp(String segmentName, SegmentChangeFetcher segmentChangeF
 
     @Override
     public void run() {
-        fetch();
-    }
-
-    public void forceRefresh(){
         try {
-            callLoopRun(false);
+            // Do this again in case the previous call errored out.
+            _gates.registerSegment(_segmentName);
+            callLoopRun(true);
+
+            _gates.segmentIsReady(_segmentName);
+
         } catch (Throwable t) {
             _log.error("RefreshableSegmentFetcher failed: " + t.getMessage());
             if (_log.isDebugEnabled()) {
@@ -52,14 +53,9 @@ public void forceRefresh(){
     }
 
     @Override
-    public void fetch() {
+    public void fetch(){
         try {
-            // Do this again in case the previous call errored out.
-            _gates.registerSegment(_segmentName);
-           callLoopRun(true);
-
-            _gates.segmentIsReady(_segmentName);
-
+            callLoopRun(false);
         } catch (Throwable t) {
             _log.error("RefreshableSegmentFetcher failed: " + t.getMessage());
             if (_log.isDebugEnabled()) {

client/src/main/java/io/split/engine/segments/SegmentFetcherImp.java

@@ -5,25 +5,21 @@
 import io.split.cache.SegmentCache;
 import io.split.cache.SegmentCacheInMemoryImpl;
 import io.split.cache.SplitCache;
-import io.split.client.dtos.Matcher;
-import io.split.client.dtos.MatcherGroup;
-import io.split.client.dtos.Split;
-import io.split.client.dtos.Status;
-import io.split.client.dtos.Condition;
-import io.split.client.dtos.SplitChange;
+import io.split.client.dtos.*;
 import io.split.engine.ConditionsTestUtil;
 import io.split.engine.SDKReadinessGates;
 import io.split.engine.matchers.AllKeysMatcher;
 import io.split.engine.matchers.CombiningMatcher;
-import io.split.engine.segments.NoChangeSegmentChangeFetcher;
 import io.split.engine.segments.SegmentChangeFetcher;
 import io.split.engine.segments.SegmentSynchronizationTask;
 import io.split.engine.segments.SegmentSynchronizationTaskImp;
 import io.split.grammar.Treatments;
 import org.junit.Test;
+import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -35,6 +31,8 @@
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -58,7 +56,7 @@ private void works(long startingChangeNumber) throws InterruptedException {
         AChangePerCallSplitChangeFetcher splitChangeFetcher = new AChangePerCallSplitChangeFetcher();
         SDKReadinessGates gates = new SDKReadinessGates();
         SegmentCache segmentCache = new SegmentCacheInMemoryImpl();
-        SegmentChangeFetcher segmentChangeFetcher = new NoChangeSegmentChangeFetcher();
+        SegmentChangeFetcher segmentChangeFetcher = Mockito.mock(SegmentChangeFetcher.class);
         SegmentSynchronizationTask segmentSynchronizationTask = new SegmentSynchronizationTaskImp(segmentChangeFetcher,1,10, gates, segmentCache);
         SplitCache cache = new InMemoryCacheImp(startingChangeNumber);
         SplitFetcherImp fetcher = new SplitFetcherImp(splitChangeFetcher, new SplitParser(segmentSynchronizationTask, segmentCache), gates, cache);
@@ -131,7 +129,7 @@ public void when_parser_fails_we_remove_the_experiment() throws InterruptedExcep
 
         SegmentCache segmentCache = new SegmentCacheInMemoryImpl();
 
-        SegmentChangeFetcher segmentChangeFetcher = new NoChangeSegmentChangeFetcher();
+        SegmentChangeFetcher segmentChangeFetcher = mock(SegmentChangeFetcher.class);
         SegmentSynchronizationTask segmentSynchronizationTask = new SegmentSynchronizationTaskImp(segmentChangeFetcher, 1,10, gates, segmentCache);
         segmentSynchronizationTask.startPeriodicFetching();
         SplitCache cache = new InMemoryCacheImp(-1);
@@ -154,7 +152,7 @@ public void if_there_is_a_problem_talking_to_split_change_count_down_latch_is_no
         when(splitChangeFetcher.fetch(-1L)).thenThrow(new RuntimeException());
         SegmentCache segmentCache = new SegmentCacheInMemoryImpl();
 
-        SegmentChangeFetcher segmentChangeFetcher = new NoChangeSegmentChangeFetcher();
+        SegmentChangeFetcher segmentChangeFetcher = mock(SegmentChangeFetcher.class);
         SegmentSynchronizationTask segmentSynchronizationTask = new SegmentSynchronizationTaskImp(segmentChangeFetcher, 1,10, gates, segmentCache);
         segmentSynchronizationTask.startPeriodicFetching();
         SplitFetcherImp fetcher = new SplitFetcherImp(splitChangeFetcher, new SplitParser(segmentSynchronizationTask, segmentCache), gates, cache);
@@ -194,7 +192,9 @@ public void works_with_user_defined_segments() throws Exception {
         SplitCache cache = new InMemoryCacheImp(startingChangeNumber);
         SegmentCache segmentCache = new SegmentCacheInMemoryImpl();
 
-        SegmentChangeFetcher segmentChangeFetcher = new NoChangeSegmentChangeFetcher();
+        SegmentChangeFetcher segmentChangeFetcher = mock(SegmentChangeFetcher.class);
+        SegmentChange segmentChange = getSegmentChange(0L, 0L, segmentName);
+        when(segmentChangeFetcher.fetch(anyString(), anyLong())).thenReturn(segmentChange);
         SegmentSynchronizationTask segmentSynchronizationTask = new SegmentSynchronizationTaskImp(segmentChangeFetcher, 1,10, gates, segmentCache);
         segmentSynchronizationTask.startPeriodicFetching();
         SplitFetcherImp fetcher = new SplitFetcherImp(experimentChangeFetcher, new SplitParser(segmentSynchronizationTask, segmentCache), gates, cache);
@@ -216,4 +216,14 @@ public void works_with_user_defined_segments() throws Exception {
         assertThat(gates.areSegmentsReady(100), is(equalTo(true)));
         assertThat(gates.isSDKReady(0), is(equalTo(true)));
     }
+
+    private SegmentChange getSegmentChange(long since, long till, String segmentName){
+        SegmentChange segmentChange = new SegmentChange();
+        segmentChange.name = segmentName;
+        segmentChange.since = since;
+        segmentChange.till = till;
+        segmentChange.added = new ArrayList<>();
+        segmentChange.removed = new ArrayList<>();
+        return  segmentChange;
+    }
 }