Author: lfryc(a)redhat.com
Date: 2010-07-23 10:16:17 -0400 (Fri, 23 Jul 2010)
New Revision: 18216
Modified:
root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
Log:
allow parametrization to create test cases from non-parametric constructors
Modified:
root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
===================================================================
---
root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2010-07-23
14:15:35 UTC (rev 18215)
+++
root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2010-07-23
14:16:17 UTC (rev 18216)
@@ -218,6 +218,14 @@
}
}
+ if (constructor == null) {
+ try {
+ return new Object[] { this.getClass().newInstance() };
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
Map<NamedType, List<? extends Object>> parameters = new
LinkedHashMap<NamedType, List<? extends Object>>();
// fill all parameters with null values to sorted map
@@ -265,12 +273,12 @@
Object[][] combinations = generateCombinations(parameterArray);
Object[] result = new Object[combinations.length];
- for (int i = 0; i < combinations.length; i++) {
- try {
+ try {
+ for (int i = 0; i < combinations.length; i++) {
result[i] = constructor.newInstance(combinations[i]);
- } catch (Exception e) {
- throw new RuntimeException(e);
}
+ } catch (Exception e) {
+ throw new RuntimeException(e);
}
return result;