You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2005/06/08 00:12:00 UTC
svn commit: r189458 - in /cocoon/trunk/src/test/org/apache/cocoon: ./
components/blocks/ core/ generation/ reading/ serialization/ test/
test/components/ test/components/blocks/ test/components/blocks/test1/
test/components/blocks/test2/ test/components/blocks/test3/ test/core/
transformation/
Author: danielf
Date: Tue Jun 7 15:11:57 2005
New Revision: 189458
URL: http://svn.apache.org/viewcvs?rev=189458&view=rev
Log:
Put the test cases for blocks under o.a.c.test to get them work in my OSGi experiments. It should not affect anyone and it even make some sense as it rather are funtional tests than unit tests.
Added:
cocoon/trunk/src/test/org/apache/cocoon/test/
cocoon/trunk/src/test/org/apache/cocoon/test/SitemapTestCase.java
- copied, changed from r179968, cocoon/trunk/src/test/org/apache/cocoon/SitemapTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/test/components/
cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/
- copied from r179968, cocoon/trunk/src/test/org/apache/cocoon/components/blocks/
cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/BlockManagerTestCase.java
- copied, changed from r189457, cocoon/trunk/src/test/org/apache/cocoon/components/blocks/BlockManagerTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/BlockManagerTestCase.xconf
- copied unchanged from r189457, cocoon/trunk/src/test/org/apache/cocoon/components/blocks/BlockManagerTestCase.xconf
cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/BlocksManagerTestCase.java
- copied, changed from r189457, cocoon/trunk/src/test/org/apache/cocoon/components/blocks/BlocksManagerTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/BlocksManagerTestCase.xconf
- copied unchanged from r189457, cocoon/trunk/src/test/org/apache/cocoon/components/blocks/BlocksManagerTestCase.xconf
cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/blocks-sitemap.xmap
- copied unchanged from r189457, cocoon/trunk/src/test/org/apache/cocoon/components/blocks/blocks-sitemap.xmap
cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/test1/
- copied from r189457, cocoon/trunk/src/test/org/apache/cocoon/components/blocks/test1/
cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/test2/
- copied from r189457, cocoon/trunk/src/test/org/apache/cocoon/components/blocks/test2/
cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/test3/
- copied from r189457, cocoon/trunk/src/test/org/apache/cocoon/components/blocks/test3/
cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/wiring.xml
- copied unchanged from r189457, cocoon/trunk/src/test/org/apache/cocoon/components/blocks/wiring.xml
cocoon/trunk/src/test/org/apache/cocoon/test/core/
cocoon/trunk/src/test/org/apache/cocoon/test/core/TestBootstrapEnvironment.java
- copied, changed from r179968, cocoon/trunk/src/test/org/apache/cocoon/core/TestBootstrapEnvironment.java
cocoon/trunk/src/test/org/apache/cocoon/test/core/TestCoreUtil.java
- copied, changed from r179968, cocoon/trunk/src/test/org/apache/cocoon/core/TestCoreUtil.java
Removed:
cocoon/trunk/src/test/org/apache/cocoon/SitemapTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/components/blocks/
cocoon/trunk/src/test/org/apache/cocoon/core/TestBootstrapEnvironment.java
cocoon/trunk/src/test/org/apache/cocoon/core/TestCoreUtil.java
Modified:
cocoon/trunk/src/test/org/apache/cocoon/generation/VirtualPipelineGeneratorTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/reading/VirtualPipelineReaderTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/serialization/VirtualPipelineSerializerTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/transformation/VirtualPipelineTransformerTestCase.java
Modified: cocoon/trunk/src/test/org/apache/cocoon/generation/VirtualPipelineGeneratorTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/generation/VirtualPipelineGeneratorTestCase.java?rev=189458&r1=189457&r2=189458&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/generation/VirtualPipelineGeneratorTestCase.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/generation/VirtualPipelineGeneratorTestCase.java Tue Jun 7 15:11:57 2005
@@ -15,7 +15,7 @@
*/
package org.apache.cocoon.generation;
-import org.apache.cocoon.SitemapTestCase;
+import org.apache.cocoon.test.SitemapTestCase;
public class VirtualPipelineGeneratorTestCase extends SitemapTestCase {
public void testSimplePipe() throws Exception {
Modified: cocoon/trunk/src/test/org/apache/cocoon/reading/VirtualPipelineReaderTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/reading/VirtualPipelineReaderTestCase.java?rev=189458&r1=189457&r2=189458&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/reading/VirtualPipelineReaderTestCase.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/reading/VirtualPipelineReaderTestCase.java Tue Jun 7 15:11:57 2005
@@ -15,7 +15,7 @@
*/
package org.apache.cocoon.reading;
-import org.apache.cocoon.SitemapTestCase;
+import org.apache.cocoon.test.SitemapTestCase;
public class VirtualPipelineReaderTestCase extends SitemapTestCase {
public void testVirtualPipe() throws Exception {
Modified: cocoon/trunk/src/test/org/apache/cocoon/serialization/VirtualPipelineSerializerTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/serialization/VirtualPipelineSerializerTestCase.java?rev=189458&r1=189457&r2=189458&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/serialization/VirtualPipelineSerializerTestCase.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/serialization/VirtualPipelineSerializerTestCase.java Tue Jun 7 15:11:57 2005
@@ -15,7 +15,7 @@
*/
package org.apache.cocoon.serialization;
-import org.apache.cocoon.SitemapTestCase;
+import org.apache.cocoon.test.SitemapTestCase;
public class VirtualPipelineSerializerTestCase extends SitemapTestCase {
public void testSerializer() throws Exception {
Copied: cocoon/trunk/src/test/org/apache/cocoon/test/SitemapTestCase.java (from r179968, cocoon/trunk/src/test/org/apache/cocoon/SitemapTestCase.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/test/SitemapTestCase.java?p2=cocoon/trunk/src/test/org/apache/cocoon/test/SitemapTestCase.java&p1=cocoon/trunk/src/test/org/apache/cocoon/SitemapTestCase.java&r1=179968&r2=189458&rev=189458&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/SitemapTestCase.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/test/SitemapTestCase.java Tue Jun 7 15:11:57 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon;
+package org.apache.cocoon.test;
import java.io.InputStream;
import java.net.URL;
@@ -27,8 +27,8 @@
import org.apache.cocoon.Cocoon;
import org.apache.cocoon.core.BootstrapEnvironment;
import org.apache.cocoon.core.CoreUtil;
-import org.apache.cocoon.core.TestBootstrapEnvironment;
-import org.apache.cocoon.core.TestCoreUtil;
+import org.apache.cocoon.test.core.TestBootstrapEnvironment;
+import org.apache.cocoon.test.core.TestCoreUtil;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.mock.MockContext;
import org.apache.cocoon.environment.mock.MockEnvironment;
Copied: cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/BlockManagerTestCase.java (from r189457, cocoon/trunk/src/test/org/apache/cocoon/components/blocks/BlockManagerTestCase.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/BlockManagerTestCase.java?p2=cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/BlockManagerTestCase.java&p1=cocoon/trunk/src/test/org/apache/cocoon/components/blocks/BlockManagerTestCase.java&r1=189457&r2=189458&rev=189458&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/components/blocks/BlockManagerTestCase.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/BlockManagerTestCase.java Tue Jun 7 15:11:57 2005
@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.components.blocks;
+package org.apache.cocoon.test.components.blocks;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.cocoon.SitemapTestCase;
+import org.apache.cocoon.test.SitemapTestCase;
+import org.apache.cocoon.components.blocks.BlockManager;
import org.apache.cocoon.environment.mock.MockEnvironment;
public class BlockManagerTestCase extends SitemapTestCase {
Copied: cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/BlocksManagerTestCase.java (from r189457, cocoon/trunk/src/test/org/apache/cocoon/components/blocks/BlocksManagerTestCase.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/BlocksManagerTestCase.java?p2=cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/BlocksManagerTestCase.java&p1=cocoon/trunk/src/test/org/apache/cocoon/components/blocks/BlocksManagerTestCase.java&r1=189457&r2=189458&rev=189458&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/components/blocks/BlocksManagerTestCase.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/test/components/blocks/BlocksManagerTestCase.java Tue Jun 7 15:11:57 2005
@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.components.blocks;
+package org.apache.cocoon.test.components.blocks;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.cocoon.SitemapTestCase;
+import org.apache.cocoon.components.blocks.BlocksManager;
+import org.apache.cocoon.test.SitemapTestCase;
import org.apache.cocoon.environment.mock.MockEnvironment;
public class BlocksManagerTestCase extends SitemapTestCase {
Copied: cocoon/trunk/src/test/org/apache/cocoon/test/core/TestBootstrapEnvironment.java (from r179968, cocoon/trunk/src/test/org/apache/cocoon/core/TestBootstrapEnvironment.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/test/core/TestBootstrapEnvironment.java?p2=cocoon/trunk/src/test/org/apache/cocoon/test/core/TestBootstrapEnvironment.java&p1=cocoon/trunk/src/test/org/apache/cocoon/core/TestBootstrapEnvironment.java&r1=179968&r2=189458&rev=189458&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/core/TestBootstrapEnvironment.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/test/core/TestBootstrapEnvironment.java Tue Jun 7 15:11:57 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.core;
+package org.apache.cocoon.test.core;
import java.io.File;
import java.io.InputStream;
@@ -23,6 +23,7 @@
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.core.BootstrapEnvironment;
+import org.apache.cocoon.core.MutableSettings;
import org.apache.cocoon.core.Settings;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.util.log.DeprecationLogger;
Copied: cocoon/trunk/src/test/org/apache/cocoon/test/core/TestCoreUtil.java (from r179968, cocoon/trunk/src/test/org/apache/cocoon/core/TestCoreUtil.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/test/core/TestCoreUtil.java?p2=cocoon/trunk/src/test/org/apache/cocoon/test/core/TestCoreUtil.java&p1=cocoon/trunk/src/test/org/apache/cocoon/core/TestCoreUtil.java&r1=179968&r2=189458&rev=189458&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/core/TestCoreUtil.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/test/core/TestCoreUtil.java Tue Jun 7 15:11:57 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.core;
+package org.apache.cocoon.test.core;
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.logger.Logger;
Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/VirtualPipelineTransformerTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/transformation/VirtualPipelineTransformerTestCase.java?rev=189458&r1=189457&r2=189458&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/transformation/VirtualPipelineTransformerTestCase.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/transformation/VirtualPipelineTransformerTestCase.java Tue Jun 7 15:11:57 2005
@@ -15,7 +15,7 @@
*/
package org.apache.cocoon.transformation;
-import org.apache.cocoon.SitemapTestCase;
+import org.apache.cocoon.test.SitemapTestCase;
public class VirtualPipelineTransformerTestCase extends SitemapTestCase {
public void testTransformer() throws Exception {