The extractor name should contains also the criterion, regression int…

…roduced in 712113b
gatling · Nov 15, 2013 · d3bc768 · slandelle · Nov 18, 2013 · d3bc768
1 parent a80081d
commit d3bc768
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/gatling-core/src/main/scala/io/gatling/core/check/extractor/Extractor.scala b/gatling-core/src/main/scala/io/gatling/core/check/extractor/Extractor.scala
@@ -26,6 +26,8 @@ trait Extractor[P, X] {
 abstract class CriterionExtractor[P, T, X] extends Extractor[P, X] {
 	def criterion: Expression[T]
 	def extract(prepared: P, criterion: T): Validation[Option[X]]
+	def criterionName:String
+	def name = s"$name($criterionName)"
 	def apply(session: Session, prepared: P): Validation[Option[X]] =
 		for {
 			criterion <- criterion(session).mapError(message => s"could not resolve extractor criterion: $message")

diff --git a/gatling-core/src/main/scala/io/gatling/core/check/extractor/css/JoddCssExtractor.scala b/gatling-core/src/main/scala/io/gatling/core/check/extractor/css/JoddCssExtractor.scala
@@ -49,7 +49,7 @@ object JoddCssExtractor {
 	}
 }
 
-abstract class JoddCssExtractor[X] extends CriterionExtractor[ExtendedNodeSelector, String, X] { val name = "css" }
+abstract class JoddCssExtractor[X] extends CriterionExtractor[ExtendedNodeSelector, String, X] { val criterionName = "css" }
 
 class SingleJoddCssExtractor[X](val criterion: Expression[String], nodeAttribute: Option[String], occurrence: Int) extends JoddCssExtractor[String] {
 

diff --git a/gatling-core/src/main/scala/io/gatling/core/check/extractor/jsonpath/JsonPathExtractor.scala b/gatling-core/src/main/scala/io/gatling/core/check/extractor/jsonpath/JsonPathExtractor.scala
@@ -31,7 +31,7 @@ object JsonPathExtractor {
 		cached(expression).map(_.queryJsonObject(json).collect(implicitly[JsonFilter[X]].filter))
 }
 
-abstract class JsonPathExtractor[X] extends CriterionExtractor[Any, String, X] { val name = "jsonPath" }
+abstract class JsonPathExtractor[X] extends CriterionExtractor[Any, String, X] { val criterionName = "jsonPath" }
 
 class SingleJsonPathExtractor[X: JsonFilter](val criterion: Expression[String], occurrence: Int) extends JsonPathExtractor[X] {
 

diff --git a/gatling-core/src/main/scala/io/gatling/core/check/extractor/regex/RegexExtractor.scala b/gatling-core/src/main/scala/io/gatling/core/check/extractor/regex/RegexExtractor.scala
@@ -42,7 +42,7 @@ object RegexExtractor {
 	}
 }
 
-abstract class RegexExtractor[X] extends CriterionExtractor[String, String, X] { val name = "regex" }
+abstract class RegexExtractor[X] extends CriterionExtractor[String, String, X] { val criterionName = "regex" }
 
 class SingleRegexExtractor[X: GroupExtractor](val criterion: Expression[String], occurrence: Int) extends RegexExtractor[X] {
 

diff --git a/gatling-core/src/main/scala/io/gatling/core/check/extractor/xpath/XPathExtractor.scala b/gatling-core/src/main/scala/io/gatling/core/check/extractor/xpath/XPathExtractor.scala
@@ -74,7 +74,7 @@ object XPathExtractor {
 	}
 }
 
-abstract class XPathExtractor[X] extends CriterionExtractor[Option[XdmNode], String, X] { val name = "xpath" }
+abstract class XPathExtractor[X] extends CriterionExtractor[Option[XdmNode], String, X] { val criterionName = "xpath" }
 
 class SingleXPathExtractor(val criterion: Expression[String], namespaces: List[(String, String)], occurrence: Int) extends XPathExtractor[String] {