dgraham 2003/02/27 18:42:16
Modified: src/test/org/apache/struts/taglib/logic TestEmptyTag.java
TestIterateTag.java
src/test/org/apache/struts/upload MultipartTestSuite.java
src/test/org/apache/struts/action TestDynaActionForm.java
src/test/org/apache/struts/tiles TestTilesPlugin.java
Log:
Fixed bad imports.
Revision Changes Path
1.4 +2 -2
jakarta-struts/src/test/org/apache/struts/taglib/logic/TestEmptyTag.java
Index: TestEmptyTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/logic/TestEmptyTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestEmptyTag.java 22 Feb 2003 03:28:15 -0000 1.3
+++ TestEmptyTag.java 28 Feb 2003 02:42:11 -0000 1.4
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,8 +62,8 @@
import javax.servlet.jsp.PageContext;
import junit.framework.Test;
import junit.framework.TestSuite;
+
import org.apache.cactus.JspTestCase;
-import org.apache.cactus.WebRequest;
import org.apache.struts.taglib.SimpleBeanForTesting;
import org.apache.struts.util.LabelValueBean;
1.2 +2 -6
jakarta-struts/src/test/org/apache/struts/taglib/logic/TestIterateTag.java
Index: TestIterateTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/logic/TestIterateTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestIterateTag.java 27 Feb 2003 04:12:50 -0000 1.1
+++ TestIterateTag.java 28 Feb 2003 02:42:11 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,16 +62,12 @@
import javax.servlet.ServletException;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyContent;
-
import junit.framework.Test;
import junit.framework.TestSuite;
+
import org.apache.cactus.JspTestCase;
-import org.apache.cactus.WebRequest;
import org.apache.cactus.WebResponse;
import org.apache.struts.taglib.SimpleBeanForTesting;
-import org.apache.struts.taglib.bean.MessageTag;
-import org.apache.struts.util.LabelValueBean;
/**
1.2 +65 -11
jakarta-struts/src/test/org/apache/struts/upload/MultipartTestSuite.java
Index: MultipartTestSuite.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/upload/MultipartTestSuite.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultipartTestSuite.java 6 Mar 2002 19:44:07 -0000 1.1
+++ MultipartTestSuite.java 28 Feb 2003 02:42:11 -0000 1.2
@@ -1,27 +1,81 @@
+/*
+ * $Header$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
package org.apache.struts.upload;
-import junit.framework.TestSuite;
import junit.framework.Test;
-import junit.framework.TestCase;
+import junit.framework.TestSuite;
-public class MultipartTestSuite extends TestSuite
-{
+public class MultipartTestSuite extends TestSuite {
- public static final void main(String args[])
- {
+ public static final void main(String args[]) {
junit.textui.TestRunner.run(MultipartTestSuite.suite());
System.exit(0);
}
-
- public static Test suite()
- {
+ public static Test suite() {
TestSuite suite = new MultipartTestSuite();
suite.addTest(new TestSuite(MultipartBoundaryInputStreamTest.class));
return suite;
}
-
-
}
1.10 +1 -2
jakarta-struts/src/test/org/apache/struts/action/TestDynaActionForm.java
Index: TestDynaActionForm.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/action/TestDynaActionForm.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestDynaActionForm.java 24 Dec 2002 18:49:52 -0000 1.9
+++ TestDynaActionForm.java 28 Feb 2003 02:42:13 -0000 1.10
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,6 @@
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletRequest;
import junit.framework.Test;
import junit.framework.TestSuite;
1.2 +9 -25
jakarta-struts/src/test/org/apache/struts/tiles/TestTilesPlugin.java
Index: TestTilesPlugin.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/tiles/TestTilesPlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestTilesPlugin.java 27 Dec 2002 11:02:54 -0000 1.1
+++ TestTilesPlugin.java 28 Feb 2003 02:42:15 -0000 1.2
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -63,36 +63,20 @@
package org.apache.struts.tiles;
-import java.net.MalformedURLException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.jsp.JspException;
import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletConfig;
-
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.struts.Globals;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionServlet;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.RequestProcessor;
import org.apache.struts.action.PlugIn;
-import org.apache.struts.config.ApplicationConfig;
-import org.apache.struts.mock.TestMockBase;
-import org.apache.struts.mock.MockActionServlet;
-
-
-import org.apache.struts.config.ModuleConfigFactory;
import org.apache.struts.config.ModuleConfig;
+import org.apache.struts.config.ModuleConfigFactory;
import org.apache.struts.config.PlugInConfig;
-
+import org.apache.struts.mock.MockActionServlet;
+import org.apache.struts.mock.TestMockBase;
import org.apache.struts.util.RequestUtils;
-import org.apache.commons.beanutils.BeanUtils;
/**
* <p>Unit tests for <code>org.apache.struts.tiles.*</code>.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
