Revert fix for GRAILS-6749 - reverting test changes

Author: graemerocher

grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/webflow/engine/builder/FlowBuilderSubFlowExecutionWithInputOuputTests.groovy

@@ -8,7 +8,28 @@ import org.springframework.webflow.engine.FlowInputMappingException
 class FlowBuilderSubFlowExecutionWithInputOuputTests extends AbstractGrailsTagAwareFlowExecutionTests {
 
     def searchMoreAction = { [moreResults: ["one", "two", "three"]] }
+    def subber = {
+        input {
+            shortHand()
+            constantDefault1('constantDefault1Value')
+            constantDefault2(required: false, value: 'constantDefault2Value')
+            dynamicDefault1 {conversation.get('conversationAttribute1')}
+            dynamicDefault2(value: {conversation.get('conversationAttribute2')})
+        }
 
+        subberStart {
+            on("next").to "subberEnd"
+        }
+
+        subberEnd {
+            output {
+                constantOut1('constantOut1Value')
+                constantOut2(value: 'constantOut2Value')
+                dynamicOut1 {conversation.get('conversationAttribute1')}
+                dynamicOut2(value: {conversation.get('conversationAttribute2')})
+            }
+        }
+    }
 
     def requiredInputSubber = {
         input {
@@ -24,28 +45,6 @@ class FlowBuilderSubFlowExecutionWithInputOuputTests extends AbstractGrailsTagAw
 
 
     Closure getFlowClosure() {
-        def subber = {
-            input {
-                shortHand()
-                constantDefault1('constantDefault1Value')
-                constantDefault2(required: false, value: 'constantDefault2Value')
-                dynamicDefault1 {conversation.get('conversationAttribute1')}
-                dynamicDefault2(value: {conversation.get('conversationAttribute2')})
-            }
-
-            subberStart {
-                on("next").to "subberEnd"
-            }
-
-            subberEnd {
-                output {
-                    constantOut1('constantOut1Value')
-                    constantOut2(value: 'constantOut2Value')
-                    dynamicOut1 {conversation.get('conversationAttribute1')}
-                    dynamicOut2(value: {conversation.get('conversationAttribute2')})
-                }
-            }
-        }
         return {
             start {
                 on("next") {
@@ -56,17 +55,18 @@ class FlowBuilderSubFlowExecutionWithInputOuputTests extends AbstractGrailsTagAw
             }
 
             defaultInputs {
-                subflow(subber)
+                subflow(controller: 'subber', action: 'subber')
                 on('subberEnd').to('providedInputs')
             }
 
             providedInputs {
-                subflow(input: [
+                subflow(controller: 'subber', action: 'subber',
+                        input: [
                                 shortHand: 'shortHandInValue',
                                 constantDefault1: 'constantDefault1InValue',
                                 constantDefault2: 'constantDefault2InValue',
                                 dynamicDefault1: {flow.get('dynamicDefaultIn')},
-                        ], subber)
+                        ])
                 on('subberEnd') {
                     flow.put('constantOut1', currentEvent.attributes.constantOut1)
                     flow.put('constantOut2', currentEvent.attributes.constantOut2)
@@ -85,6 +85,7 @@ class FlowBuilderSubFlowExecutionWithInputOuputTests extends AbstractGrailsTagAw
 
 
     void testSubFlowInputOutput() {
+        registerFlow('subber/subber', subber)
         GrailsWebRequest webrequest = grails.util.GrailsWebUtil.bindMockWebRequest()
         startFlow()
 
@@ -112,4 +113,14 @@ class FlowBuilderSubFlowExecutionWithInputOuputTests extends AbstractGrailsTagAw
 
     }
 
+    void testFailOnRequiredInput() {
+        registerFlow('subber/subber', requiredInputSubber)
+        grails.util.GrailsWebUtil.bindMockWebRequest()
+        startFlow()
+        try {
+            signalEvent('next')
+            fail('expected FlowInputMappingException')
+        }
+        catch (FlowInputMappingException e) {}
+    }
 }