Author: hlship
Date: Sat Aug 21 15:58:54 2010
New Revision: 987777
URL: http://svn.apache.org/viewvc?rev=987777&view=rev
Log:
TAP5-1228: The need to configure the tapestry.alias-mode symbol makes it
awkward to start a Registry up for unit testing purposes
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java?rev=987777&r1=987776&r2=987777&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
Sat Aug 21 15:58:54 2010
@@ -2457,6 +2457,8 @@ public final class TapestryModule
configuration.add(SymbolConstants.BLACKBIRD_ENABLED, "false");
configuration.add(InternalSymbols.PRE_SELECTED_FORM_NAMES,
"reset,submit,select,id,method,action,onsubmit");
+
+ configuration.add(InternalSymbols.ALIAS_MODE, "servlet");
}
/**
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java?rev=987777&r1=987776&r2=987777&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java
Sat Aug 21 15:58:54 2010
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation
+// Copyright 2006, 2007, 2008, 2009, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,19 +14,29 @@
package org.apache.tapestry5.internal.services;
-import javassist.*;
-import org.apache.tapestry5.internal.*;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLConnection;
+import java.util.UUID;
+
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtMethod;
+import javassist.CtNewMethod;
+import javassist.LoaderClassPath;
+import javassist.NotFoundException;
+
+import org.apache.tapestry5.internal.InternalComponentResources;
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.apache.tapestry5.internal.transform.pages.BasicComponent;
-import org.apache.tapestry5.internal.transform.pages.BasicSubComponent;
import org.apache.tapestry5.ioc.Registry;
import org.apache.tapestry5.ioc.RegistryBuilder;
-import org.apache.tapestry5.ioc.def.ContributionDef;
-import org.apache.tapestry5.ioc.def.ModuleDef;
import org.apache.tapestry5.ioc.internal.services.ClasspathURLConverterImpl;
import org.apache.tapestry5.ioc.services.ClasspathURLConverter;
import org.apache.tapestry5.ioc.services.PropertyAccess;
-import org.apache.tapestry5.ioc.services.SymbolProvider;
import org.apache.tapestry5.runtime.Component;
import org.apache.tapestry5.services.TapestryModule;
import org.apache.tapestry5.services.UpdateListenerHub;
@@ -35,13 +45,6 @@ import org.testng.annotations.AfterClass
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLConnection;
-import java.util.UUID;
-
/**
* Tests for {...@link
org.apache.tapestry5.internal.services.ComponentInstantiatorSourceImpl}.
Several of these tests are
* more of the form of integration tests that instantiate the Tapestry IoC
Registry.
@@ -222,18 +225,8 @@ public class ComponentInstantiatorSource
builder.add(TapestryModule.class);
- SymbolProvider provider = new
SingleKeySymbolProvider(InternalSymbols.ALIAS_MODE, "servlet");
- ContributionDef contribution = new
SyntheticSymbolSourceContributionDef("AliasMode", provider,
-
"before:ApplicationDefaults");
-
- ModuleDef module = new SyntheticModuleDef(contribution);
-
- builder.add(module);
-
registry = builder.build();
- // registry.getService("Alias", Alias.class).setMode("servlet");
-
source = registry.getService(ComponentInstantiatorSource.class);
access = registry.getService(PropertyAccess.class);
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java?rev=987777&r1=987776&r2=987777&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
Sat Aug 21 15:58:54 2010
@@ -31,10 +31,6 @@ import org.apache.tapestry5.ComponentRes
import org.apache.tapestry5.ContentType;
import org.apache.tapestry5.EventContext;
import org.apache.tapestry5.internal.InternalComponentResources;
-import org.apache.tapestry5.internal.InternalSymbols;
-import org.apache.tapestry5.internal.SingleKeySymbolProvider;
-import org.apache.tapestry5.internal.SyntheticModuleDef;
-import org.apache.tapestry5.internal.SyntheticSymbolSourceContributionDef;
import org.apache.tapestry5.internal.parser.ComponentTemplate;
import org.apache.tapestry5.internal.parser.TemplateToken;
import org.apache.tapestry5.internal.services.*;
@@ -46,14 +42,11 @@ import org.apache.tapestry5.ioc.Messages
import org.apache.tapestry5.ioc.Registry;
import org.apache.tapestry5.ioc.RegistryBuilder;
import org.apache.tapestry5.ioc.Resource;
-import org.apache.tapestry5.ioc.def.ContributionDef;
-import org.apache.tapestry5.ioc.def.ModuleDef;
import org.apache.tapestry5.ioc.internal.InternalRegistry;
import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
import org.apache.tapestry5.ioc.services.ClassPropertyAdapter;
import org.apache.tapestry5.ioc.services.PropertyAccess;
import org.apache.tapestry5.ioc.services.PropertyAdapter;
-import org.apache.tapestry5.ioc.services.SymbolProvider;
import org.apache.tapestry5.model.ComponentModel;
import org.apache.tapestry5.model.EmbeddedComponentModel;
import org.apache.tapestry5.model.MutableComponentModel;
@@ -91,20 +84,8 @@ public class InternalBaseTestCase extend
builder.add(TapestryModule.class);
- // A synthetic module to ensure that the tapestry.alias-mode is set
correctly.
-
- SymbolProvider provider = new
SingleKeySymbolProvider(InternalSymbols.ALIAS_MODE, "servlet");
- ContributionDef contribution = new
SyntheticSymbolSourceContributionDef("AliasMode", provider,
- "before:ApplicationDefaults");
-
- ModuleDef module = new SyntheticModuleDef(contribution);
-
- builder.add(module);
-
registry = builder.build();
- // registry.getService(Alias.class).setMode("servlet");
-
registry.performRegistryStartup();
}
