From aab0d8e66ccfebdb929d79229b2ab9d4c2766d5d Mon Sep 17 00:00:00 2001 From: kkolinko Date: Thu, 4 Mar 2010 08:49:38 +0000 Subject: [PATCH] svn:eol-style, no functional change (followup to r918682) git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@918895 13f79535-47bb-0310-9956-ffa450edef68 --- .../jasper/compiler/TestJspDocumentParser.java | 138 ++++++++++----------- test/webapp/bug47977.jspx | 50 ++++---- test/webapp/bug48827.jspx | 58 ++++----- 3 files changed, 123 insertions(+), 123 deletions(-) diff --git a/test/org/apache/jasper/compiler/TestJspDocumentParser.java b/test/org/apache/jasper/compiler/TestJspDocumentParser.java index af8fccd20..a0e87b6aa 100644 --- a/test/org/apache/jasper/compiler/TestJspDocumentParser.java +++ b/test/org/apache/jasper/compiler/TestJspDocumentParser.java @@ -1,69 +1,69 @@ -/* - * 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.jasper.compiler; - -import java.io.File; -import java.io.IOException; - -import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTest; - -public class TestJspDocumentParser extends TomcatBaseTest { - - public void testBug47977() throws Exception { - Tomcat tomcat = getTomcatInstance(); - - File appDir = - new File("test/webapp"); - // app dir is relative to server home - tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); - - tomcat.start(); - - Exception e = null; - try { - getUrl("http://localhost:" + getPort() + "/test/bug47977.jspx"); - } catch (IOException ioe) { - e = ioe; - } - - // Failure is expected - assertNotNull(e); - } - - public void testBug48827() throws Exception { - Tomcat tomcat = getTomcatInstance(); - - File appDir = - new File("test/webapp"); - // app dir is relative to server home - tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); - - tomcat.start(); - - Exception e = null; - try { - getUrl("http://localhost:" + getPort() + "/test/bug48827.jspx"); - } catch (IOException ioe) { - e = ioe; - } - - // Should not fail - assertNull(e); - } -} +/* + * 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.jasper.compiler; + +import java.io.File; +import java.io.IOException; + +import org.apache.catalina.startup.Tomcat; +import org.apache.catalina.startup.TomcatBaseTest; + +public class TestJspDocumentParser extends TomcatBaseTest { + + public void testBug47977() throws Exception { + Tomcat tomcat = getTomcatInstance(); + + File appDir = + new File("test/webapp"); + // app dir is relative to server home + tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); + + tomcat.start(); + + Exception e = null; + try { + getUrl("http://localhost:" + getPort() + "/test/bug47977.jspx"); + } catch (IOException ioe) { + e = ioe; + } + + // Failure is expected + assertNotNull(e); + } + + public void testBug48827() throws Exception { + Tomcat tomcat = getTomcatInstance(); + + File appDir = + new File("test/webapp"); + // app dir is relative to server home + tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); + + tomcat.start(); + + Exception e = null; + try { + getUrl("http://localhost:" + getPort() + "/test/bug48827.jspx"); + } catch (IOException ioe) { + e = ioe; + } + + // Should not fail + assertNull(e); + } +} diff --git a/test/webapp/bug47977.jspx b/test/webapp/bug47977.jspx index a04162a94..082e8f166 100644 --- a/test/webapp/bug47977.jspx +++ b/test/webapp/bug47977.jspx @@ -1,26 +1,26 @@ - - - - - - xxx - - + + + + + + xxx + + \ No newline at end of file diff --git a/test/webapp/bug48827.jspx b/test/webapp/bug48827.jspx index 1060d9a06..a6c760ea0 100644 --- a/test/webapp/bug48827.jspx +++ b/test/webapp/bug48827.jspx @@ -1,30 +1,30 @@ - - - - - - - 00-Hello World - - - - - + + + + + + + 00-Hello World + + + + + \ No newline at end of file -- 2.11.0