Inactionware#99 Add few tests for Behavior and fix an issue which cau…

…se intercepted Action can't work
minjing · Apr 11, 2019 · cfeadeb · cfeadeb
1 parent 769273f
commit cfeadeb
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 25 deletions.
diff --git a/uapi.behavior/src/main/java/uapi/behavior/internal/InterceptedActionHolder.java b/uapi.behavior/src/main/java/uapi/behavior/internal/InterceptedActionHolder.java
@@ -52,7 +52,7 @@ public class InterceptedActionHolder extends ActionHolder {
                             .build();
                 }
                 // Check interceptor which input metas should be same as intercepted action's input meta
-                if (CollectionHelper.equals(action.inputMetas(), interceptor.inputMetas())) {
+                if (! CollectionHelper.equals(action.inputMetas(), interceptor.inputMetas())) {
                     throw BehaviorException.builder()
                             .errorCode(BehaviorErrors.INCONSISTENT_INTERCEPTOR_INPUT_METAS)
                             .variables(new BehaviorErrors.InconsistentInterceptorInputMetas()
@@ -70,7 +70,7 @@ public class InterceptedActionHolder extends ActionHolder {
                             .build();
                 }
                 return (IInterceptor) interceptor;
-            }).toArray();
+            }).toArray(new IInterceptor[0]);
         } else {
             this._interceptors = new IInterceptor[0];
         }

diff --git a/uapi.behavior/src/test/groovy/uapi/behavior/internal/BehaviorTest.groovy b/uapi.behavior/src/test/groovy/uapi/behavior/internal/BehaviorTest.groovy
@@ -156,32 +156,42 @@ class BehaviorTest extends Specification {
         behaviorName    | behaviorInput     | a1Name    | a1IType       | a1OType       | a2Name    | a2IType       | a2OType
         'bName'         | String.class      | 'a1'      | String.class  | Integer.class | 'a2'      | String.class  | String.class
     }
