svn commit: r611164 - /lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/cocoon/transformation/ProxyTransformerTest.java

Author: andreas
Date: Fri Jan 11 05:08:45 2008
New Revision: 611164

URL: http://svn.apache.org/viewvc?rev=611164&view=rev
Log:
Remove instantiator element from mock publication in proxy transformer test.

Modified:
    lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/cocoon/transformation/ProxyTransformerTest.java

Modified: lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/cocoon/transformation/ProxyTransformerTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/cocoon/transformation/ProxyTransformerTest.java?rev=611164&r1=611163&r2=611164&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/cocoon/transformation/ProxyTransformerTest.java (original)
+++ lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/cocoon/transformation/ProxyTransformerTest.java Fri Jan 11 05:08:45 2008
@@ -38,9 +38,6 @@
 import org.apache.excalibur.source.SourceResolver;
 import org.apache.lenya.ac.impl.AbstractAccessControlTest;
 import org.apache.lenya.cms.cocoon.source.SourceUtil;
-import org.apache.lenya.cms.linking.GlobalProxies;
-import org.apache.lenya.cms.linking.impl.GlobalProxiesImpl;
-import org.apache.lenya.cms.publication.Proxy;
 import org.apache.lenya.cms.publication.Publication;
 import org.apache.lenya.cms.publication.PublicationException;
 import org.apache.lenya.cms.publication.templating.Instantiator;
@@ -144,11 +141,17 @@
         String configUri = "context://lenya/pubs/mock/config/publication.xml";
         Document dom = SourceUtil.readDOM(configUri, getManager());
         NamespaceHelper helper = new NamespaceHelper(PUBCONF_NAMESPACE, "", dom);
+        
+        Element docElem = dom.getDocumentElement();
+        Element instantiatorElem = helper.getFirstChild(docElem, "template-instantiator");
+        if (instantiatorElem != null) {
+            docElem.removeChild(instantiatorElem);
+        }
 
-        Element proxies = helper.getFirstChild(dom.getDocumentElement(), "proxies");
+        Element proxies = helper.getFirstChild(docElem, "proxies");
         if (proxies == null) {
             proxies = helper.createElement("proxies");
-            dom.getDocumentElement().appendChild(proxies);
+            docElem.appendChild(proxies);
         }
 
         addProxyElement(helper, proxies, area, proxyUrl, false);