Merge branch 'master' into elu-strategy

[poolifier.git] / tests / pools / selection-strategies / worker-choice-strategy-context.test.js

diff --git a/tests/pools/selection-strategies/worker-choice-strategy-context.test.js b/tests/pools/selection-strategies/worker-choice-strategy-context.test.js
index 92b776f95f092387ee48851c0cbca6e51364ea6d..2c5b7abbcc78c1429e9f23d0a8a414a659232c52 100644 (file)
--- a/tests/pools/selection-strategies/worker-choice-strategy-context.test.js
+++ b/tests/pools/selection-strategies/worker-choice-strategy-context.test.js
@@ -368,108 +368,51 @@ describe('Worker choice strategy context test suite', () => {
         medRunTime: true
       }
     )
-    expect(workerChoiceStrategyContext.getRequiredStatistics().avgRunTime).toBe(
-      false
-    )
-    expect(workerChoiceStrategyContext.getRequiredStatistics().medRunTime).toBe(
-      true
-    )
-    workerChoiceStrategyContext = new WorkerChoiceStrategyContext(
-      dynamicPool,
-      wwrWorkerChoiceStrategy,
-      {
-        medRunTime: true
-      }
-    )
-    expect(workerChoiceStrategyContext.getRequiredStatistics().avgRunTime).toBe(
-      false
-    )
-    expect(workerChoiceStrategyContext.getRequiredStatistics().medRunTime).toBe(
-      true
-    )
-    const fsWorkerChoiceStrategy = WorkerChoiceStrategies.FAIR_SHARE
-    workerChoiceStrategyContext = new WorkerChoiceStrategyContext(
-      fixedPool,
-      fsWorkerChoiceStrategy,
-      {
-        medRunTime: true
-      }
-    )
-    expect(workerChoiceStrategyContext.getRequiredStatistics().avgRunTime).toBe(
-      false
-    )
-    expect(workerChoiceStrategyContext.getRequiredStatistics().medRunTime).toBe(
-      true
-    )
-    workerChoiceStrategyContext = new WorkerChoiceStrategyContext(
-      dynamicPool,
-      fsWorkerChoiceStrategy,
-      {
-        medRunTime: true
-      }
-    )
-    expect(workerChoiceStrategyContext.getRequiredStatistics().avgRunTime).toBe(
-      false
-    )
-    expect(workerChoiceStrategyContext.getRequiredStatistics().medRunTime).toBe(
-      true
-    )
-  })
-
-  it('Verify that worker choice strategy options enable median wait time pool statistics', () => {
-    const wwrWorkerChoiceStrategy = WorkerChoiceStrategies.WEIGHTED_ROUND_ROBIN
-    let workerChoiceStrategyContext = new WorkerChoiceStrategyContext(
-      fixedPool,
-      wwrWorkerChoiceStrategy,
-      {
-        medWaitTime: true
-      }
-    )
     expect(
-      workerChoiceStrategyContext.getRequiredStatistics().avgWaitTime
+      workerChoiceStrategyContext.getTaskStatisticsRequirements().avgRunTime
     ).toBe(false)
     expect(
-      workerChoiceStrategyContext.getRequiredStatistics().medWaitTime
+      workerChoiceStrategyContext.getTaskStatisticsRequirements().medRunTime
     ).toBe(true)
     workerChoiceStrategyContext = new WorkerChoiceStrategyContext(
       dynamicPool,
       wwrWorkerChoiceStrategy,
       {
-        medWaitTime: true
+        medRunTime: true
       }
     )
     expect(
-      workerChoiceStrategyContext.getRequiredStatistics().avgWaitTime
+      workerChoiceStrategyContext.getTaskStatisticsRequirements().avgRunTime
     ).toBe(false)
     expect(
-      workerChoiceStrategyContext.getRequiredStatistics().medWaitTime
+      workerChoiceStrategyContext.getTaskStatisticsRequirements().medRunTime
     ).toBe(true)
     const fsWorkerChoiceStrategy = WorkerChoiceStrategies.FAIR_SHARE
     workerChoiceStrategyContext = new WorkerChoiceStrategyContext(
       fixedPool,
       fsWorkerChoiceStrategy,
       {
-        medWaitTime: true
+        medRunTime: true
       }
     )
     expect(
-      workerChoiceStrategyContext.getRequiredStatistics().avgWaitTime
+      workerChoiceStrategyContext.getTaskStatisticsRequirements().avgRunTime
     ).toBe(false)
     expect(
-      workerChoiceStrategyContext.getRequiredStatistics().medWaitTime
+      workerChoiceStrategyContext.getTaskStatisticsRequirements().medRunTime
     ).toBe(true)
     workerChoiceStrategyContext = new WorkerChoiceStrategyContext(
       dynamicPool,
       fsWorkerChoiceStrategy,
       {
-        medWaitTime: true
+        medRunTime: true
       }
     )
     expect(
-      workerChoiceStrategyContext.getRequiredStatistics().avgWaitTime
+      workerChoiceStrategyContext.getTaskStatisticsRequirements().avgRunTime
     ).toBe(false)
     expect(
-      workerChoiceStrategyContext.getRequiredStatistics().medWaitTime
+      workerChoiceStrategyContext.getTaskStatisticsRequirements().medRunTime
     ).toBe(true)
   })
 })