Author: lfryc(a)redhat.com Date: 2011-02-23 13:10:17 -0500 (Wed, 23 Feb 2011) New Revision: 21895 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java Log: fixed MatrixConfigurator when no injection parameters is necessary + when no configuration for method is configured Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java 2011-02-23 16:40:38 UTC (rev 21894) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java 2011-02-23 18:10:17 UTC (rev 21895) @@ -78,13 +78,18 @@ } public List<IMethodInstance> intercept(List<IMethodInstance> methodInstances, ITestContext context) { + List<IMethodInstance> result = new LinkedList<IMethodInstance>(); for (IMethodInstance methodInstance : methodInstances) { for (int i = 0; i < methodInstance.getMethod().getInvocationCount(); i++) { methods.add(methodInstance.getMethod().getMethod()); } + + if (methodInstance.getMethod().getInvocationCount() > 0) { + result.add(methodInstance); + } } - return methodInstances; + return result; } public void beforeInvocation(IInvokedMethod invokedMethod, ITestResult testResult) { @@ -229,7 +234,11 @@ getClassConfigurations(realClass).put(realMethod, configuration); - return Math.max(1, count); + if (parameters.size() == 0) { + return 1; + } + + return count; } private void fulfillParametersFromAnnotations(Class<?> testClass, Map<Field, List<? extends Object>> parameters,