commit 0d0f527455a7f37d5cf5a9e2ee701a5c08a2f5b2
Author: Mauro Talevi <[email protected]>
AuthorDate: Thu May 10 09:40:21 2012 +0200
Commit: Mauro Talevi <[email protected]>
CommitDate: Thu May 10 09:43:11 2012 +0200
JBEHAVE-779: Readded backward compatible constructors removed by
JBEHAVE-718.
diff --git
a/jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTable.java
b/jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTable.java
index 3a19abc..dcc7f3c 100755
--- a/jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTable.java
+++ b/jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTable.java
@@ -160,8 +160,12 @@ public class ExamplesTable {
}
public ExamplesTable(String tableAsString, String headerSeparator, String
valueSeparator) {
- this(tableAsString, headerSeparator, valueSeparator,
IGNORABLE_SEPARATOR, new ParameterConverters(),
- new TableTransformers());
+ this(tableAsString, headerSeparator, valueSeparator,
IGNORABLE_SEPARATOR, new ParameterConverters());
+ }
+
+ public ExamplesTable(String tableAsString, String headerSeparator, String
valueSeparator,
+ String ignorableSeparator, ParameterConverters
parameterConverters) {
+ this(tableAsString, headerSeparator, valueSeparator,
ignorableSeparator, parameterConverters, new TableTransformers());
}
public ExamplesTable(String tableAsString, String headerSeparator, String
valueSeparator,
diff --git
a/jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTableFactory.java
b/jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTableFactory.java
index 13fc59e..320db73 100755
---
a/jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTableFactory.java
+++
b/jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTableFactory.java
@@ -21,10 +21,11 @@ import static org.apache.commons.lang.StringUtils.isBlank;
* Factory also supports optional specification of {@link ParameterConverters}
* to allow the ExamplesTable to convert row values.
* <p>
- * <b>NOTE</b>: Users needing parameter conversion
- * in the ExamplesTable, i.e. invoking {@link
ExamplesTable#getRowAsParameters(int)}, will need
- * to use a factory constructor providing explicitly the ParameterConverters
instance
- * configured in the {@link
Configuration#useParameterConverters(ParameterConverters)}.
+ * <b>NOTE</b>: Users needing parameter conversion in the ExamplesTable, i.e.
+ * invoking {@link ExamplesTable#getRowAsParameters(int)}, will need to use a
+ * factory constructor providing explicitly the ParameterConverters instance
+ * configured in the
+ * {@link Configuration#useParameterConverters(ParameterConverters)}.
* </p>
*/
public class ExamplesTableFactory {
@@ -55,6 +56,11 @@ public class ExamplesTableFactory {
}
public ExamplesTableFactory(Keywords keywords, ResourceLoader
resourceLoader,
+ ParameterConverters parameterConverters) {
+ this(keywords, resourceLoader, parameterConverters, new
TableTransformers());
+ }
+
+ public ExamplesTableFactory(Keywords keywords, ResourceLoader
resourceLoader,
ParameterConverters parameterConverters, TableTransformers
tableTranformers) {
this.keywords = keywords;
this.resourceLoader = resourceLoader;
@@ -70,7 +76,8 @@ public class ExamplesTableFactory {
tableAsString = resourceLoader.loadResourceAsText(input);
}
return new ExamplesTable(tableAsString,
keywords.examplesTableHeaderSeparator(),
- keywords.examplesTableValueSeparator(),
keywords.examplesTableIgnorableSeparator(), parameterConverters,
tableTransformers);
+ keywords.examplesTableValueSeparator(),
keywords.examplesTableIgnorableSeparator(),
+ parameterConverters, tableTransformers);
}
protected boolean isTable(String input) {