Added more tests for pe detection in sge

Refs #627

Author: sverhoeven

src/main/java/nl/esciencecenter/xenon/adaptors/schedulers/gridengine/GridEngineSetup.java

@@ -178,7 +178,9 @@ Optional<ParallelEnvironmentInfo> getSingleNodeParallelEnvironment(int coresPerN
             Set<String> pesOfQueue = new HashSet<>(Arrays.asList(queue.getParallelEnvironments()));
             stream = stream.filter(pe -> pesOfQueue.contains(pe.getName()));
         }
-        return stream.findFirst();
+        Optional<ParallelEnvironmentInfo> r = stream.findFirst();
+        LOGGER.debug("Gridengine choose to use following pe: " + r.toString());
+        return r;
     }
 
     /**

src/main/java/nl/esciencecenter/xenon/adaptors/schedulers/gridengine/ParallelEnvironmentInfo.java

@@ -124,12 +124,14 @@ public String toString() {
      * @return True if pe can
      */
     boolean canAllocateSingleNode(int coresPerNode) {
-        return (
+        boolean validAllocationRule = (
             allocationRule == AllocationRule.PE_SLOTS
             // TODO check if hosts (of queue) have that many slots
         ) || (
             allocationRule == AllocationRule.INTEGER && ppn >= coresPerNode
-        ) && coresPerNode <= slots;
+        );
+        boolean validSlots = slots >= coresPerNode;
+        return validAllocationRule && validSlots;
     }
 
     /**
@@ -140,8 +142,8 @@ boolean canAllocateSingleNode(int coresPerNode) {
      * @return True if pe can
      */
     boolean canAllocateMultiNode(int coresPerNode, int nodes) {
-        return (
-            allocationRule == AllocationRule.INTEGER && ppn == coresPerNode && coresPerNode * nodes <= slots
-        );
+        boolean validAllocationRule = allocationRule == AllocationRule.INTEGER && ppn == coresPerNode;
+        boolean validSlots = slots >= coresPerNode * nodes;
+        return validAllocationRule && validSlots;
     }
 }

src/test/java/nl/esciencecenter/xenon/adaptors/schedulers/gridengine/GridEngineSetupTest.java

@@ -16,12 +16,14 @@
 package nl.esciencecenter.xenon.adaptors.schedulers.gridengine;
 
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.junit.FixMethodOrder;
@@ -163,6 +165,31 @@ public void test_getSingleNodeParallelEnvironment_queueuabsent_peinqueues() {
         assertTrue(setup.getSingleNodeParallelEnvironment(4, null).isPresent());
     }
 
+    @Test
+    public void test_getSingleNodeParallelEnvironment_peWithTooFewSlots() {
+        GridEngineSetup setup = getGridEngineSetup(
+            new ParallelEnvironmentInfo("smp", 1, AllocationRule.PE_SLOTS, 0)
+        );
+
+        assertFalse(setup.getSingleNodeParallelEnvironment(24, null).isPresent());
+    }
+
+    @Test
+    public void test_getSingleNodeParallelEnvironment_multiplePEs() {
+        ParallelEnvironmentInfo pe = new ParallelEnvironmentInfo("some.pe", 6000, AllocationRule.PE_SLOTS, 0);
+        GridEngineSetup setup = getGridEngineSetup(
+            new ParallelEnvironmentInfo("make", 1, AllocationRule.ROUND_ROBIN, 0),
+            new ParallelEnvironmentInfo("mpi", 250, AllocationRule.ROUND_ROBIN, 0),
+            new ParallelEnvironmentInfo("smp", 1, AllocationRule.PE_SLOTS, 0),
+            pe
+        );
+
+        Optional<ParallelEnvironmentInfo> chosenPe = setup.getSingleNodeParallelEnvironment(24, null);
+
+        assertTrue(chosenPe.isPresent());
+        assertEquals(pe, chosenPe.get());
+    }
+
     @Test
     public void test03_qconfPeDetailsArguments() {
         String[] input = new String[] { "some.pe", "other.pe", "this.pe", "that.pe" };