-///Verified here
+
     def 'Test add interceptive action'() {
         given:
         def actionId = new ActionIdentify(a1Name, ActionType.ACTION)
         def interceptorId = new ActionIdentify(depName, ActionType.ACTION)
+        def interceptors = [interceptorId] as ActionIdentify[]
+        def a1InMetas = new ActionInputMeta[1]
+        a1InMetas[0] = new ActionInputMeta(a1IType)
+        def a1OutMetas = new ActionOutputMeta[1]
+        a1OutMetas[0] = new ActionOutputMeta(a1OType)
+        def depInMetas = new ActionInputMeta[1]
+        depInMetas[0] = new ActionInputMeta(depIType)
+        def depOutMetas = new ActionOutputMeta[0]
         def repo = Mock(Repository) {
             get(actionId) >> Mock(IInterceptedAction) {
                 getId() >> actionId
-                inputType() >> a1IType
-                outputType() >> a1OType
-                by() >> interceptorId
+                inputMetas() >> a1InMetas
+                outputMetas() >> a1OutMetas
+                by() >> interceptors
             }
             get(interceptorId) >> Mock(IInterceptor) {
                 getId() >> interceptorId
-                inputType() >> depIType
-                outputType() >> depIType
+                inputMetas() >> depInMetas
+                outputMetas() >> depOutMetas
             }
         }
+        def bInMetas = new ActionInputMeta[1]
+        bInMetas[0] = new ActionInputMeta(bInput)
 
         when:
-        def behavior = new Behavior(Mock(Responsible), repo, bName, bInput)
+        def behavior = new Behavior(Mock(Responsible), repo, bName, bInMetas)
         behavior.then(actionId).build()
 
         then:
         noExceptionThrown()
-        behavior.actionSize() == 2
+        behavior.actionSize() == 1
 
         where:
         bName   | bInput        | a1Name    | a1IType       | a1OType       | depName   | depIType
@@ -192,17 +202,26 @@ class BehaviorTest extends Specification {
         given:
         def actionId = new ActionIdentify(a1Name, ActionType.ACTION)
         def interceptorId = new ActionIdentify(depName, ActionType.ACTION)
+        def interceptors = [interceptorId] as ActionIdentify[]
+        def a1InMetas = new ActionInputMeta[1]
+        a1InMetas[0] = new ActionInputMeta(a1IType)
+        def a1OutMetas = new ActionOutputMeta[1]
+        a1OutMetas[0] = new ActionOutputMeta(a1OType)
+        def depInMetas = new ActionInputMeta[1]
+        depInMetas[0] = new ActionInputMeta(depIType)
         def repo = Mock(Repository) {
             get(actionId) >> Mock(IInterceptedAction) {
                 getId() >> actionId
-                inputType() >> a1IType
-                outputType() >> a1OType
-                by() >> interceptorId
+                inputMetas() >> a1InMetas
+                outputMetas() >> a1OutMetas
+                by() >> interceptors
             }
         }
+        def bInMetas = new ActionInputMeta[1]
+        bInMetas[0] = new ActionInputMeta(bInput)
 
         when:
-        def behavior = new Behavior(Mock(Responsible), repo, bName, bInput)
+        def behavior = new Behavior(Mock(Responsible), repo, bName, bInMetas)
         behavior.then(actionId).build()
 
         then:
@@ -218,34 +237,44 @@ class BehaviorTest extends Specification {
         given:
         def actionId = new ActionIdentify(a1Name, ActionType.ACTION)
         def interceptorId = new ActionIdentify(depName, ActionType.ACTION)
+        def interceptors = [interceptorId] as ActionIdentify[]
+        def a1InMetas = new ActionInputMeta[1]
+        a1InMetas[0] = new ActionInputMeta(a1IType)
+        def a1OutMetas = new ActionOutputMeta[1]
+        a1OutMetas[0] = new ActionOutputMeta(a1OType)
+        def depInMetas = new ActionInputMeta[1]
+        depInMetas[0] = new ActionInputMeta(depIType)
+        def depOutMetas = new ActionOutputMeta[0]
         def repo = Mock(Repository) {
             get(actionId) >> Mock(IInterceptedAction) {
                 getId() >> actionId
-                inputType() >> a1IType
-                outputType() >> a1OType
-                by() >> interceptorId
+                inputMetas() >> a1InMetas
+                outputMetas() >> a1OutMetas
+                by() >> interceptors
             }
             get(interceptorId) >> Mock(IInterceptor) {
                 getId() >> interceptorId
-                inputType() >> depIType
-                outputType() >> depIType
+                inputMetas() >> depInMetas
+                outputMetas() >> depOutMetas
             }
         }
+        def bInMetas = new ActionInputMeta[1]
+        bInMetas[0] = new ActionInputMeta(bInput)
 
         when:
-        def behavior = new Behavior(Mock(Responsible), repo, bName, bInput)
+        def behavior = new Behavior(Mock(Responsible), repo, bName, bInMetas)
         behavior.then(actionId).build()
 
         then:
         def ex = thrown(BehaviorException)
-        ex.errorCode() == BehaviorErrors.INTERCEPTOR_IO_NOT_MATCH_ACTION_INPUT
+        ex.errorCode() == errCode
 
         where:
-        bName   | bInput        | a1Name    | a1IType       | a1OType       | depName   | depIType
-        'bName' | String.class  |'a1'       | String.class  | Integer.class |'dep'      | Integer.class
-        'bName' | String.class  |'a1'       | Integer.class | Integer.class |'dep'      | String.class
+        bName   | bInput        | a1Name    | a1IType       | a1OType       | depName   | depIType      | errCode
+        'bName' | String.class  |'a1'       | String.class  | Integer.class |'dep'      | Integer.class | BehaviorErrors.INCONSISTENT_INTERCEPTOR_INPUT_METAS
+        'bName' | String.class  |'a1'       | Integer.class | Integer.class |'dep'      | String.class  | BehaviorErrors.AUTO_WIRE_IO_NOT_MATCH
     }
-
+///Verified here
     def 'Test process'() {
         given:
         def aId = new ActionIdentify(aName, ActionType.ACTION)