From 7dbed14d570cfe9d47e7aa5d13e3d6ef3ce08f79 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 21 Jul 2010 20:31:30 +0000 Subject: [PATCH] Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=49600 Based on a patch by Marc Guillemot git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@966405 13f79535-47bb-0310-9956-ffa450edef68 --- .../naming/resources/TestProxyDirContext.java | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 test/org/apache/naming/resources/TestProxyDirContext.java diff --git a/test/org/apache/naming/resources/TestProxyDirContext.java b/test/org/apache/naming/resources/TestProxyDirContext.java new file mode 100644 index 000000000..a858ba8ec --- /dev/null +++ b/test/org/apache/naming/resources/TestProxyDirContext.java @@ -0,0 +1,61 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.naming.resources; + +import javax.naming.NameNotFoundException; + +import org.apache.catalina.core.StandardContext; +import org.apache.catalina.startup.Tomcat; +import org.apache.catalina.startup.TomcatBaseTest; +import org.apache.naming.resources.ProxyDirContext; + +/** + * Unit test for the {@link ProxyDirContext}. + * @author Marc Guillemot + * @version $Revision: $ + */ +public class TestProxyDirContext extends TomcatBaseTest { + + /** + * lookup doesn't always throw the same exception. + */ + public void testLookupException() throws Exception { + Tomcat tomcat = getTomcatInstance(); + + // Must have a real docBase - just use temp + StandardContext ctx = (StandardContext) + tomcat.addContext("/", System.getProperty("java.io.tmpdir")); + ctx.setCacheTTL(500); + tomcat.start(); + + try { + ctx.getResources().lookup("/WEB-INF/web.xml"); + fail(); + } + catch (final NameNotFoundException e) { + // as expected + } + Thread.sleep(600); // see ProxyDirContext.cacheTTL + try { + ctx.getResources().lookup("/WEB-INF/web.xml"); + fail(); + } + catch (final NameNotFoundException e) { + // as expected + } + } +} -- 2.11.0