Merge pull request #16 from innokenty/master

Pass all regions to selection strategy as well

Author: innokenty

config/src/main/java/ru/qatools/gridrouter/config/HostSelectionStrategy.java

@@ -7,7 +7,7 @@
  */
 public interface HostSelectionStrategy {
 
-    Region selectRegion(List<Region> regions);
+    Region selectRegion(List<Region> allRegions, List<Region> unvisitedRegions);
 
     Host selectHost(List<Host> hosts);
 

config/src/main/java/ru/qatools/gridrouter/config/RandomHostSelectionStrategy.java

@@ -21,8 +21,8 @@ protected <T extends WithCount> T selectRandom(List<T> elements) {
     }
 
     @Override
-    public Region selectRegion(List<Region> regions) {
-        return selectRandom(regions);
+    public Region selectRegion(List<Region> allRegions, List<Region> unvisitedRegions) {
+        return selectRandom(unvisitedRegions);
     }
 
     @Override

config/src/main/java/ru/qatools/gridrouter/config/SequentialHostSelectionStrategy.java

@@ -7,15 +7,11 @@
  */
 public class SequentialHostSelectionStrategy implements HostSelectionStrategy {
 
-    private int regionIndex;
-
     private int hostIndex;
 
     @Override
-    public Region selectRegion(List<Region> regions) {
-        Region region = regions.get(regionIndex++ % regions.size());
-        regionIndex %= regions.size();
-        return region;
+    public Region selectRegion(List<Region> allRegions, List<Region> unvisitedRegions) {
+        return unvisitedRegions.get(0);
     }
 
     @Override

proxy/src/main/java/ru/qatools/gridrouter/RouteServlet.java

@@ -98,15 +98,15 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
         capabilityProcessorFactory.getProcessor(caps).process(caps);
 
-        List<Region> actualRegions = actualVersion.getRegions()
+        List<Region> allRegions = actualVersion.getRegions()
                 .stream().map(Region::copy).collect(toList());
-        List<Region> unusedRegions = new ArrayList<>(actualRegions);
+        List<Region> unvisitedRegions = new ArrayList<>(allRegions);
 
         int attempt = 0;
-        while (!actualRegions.isEmpty()) {
+        while (!allRegions.isEmpty()) {
             attempt++;
 
-            Region currentRegion = hostSelectionStrategy.selectRegion(unusedRegions);
+            Region currentRegion = hostSelectionStrategy.selectRegion(allRegions, unvisitedRegions);
             Host host = hostSelectionStrategy.selectHost(currentRegion.getHosts());
 
             String route = host.getRoute();
@@ -138,12 +138,12 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
             currentRegion.getHosts().remove(host);
             if (currentRegion.getHosts().isEmpty()) {
-                actualRegions.remove(currentRegion);
+                allRegions.remove(currentRegion);
             }
 
-            unusedRegions.remove(currentRegion);
-            if (unusedRegions.isEmpty()) {
-                unusedRegions = new ArrayList<>(actualRegions);
+            unvisitedRegions.remove(currentRegion);
+            if (unvisitedRegions.isEmpty()) {
+                unvisitedRegions = new ArrayList<>(allRegions);
             }
         }
 

proxy/src/test/java/ru/qatools/gridrouter/QuotaReloadTest.java

@@ -41,15 +41,17 @@ public void testQuotaIsReloadedOnFileChange() throws Exception {
         replacePortInQuotaFile(USER_1, HUB_PORT_2);
         Thread.sleep(5000); // just to avoid multiple exceptions in the logs
         assertThat(USER_1, should(canObtain(firefox()))
-                .whileWaitingUntil(timeoutHasExpired().withPollingInterval(SECONDS.toMillis(3))));
+                .whileWaitingUntil(timeoutHasExpired(SECONDS.toMillis(60))
+                        .withPollingInterval(SECONDS.toMillis(3))));
     }
 
     @Test
     public void testNewQuotaFileIsLoaded() throws Exception {
         copyQuotaFile(USER_1, USER_4, HUB_PORT_2);
         Thread.sleep(5000); // just to avoid multiple exceptions in the logs
         assertThat(USER_4, should(canObtain(firefox()))
-                .whileWaitingUntil(timeoutHasExpired().withPollingInterval(SECONDS.toMillis(3))));
+                .whileWaitingUntil(timeoutHasExpired(SECONDS.toMillis(60))
+                        .withPollingInterval(SECONDS.toMillis(3))));
     }
 
     @After