[#258] Minor AvailablePortScanner internal enhancements

Groovier loop, better debug output, better test assertion.
4finance · Feb 9, 2015 · 94a66d5 · 94a66d5
1 parent f0a89f6
commit 94a66d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/stub-runner/stub-runner/src/main/groovy/com/ofg/stub/server/AvailablePortScanner.groovy b/stub-runner/stub-runner/src/main/groovy/com/ofg/stub/server/AvailablePortScanner.groovy
@@ -23,14 +23,13 @@ class AvailablePortScanner {
     }
 
     public <T> T tryToExecuteWithFreePort(Closure<T> closure) {
-        int counter = maxRetryCount
-        while (--counter > 0) {
+        for (i in (1..maxRetryCount)) {
             try {
                 int portToScan = RandomUtils.nextInt(maxPortNumber - minPortNumber) + minPortNumber
                 checkIfPortIsAvailable(portToScan)
                 return executeLogicForAvailablePort(portToScan, closure)
             } catch (Exception exception) {
-                log.debug("Failed to execute closure (counter: $counter)", exception)
+                log.debug("Failed to execute closure (try: $i/$maxRetryCount)", exception)
             }
         }
         throw new NoPortAvailableException(minPortNumber, maxPortNumber)

diff --git a/stub-runner/stub-runner/src/test/groovy/com/ofg/stub/server/AvailablePortScannerSpec.groovy b/stub-runner/stub-runner/src/test/groovy/com/ofg/stub/server/AvailablePortScannerSpec.groovy
@@ -14,9 +14,10 @@ class AvailablePortScannerSpec extends Specification {
         given:
             AvailablePortScanner portScanner = new AvailablePortScanner(MIN_PORT, MAX_PORT)
         when:
-            portScanner.tryToExecuteWithFreePort {}
+            int usedPort = portScanner.tryToExecuteWithFreePort { int port -> port }
         then:
             noExceptionThrown()
+            usedPort == MIN_PORT
     }
 
     def 'should throw exception when free port number cannot be found'() {
@@ -47,5 +48,4 @@ class AvailablePortScannerSpec extends Specification {
             MAX_PORT | MIN_PORT
             MIN_PORT | MIN_PORT
     }
-
 }