Removed mentions of @Configuration.
diff --git a/src/main/java/org/testng/annotations/IConfigurationAnnotation.java b/src/main/java/org/testng/annotations/IConfigurationAnnotation.java
index 30b37be..1d76cf2 100755
--- a/src/main/java/org/testng/annotations/IConfigurationAnnotation.java
+++ b/src/main/java/org/testng/annotations/IConfigurationAnnotation.java
@@ -75,8 +75,9 @@
/**
* Internal use only.
- * @return true if this configuration annotation is not a "true" @Configuration
- * but a @BeforeSuite or similar that is represented as a @Configuration
+ * @return true if this configuration annotation is not a "true" configuration
+ * annotation but a @BeforeSuite or similar that is represented as a configuration
+ * annotation.
*/
public boolean isFakeConfiguration();
}
diff --git a/src/main/java/org/testng/internal/Invoker.java b/src/main/java/org/testng/internal/Invoker.java
index 37e0283..5baa732 100644
--- a/src/main/java/org/testng/internal/Invoker.java
+++ b/src/main/java/org/testng/internal/Invoker.java
@@ -141,7 +141,7 @@
ITestResult testMethodResult)
{
if(null == allMethods) {
- log(5, "No @Configuration methods found");
+ log(5, "No configuration methods found");
return;
}
@@ -317,7 +317,7 @@
return;
}
}
- Utils.log("", 3, "Failed to invoke @Configuration method "
+ Utils.log("", 3, "Failed to invoke configuration method "
+ tm.getRealClass().getName() + "." + tm.getMethodName() + ":" + cause.getMessage());
handleException(cause, tm, testResult, 1);
runConfigurationListeners(testResult);
diff --git a/src/main/java/org/testng/internal/annotations/AnnotationHelper.java b/src/main/java/org/testng/internal/annotations/AnnotationHelper.java
index 7c63b09..dc8c5eb 100755
--- a/src/main/java/org/testng/internal/annotations/AnnotationHelper.java
+++ b/src/main/java/org/testng/internal/annotations/AnnotationHelper.java
@@ -227,8 +227,9 @@
if (isAnnotationPresent(annotationFinder, m, IConfigurationAnnotation.class) &&
isAnnotationPresent(annotationFinder, cls, ITestAnnotation.class))
{
- Utils.log("", 3, "Method " + m + " has a local @Configuration and a class-level @Test." +
- "This method will only be kept as a @Configuration.");
+ Utils.log("", 3, "Method " + m + " has a configuration annotation"
+ + " and a class-level @Test. This method will only be kept as a"
+ + " configuration method.");
continue;
}
