/*
 *  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.tomcat.util.buf;

import static org.junit.Assert.assertTrue;

import java.io.IOException;

import org.junit.Test;

/**
 * Test cases for {@link UEncoder}.
 */
public class TestUEncoder {

    @Test
    public void testEncodeURL() throws IOException {
        UEncoder urlEncoder = new UEncoder();

        String s = "a/b/c/d+e.class";
        assertTrue(urlEncoder.encodeURL(s, 0, s.length()).equals(
                "a%2fb%2fc%2fd%2be.class"));
        assertTrue(urlEncoder.encodeURL(s, 2, s.length() - 2).equals(
                "b%2fc%2fd%2be.cla"));

        urlEncoder.addSafeCharacter('+');
        assertTrue(urlEncoder.encodeURL(s, 0, s.length()).equals(
                "a%2fb%2fc%2fd+e.class"));

        s = new String(new char[] { 0xD801, 0xDC01 });
        assertTrue(urlEncoder.encodeURL(s, 0, s.length())
                .equals("%f0%90%90%81"));
    }
}

@@ -845,16 +845,45 @@
 l.buf;%0A%0A
+import java.io.IOException;%0A%0A
 import s
@@ -921,38 +921,8 @@
 ue;%0A
-%0Aimport java.io.IOException;%0A%0A
 impo

Fix import order (checkstyle)