You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by uk...@apache.org on 2014/04/03 22:56:13 UTC
git commit: TAP5-2273: Validation fix, improve documentation
Repository: tapestry-5
Updated Branches:
refs/heads/master a9d5a8e38 -> f6a21aad9
TAP5-2273: Validation fix, improve documentation
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/f6a21aad
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/f6a21aad
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/f6a21aad
Branch: refs/heads/master
Commit: f6a21aad9448063e61872b01efa2a8e8f032b4b5
Parents: a9d5a8e
Author: uklance <uk...@gmail.com>
Authored: Thu Apr 3 21:46:23 2014 +0100
Committer: uklance <uk...@gmail.com>
Committed: Thu Apr 3 21:46:23 2014 +0100
----------------------------------------------------------------------
.../tapestry5/ioc/test/TestRegistryManager.java | 15 +++++++++++++--
.../TapestryIOCJUnit4ClassRunnerModuleDefTest.java | 2 +-
2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/f6a21aad/tapestry-ioc-test/src/main/java/org/apache/tapestry5/ioc/test/TestRegistryManager.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc-test/src/main/java/org/apache/tapestry5/ioc/test/TestRegistryManager.java b/tapestry-ioc-test/src/main/java/org/apache/tapestry5/ioc/test/TestRegistryManager.java
index 41cee21..a5e0145 100644
--- a/tapestry-ioc-test/src/main/java/org/apache/tapestry5/ioc/test/TestRegistryManager.java
+++ b/tapestry-ioc-test/src/main/java/org/apache/tapestry5/ioc/test/TestRegistryManager.java
@@ -66,13 +66,18 @@ public class TestRegistryManager {
String.format("@ModuleDef method %s must be public static and accept no arguments",
method.getName()));
}
- if (method.getReturnType().isAssignableFrom(org.apache.tapestry5.ioc.def.ModuleDef.class)) {
+ if (!org.apache.tapestry5.ioc.def.ModuleDef.class.isAssignableFrom(method.getReturnType())) {
throw new InitializationError(
String.format("@ModuleDef method %s return type %s is not valid",
- method.getName(), method.getReturnType()));
+ method.getName(), method.getReturnType().getName()));
}
}
+ /**
+ * Get the existing registry or create one if required.
+ * @return The test Registry
+ * @throws Exception
+ */
public org.apache.tapestry5.ioc.Registry getOrCreateRegistry() throws Exception {
if (registry == null) {
RegistryBuilder builder = new RegistryBuilder();
@@ -98,12 +103,18 @@ public class TestRegistryManager {
return registry;
}
+ /**
+ * Notify that the current test method has completed
+ */
public void afterTestMethod() {
if (annotation.shutdown() == RegistryShutdownType.AFTER_METHOD) {
shutdownRegistry();
}
}
+ /**
+ * Notify that the current test class has completed
+ */
public void afterTestClass() {
if (annotation.shutdown() == RegistryShutdownType.AFTER_CLASS) {
shutdownRegistry();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/f6a21aad/tapestry-ioc-test/src/test/java/org/apache/tapestry5/ioc/test/TapestryIOCJUnit4ClassRunnerModuleDefTest.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc-test/src/test/java/org/apache/tapestry5/ioc/test/TapestryIOCJUnit4ClassRunnerModuleDefTest.java b/tapestry-ioc-test/src/test/java/org/apache/tapestry5/ioc/test/TapestryIOCJUnit4ClassRunnerModuleDefTest.java
index b8e5b03..6426648 100644
--- a/tapestry-ioc-test/src/test/java/org/apache/tapestry5/ioc/test/TapestryIOCJUnit4ClassRunnerModuleDefTest.java
+++ b/tapestry-ioc-test/src/test/java/org/apache/tapestry5/ioc/test/TapestryIOCJUnit4ClassRunnerModuleDefTest.java
@@ -38,7 +38,7 @@ public class TapestryIOCJUnit4ClassRunnerModuleDefTest {
}
@ModuleDef
- public static MapModuleDef createModuleDef2() {
+ public static org.apache.tapestry5.ioc.def.ModuleDef createModuleDef2() {
Map<String,Object> map = new HashMap<String, Object>();
map.put("c", 333);