You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/07/08 21:01:49 UTC
cvs commit: avalon-sandbox/merlin/meta-spi/src/test/org/apache/avalon/meta/model/test CategoryTestCase.java
bloritsch 2003/07/08 12:01:48
Modified: merlin/meta-spi/src/java/org/apache/avalon/meta/model
Category.java
Added: merlin/meta-spi/src/test/org/apache/avalon/meta/model/test
CategoryTestCase.java
Log:
Add CategoryTestCase and adjust the Category class
Revision Changes Path
1.3 +5 -5 avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Category.java
Index: Category.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Category.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Category.java 15 Jun 2003 18:29:38 -0000 1.2
+++ Category.java 8 Jul 2003 19:01:48 -0000 1.3
@@ -110,7 +110,7 @@
/**
* The logging category name.
*/
- private String m_name;
+ private final String m_name;
/**
* The default logging priority.
@@ -129,7 +129,7 @@
*/
public Category( final String name )
{
- this( name, null, null );
+ this( name, DEFAULT_LOGGING_PRIORITY, DEFAULT_LOGGING_TARGET );
}
/**
@@ -140,7 +140,7 @@
*/
public Category( final String name, String priority )
{
- this( name, priority, null );
+ this( name, priority, DEFAULT_LOGGING_TARGET );
}
/**
@@ -163,7 +163,7 @@
}
else
{
- m_priority = null;
+ m_priority = DEFAULT_LOGGING_PRIORITY;
}
}
1.1 avalon-sandbox/merlin/meta-spi/src/test/org/apache/avalon/meta/model/test/CategoryTestCase.java
Index: CategoryTestCase.java
===================================================================
/*
============================================================================
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 modifica-
tion, 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 acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Jakarta", "Avalon", "Excalibur" 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
apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
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 (INCLU-
DING, 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.avalon.meta.model.test;
import junit.framework.TestCase;
import org.apache.avalon.meta.model.Category;
/**
* CategoryTestCase does XYZ
*
* @author <a href="bloritsch.at.apache.org">Berin Loritsch</a>
* @version CVS $ Revision: 1.1 $
*/
public class CategoryTestCase extends TestCase
{
public CategoryTestCase( String name )
{
super( name );
}
public void testCategory()
{
String catName = "name";
Category cat = new Category(catName);
testCategory( cat, catName, Category.DEFAULT_LOGGING_PRIORITY, Category.DEFAULT_LOGGING_TARGET );
}
public void testLogPriority()
{
String catName = "name";
String priority = Category.DEBUG;
Category cat = new Category( catName, priority);
testCategory( cat, catName, priority, Category.DEFAULT_LOGGING_TARGET );
priority = Category.ERROR;
cat = new Category( catName, priority );
testCategory( cat, catName, priority, Category.DEFAULT_LOGGING_TARGET );
priority = Category.INFO;
cat = new Category( catName, priority );
testCategory( cat, catName, priority, Category.DEFAULT_LOGGING_TARGET );
priority = Category.WARN;
cat = new Category( catName, priority );
testCategory( cat, catName, priority, Category.DEFAULT_LOGGING_TARGET );
}
public void testLogTarget()
{
String name = "name";
String priority = Category.DEBUG;
String target = "test";
Category cat = new Category( name, priority, target);
testCategory( cat, name, priority, target );
}
private void testCategory( Category cat, String name, String priority, String target )
{
assertEquals( name, cat.getName() );
assertEquals( priority, cat.getPriority() );
assertEquals( target, cat.getTarget() );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org