Fixes from comments

Author: vkalapov

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/util/DependentModuleStopResolver.java

@@ -42,15 +42,16 @@ public List<Module> resolveDependentModulesToStop(ProcessContext context, Module
 
         List<Module> result = new ArrayList<>();
         Set<String> visited = new HashSet<>();
+        visited.add(root.getName());
 
         collectModulesDependentOnPostOrder(root.getName(), modulesDependentOn, visited, result);
-
-        result.remove(root);
+        
         return result;
     }
 
     private boolean isDependencyAwareStopOrderEnabled(ProcessContext context, DeploymentDescriptor descriptor) {
-        boolean isExplicitlySetFromContext = VariableHandling.get(context.getExecution(), Variables.STOP_ORDER_IS_DEPENDENCY_AWARE);
+        boolean isExplicitlySetFromContext = Boolean.TRUE.equals(
+            VariableHandling.get(context.getExecution(), Variables.STOP_ORDER_IS_DEPENDENCY_AWARE));
         if (isExplicitlySetFromContext) {
             return true;
         }

multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/BuildApplicationDeployModelStepTest.java

@@ -40,7 +40,7 @@ void testModuleResolutionAsyncServiceBindings() {
     }
 
     @Test
-    void testModuleResolutionAsyncServiceBindings1() {
+    void testModuleResolutionAsyncServiceBindingsAfterResume() {
         Module module = Module.createV3()
                               .setName("test-module");
         setUpMocks(module);

multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/PrepareToStopDependentModuleStepTest.java

@@ -7,13 +7,9 @@
 import org.cloudfoundry.multiapps.controller.client.facade.domain.ImmutableStaging;
 import org.cloudfoundry.multiapps.controller.client.facade.domain.Staging;
 import org.cloudfoundry.multiapps.controller.client.lib.domain.ImmutableCloudApplicationExtended;
-import org.cloudfoundry.multiapps.controller.core.cf.util.ModulesCloudModelBuilderContentCalculator;
 import org.cloudfoundry.multiapps.controller.core.cf.v2.ApplicationCloudModelBuilder;
-import org.cloudfoundry.multiapps.controller.core.cf.v2.ServiceKeysCloudModelBuilder;
 import org.cloudfoundry.multiapps.controller.core.helpers.ModuleToDeployHelper;
 import org.cloudfoundry.multiapps.controller.process.util.ApplicationEnvironmentCalculator;
-import org.cloudfoundry.multiapps.controller.process.util.DeprecatedBuildpackChecker;
-import org.cloudfoundry.multiapps.controller.process.util.ProcessTypeParser;
 import org.cloudfoundry.multiapps.controller.process.variables.Variables;
 import org.cloudfoundry.multiapps.mta.model.DeploymentDescriptor;
 import org.cloudfoundry.multiapps.mta.model.Module;
@@ -30,17 +26,7 @@ class PrepareToStopDependentModuleStepTest extends SyncFlowableStepTest<PrepareT
     private ModuleToDeployHelper moduleToDeployHelper;
 
     @Mock
-    protected ApplicationCloudModelBuilder applicationCloudModelBuilder;
-    @Mock
-    protected ModulesCloudModelBuilderContentCalculator modulesCloudModelBuilderContentCalculator;
-    @Mock
-    protected ServiceKeysCloudModelBuilder serviceKeysCloudModelBuilder;
-
-    @Mock
-    private ProcessTypeParser processTypeParser;
-
-    @Mock
-    private DeprecatedBuildpackChecker deprecatedBuildpackChecker;
+    private ApplicationCloudModelBuilder applicationCloudModelBuilder;
 
     @Mock
     private ApplicationEnvironmentCalculator applicationEnvironmentCalculator;
@@ -73,7 +59,7 @@ void testPrepareToStopDependentModuleStepIdleURIs() {
                             .getName(), module.getName());
         assertStepFinishedSuccessfully();
     }
-    
+
     private void setUpMocks(Module module) {
         DeploymentDescriptor completeDeploymentDescriptor = DeploymentDescriptor.createV3();
         completeDeploymentDescriptor.setModules(List.of(module));

multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/PrepareToStopDependentModulesStepTest.java

@@ -3,8 +3,10 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.cloudfoundry.multiapps.controller.core.model.SubprocessPhase;
 import org.cloudfoundry.multiapps.controller.process.variables.Variables;
 import org.cloudfoundry.multiapps.mta.model.Module;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 class PrepareToStopDependentModulesStepTest extends SyncFlowableStepTest<PrepareToStopDependentModulesStep> {
@@ -13,17 +15,23 @@ class PrepareToStopDependentModulesStepTest extends SyncFlowableStepTest<Prepare
     void testPrepareToStopDependentModulesStepEmpty() {
         context.setVariable(Variables.DEPENDENT_MODULES_TO_STOP, Collections.emptyList());
         step.execute(execution);
-        context.setVariable(Variables.APPS_TO_STOP_COUNT, 0);
         assertStepFinishedSuccessfully();
+        Assertions.assertEquals(context.getVariable(Variables.APPS_TO_STOP_INDEX), 0);
+        Assertions.assertEquals(context.getVariable(Variables.SUBPROCESS_PHASE), SubprocessPhase.BEFORE_APPLICATION_STOP);
+        Assertions.assertEquals(context.getVariable(Variables.APPS_TO_STOP_COUNT), 0);
+        Assertions.assertEquals(context.getVariable(Variables.INDEX_VARIABLE_NAME), Variables.APPS_TO_STOP_INDEX.getName());
     }
 
     @Test
     void testPrepareToStopDependentModulesStepTest() {
         context.setVariable(Variables.DEPENDENT_MODULES_TO_STOP, List.of(Module.createV3()
                                                                                .setName("module")));
         step.execute(execution);
-        context.setVariable(Variables.APPS_TO_STOP_COUNT, 1);
         assertStepFinishedSuccessfully();
+        Assertions.assertEquals(context.getVariable(Variables.APPS_TO_STOP_INDEX), 0);
+        Assertions.assertEquals(context.getVariable(Variables.SUBPROCESS_PHASE), SubprocessPhase.BEFORE_APPLICATION_STOP);
+        Assertions.assertEquals(context.getVariable(Variables.APPS_TO_STOP_COUNT), 1);
+        Assertions.assertEquals(context.getVariable(Variables.INDEX_VARIABLE_NAME), Variables.APPS_TO_STOP_INDEX.getName());
     }
 
     @Override