Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 25027 invoked from network); 9 Sep 2006 09:16:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Sep 2006 09:16:18 -0000 Received: (qmail 48780 invoked by uid 500); 9 Sep 2006 09:16:17 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 48643 invoked by uid 500); 9 Sep 2006 09:16:17 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 48632 invoked by uid 99); 9 Sep 2006 09:16:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Sep 2006 02:16:16 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Sep 2006 02:16:16 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id ECD8C1A981A; Sat, 9 Sep 2006 02:15:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r441766 - /cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java Date: Sat, 09 Sep 2006 09:15:55 -0000 To: cvs@cocoon.apache.org From: lgawron@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060909091555.ECD8C1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: lgawron Date: Sat Sep 9 02:15:55 2006 New Revision: 441766 URL: http://svn.apache.org/viewvc?view=rev&rev=441766 Log: COCOON-1913, ContainerTestCase made abstract so eclipse does not try to run it. Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java?view=diff&rev=441766&r1=441765&r2=441766 ============================================================================== --- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java (original) +++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java Sat Sep 9 02:15:55 2006 @@ -2,7 +2,7 @@ * Copyright 2002-2004 The Apache Software Foundation * Licensed 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 + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -64,7 +64,7 @@ *

* The following test case configuration can be used as a basis for new tests. * Detailed explanations of the configuration elements can be found after - * the example. + * the example. *

*
  *   <testcase>
@@ -100,7 +100,7 @@
  * 
*
testcase
*
Defines a test case configuration. Must contain one each of the - * following elements: + * following elements: * context, roles, and components *
. * @@ -110,18 +110,18 @@ * *
roles
*
Roles configuration for the components configured in the - * components element. + * components element. *
* *
components
- *
Used to configure any Components used by the test cases. + *
Used to configure any Components used by the test cases. *
* *
* * @version $Id$ */ -public class ContainerTestCase extends TestCase { +public abstract class ContainerTestCase extends TestCase { /** The default logger */ private Logger logger; @@ -279,7 +279,7 @@ * This method may be overwritten by subclasses to add aditional * components. */ - protected void addComponents(ConfigurationInfo info) + protected void addComponents(ConfigurationInfo info) throws Exception { // subclasses can add components here } @@ -312,7 +312,7 @@ private Object getComponent(String classname, Configuration conf, - Parameters p) + Parameters p) throws Exception { final Object instance = Class.forName(classname).newInstance(); ContainerUtil.enableLogging(instance, getLogger()); @@ -330,25 +330,25 @@ if ( p == null ) { p = new Parameters(); } - ContainerUtil.parameterize(instance, p); + ContainerUtil.parameterize(instance, p); } ContainerUtil.initialize(instance); return instance; } protected Object getComponent(String classname, - Configuration conf) + Configuration conf) throws Exception { return this.getComponent(classname, conf, null); } protected Object getComponent(String classname, - Parameters p) + Parameters p) throws Exception { return this.getComponent(classname, null, p); } - protected Object getComponent(String classname) + protected Object getComponent(String classname) throws Exception { return this.getComponent(classname, null, null); }