Merge pull request #204 from GannettDigital/issue-203

Issue 203: Adds support for replanning with the actionTree algorithm
GannettDigital · Oct 15, 2019 · 54c44fe · 54c44fe
2 parents 396209e + d9bb40f
commit 54c44fe
Show file tree

Hide file tree

Showing 8 changed files with 678 additions and 452 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,21 +2,27 @@
 
 ## Pending Version
 
+## 0.8.5
+
+* Zach Knox
+  * Enabled replanning support for actionTree algorithm
+  * Fixed replanning algorithm to output correctly when running with actionTree algorithm
+
 ## 0.8.4
 
-   * Raghu Dantuluri
-      * Fixed generated test names to not collide, causing test overwrites
+* Raghu Dantuluri
+  * Fixed generated test names to not collide, causing test overwrites
 
 ## 0.8.3
 
 * Raghu Dantuluri
-    * Added functionality to allow user to pass sauce connect options to the embedded sauce connect tunnel;
-    * Changed the generated tests' names to be based on the test plan;
+  * Added functionality to allow user to pass sauce connect options to the embedded sauce connect tunnel;
+  * Changed the generated tests' names to be based on the test plan;
 
 ## 0.8.2
 
 * Raghu Dantuluri
-   * Exposed 'remote' from 'selenium-webdriver' for use in test execution
+  * Exposed 'remote' from 'selenium-webdriver' for use in test execution
 
 ## 0.8.1
 

diff --git a/docs/pages/home/release-notes.md b/docs/pages/home/release-notes.md
@@ -5,22 +5,28 @@ toc_label: 'Version Number'
 sidebar: about_sidebar
 ---
 
+## 0.8.5
+
+* Zach Knox
+  * Enabled replanning support for actionTree algorithm
+  * Fixed replanning algorithm to output correctly when running with actionTree algorithm
+
 ## 0.8.4
 
 * Raghu Dantuluri
-   * Fixed generated test names to not collide, causing test overwrites
+  * Fixed generated test names to not collide, causing test overwrites
 
 ## 0.8.3
 
 * Raghu Dantuluri
-   * Changed generated test names to be based off the test plan;
-   * Added functionality to allow user to pass sauce connect options to the embedded sauce connect tunnel;
+  * Changed generated test names to be based off the test plan;
+  * Added functionality to allow user to pass sauce connect options to the embedded sauce connect tunnel;
 
 
 ## 0.8.2
 
 * Raghu Dantuluri
-   * Exposed 'remote' from 'selenium-webdriver' for use in test execution
+  * Exposed 'remote' from 'selenium-webdriver' for use in test execution
 
 ## 0.8.1
 

diff --git a/lib/planner/search-algorithms/offline-replanning.js b/lib/planner/search-algorithms/offline-replanning.js
@@ -66,11 +66,25 @@ module.exports = offlineReplanning = {
       offlineReplanning._savePlan(plan);
     }
 
-    offlineReplanning.emitAsync(
-        'planner.planningFinished',
-        offlineReplanning._plans,
-        offlineReplanning._discoveredActions
-    );
+    if (offlineReplanning._algorithm.toLowerCase() === 'actiontree') {
+      let testCases = [];
+      for (let plan of offlineReplanning._plans) {
+        testCases.push(plan.testCase);
+      }
+      offlineReplanning.emitAsync(
+          'planner.planningFinished',
+          testCases,
+          offlineReplanning._discoveredActions,
+          offlineReplanning._algorithm
+      );
+    } else {
+      offlineReplanning.emitAsync(
+          'planner.planningFinished',
+          offlineReplanning._plans,
+          offlineReplanning._discoveredActions,
+          offlineReplanning._algorithm
+      );
+    }
   },
   * _checkForLoopAndBackTrack(plan, callback) {
     let next = yield;
@@ -156,7 +170,15 @@ module.exports = offlineReplanning = {
   _pruneExistingPlans() {
     let prunedPlans = [];
     for (let plan of offlineReplanning._existingPlans) {
-      let superset = setOperations.isSuperset(offlineReplanning._satisfiedActions, new Set(plan.path));
+      let superset;
+      if (offlineReplanning._algorithm.toLowerCase() === 'actiontree') {
+        // actionTree plans _are_ the path
+        superset = setOperations.isSuperset(offlineReplanning._satisfiedActions, new Set(plan));
+      } else { // forwardStateSpaceSearchHeuristic
+        // forwardStateSpaceSearchHeuristic plans contain an object with the plan path
+        superset = setOperations.isSuperset(offlineReplanning._satisfiedActions, new Set(plan.path));
+      }
+
       if (!superset) {
         prunedPlans.push(plan);
       }

diff --git a/lib/planner/test-planner.js b/lib/planner/test-planner.js
@@ -29,15 +29,20 @@ module.exports = testPlanner = {
             if (error) {
               throw error;
             }
-            // let testLength = config.get('plannerTestLength');
-            let testLength = false;
-            // TODO: Get offline replanning working with actionTree algorithm
+
+            let testLength = config.get('plannerTestLength');
             if (testLength) {
-              testPlanner.emit('offlineReplanning.replan', finalPlans,
-                  discoveredActions, testPlanner._algorithm, {testLength});
+              testPlanner.emit('offlineReplanning.replan',
+                  finalPlans,
+                  discoveredActions,
+                  testPlanner._algorithm,
+                  {
+                    testLength,
+                  }
+              );
             } else {
-              testPlanner.emit('planner.planningFinished',
-                  finalPlans, discoveredActions, testPlanner._algorithm);
+              testPlanner
+                  .emit('planner.planningFinished', finalPlans, discoveredActions, testPlanner._algorithm);
             }
           });
     });
@@ -59,6 +64,7 @@ module.exports = testPlanner = {
                   if (error) {
                     throw error;
                   }
+
                   let testLength = config.get('plannerTestLength');
                   if (testLength) {
                     testPlanner.emit('offlineReplanning.replan',