/**
 *  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.geronimo.testsuite.appname;

import java.net.URL;

import org.apache.geronimo.testsupport.HttpUtils;
import org.apache.geronimo.testsupport.TestSupport;
import org.testng.annotations.Test;

public class ServletTest extends TestSupport {
        
    private String baseURL = "http://localhost:8080/";

    @Test
    public void testDataSource() throws Exception {
        checkReply("/AppNameServlet");
    }

    private void checkReply(String address) throws Exception {
        String warName = System.getProperty("webAppName");
        assertNotNull(warName);
        URL url = new URL(baseURL + warName + address);
        String reply = HttpUtils.doGET(url);
        assertTrue("AppName", reply.contains("AppName: " + System.getProperty("appName")));
        assertTrue("ModuleName", reply.contains("ModuleName: web"));
    }

}


@@ -1172,18 +1172,24 @@
 test
-DataSource
+AppNameInjection
 () t

change test name to prevent confusion with others