Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@apache.org Received: (qmail 46048 invoked from network); 1 Jun 2002 02:24:47 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 1 Jun 2002 02:24:47 -0000 Received: (qmail 13855 invoked by uid 97); 1 Jun 2002 02:24:49 -0000 Delivered-To: qmlist-jakarta-archive-commons-dev@jakarta.apache.org Received: (qmail 13799 invoked by uid 97); 1 Jun 2002 02:24:48 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 13788 invoked by uid 97); 1 Jun 2002 02:24:48 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 1 Jun 2002 02:24:34 -0000 Message-ID: <20020601022434.95961.qmail@icarus.apache.org> From: jvanzyl@apache.org To: jakarta-commons-sandbox-cvs@apache.org Subject: cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/scarab GlobalIssueType.java ScarabSettings.java TestScarabSettings.java scarab-settings.xml GlobalIssue.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N jvanzyl 2002/05/31 19:24:34 Modified: betwixt/src/test/org/apache/commons/betwixt/scarab ScarabSettings.java TestScarabSettings.java scarab-settings.xml Added: betwixt/src/test/org/apache/commons/betwixt/scarab GlobalIssueType.java Removed: betwixt/src/test/org/apache/commons/betwixt/scarab GlobalIssue.java Log: Fixing some mappings and getting the tests to work again. Revision Changes Path 1.2 +23 -8 jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/scarab/ScarabSettings.java Index: ScarabSettings.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/scarab/ScarabSettings.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ScarabSettings.java 1 Jun 2002 01:40:19 -0000 1.1 +++ ScarabSettings.java 1 Jun 2002 02:24:34 -0000 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/scarab/ScarabSettings.java,v 1.1 2002/06/01 01:40:19 jvanzyl Exp $ - * $Revision: 1.1 $ - * $Date: 2002/06/01 01:40:19 $ + * $Header: /home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/scarab/ScarabSettings.java,v 1.2 2002/06/01 02:24:34 jvanzyl Exp $ + * $Revision: 1.2 $ + * $Date: 2002/06/01 02:24:34 $ * * ==================================================================== * @@ -57,7 +57,7 @@ * information on the Apache Software Foundation, please see * . * - * $Id: ScarabSettings.java,v 1.1 2002/06/01 01:40:19 jvanzyl Exp $ + * $Id: ScarabSettings.java,v 1.2 2002/06/01 02:24:34 jvanzyl Exp $ */ package org.apache.commons.betwixt.scarab; @@ -79,7 +79,7 @@ * CustomerBean is a sample bean for use by the test cases.

* * @author James Strachan - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public class ScarabSettings implements Serializable { @@ -89,15 +89,20 @@ */ private final static Log log = LogFactory.getLog(ScarabSettings.class); - private List globalAttributes = new ArrayList(); - - private List modules = new ArrayList(); + private List globalAttributes; + private List modules; + + private List globalIssueTypes; + /** * Constructor for the ScarabSettings object */ public ScarabSettings() { + globalAttributes = new ArrayList(); + modules = new ArrayList(); + globalIssueTypes = new ArrayList(); } public List getGlobalAttributes() @@ -108,6 +113,16 @@ public void addGlobalAttribute(GlobalAttribute globalAttribute) { globalAttributes.add(globalAttribute); + } + + public List getGlobalIssueTypes() + { + return globalIssueTypes; + } + + public void addGlobalIssueType(GlobalIssueType globalIssueType) + { + globalIssueTypes.add(globalIssueType); } public List getModules() 1.3 +10 -10 jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/scarab/TestScarabSettings.java Index: TestScarabSettings.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/scarab/TestScarabSettings.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TestScarabSettings.java 1 Jun 2002 02:01:35 -0000 1.2 +++ TestScarabSettings.java 1 Jun 2002 02:24:34 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/scarab/TestScarabSettings.java,v 1.2 2002/06/01 02:01:35 jvanzyl Exp $ - * $Revision: 1.2 $ - * $Date: 2002/06/01 02:01:35 $ + * $Header: /home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/scarab/TestScarabSettings.java,v 1.3 2002/06/01 02:24:34 jvanzyl Exp $ + * $Revision: 1.3 $ + * $Date: 2002/06/01 02:24:34 $ * * ==================================================================== * @@ -57,7 +57,7 @@ * information on the Apache Software Foundation, please see * . * - * $Id: TestScarabSettings.java,v 1.2 2002/06/01 02:01:35 jvanzyl Exp $ + * $Id: TestScarabSettings.java,v 1.3 2002/06/01 02:24:34 jvanzyl Exp $ */ package org.apache.commons.betwixt.scarab; @@ -81,15 +81,11 @@ import org.apache.commons.betwixt.io.BeanWriter; import org.apache.commons.betwixt.strategy.HyphenatedNameMapper; -import org.apache.maven.project.Dependency; -import org.apache.maven.project.Developer; -import org.apache.maven.project.Project; - /** * Test harness which round trips a Scarab's settings xml file * * @author Jason van Zyl - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class TestScarabSettings extends AbstractTestCase { @@ -196,7 +192,11 @@ List globalAttributes = ss.getGlobalAttributes(); GlobalAttribute ga = (GlobalAttribute) globalAttributes.get(0); assertEquals("Description", ga.getName()); - + + List globalIssueTypes = ss.getGlobalIssueTypes(); + GlobalIssueType git = (GlobalIssueType) globalIssueTypes.get(0); + assertEquals("Defect", git.getName()); + List modules = ss.getModules(); Module m = (Module) modules.get(0); assertEquals("Source", m.getName()); 1.4 +1 -1 jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/scarab/scarab-settings.xml Index: scarab-settings.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/scarab/scarab-settings.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scarab-settings.xml 1 Jun 2002 02:01:35 -0000 1.3 +++ scarab-settings.xml 1 Jun 2002 02:24:34 -0000 1.4 @@ -41,7 +41,7 @@ Improvement to an existing feature. - + 1.1 jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/scarab/GlobalIssueType.java Index: GlobalIssueType.java =================================================================== /* * $Header: /home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/scarab/GlobalIssueType.java,v 1.1 2002/06/01 02:24:34 jvanzyl Exp $ * $Revision: 1.1 $ * $Date: 2002/06/01 02:24:34 $ * * ==================================================================== * * The Apache Software License, Version 1.1 * * Copyright (c) 1999-2002 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", "Commons", 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 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 * . * * $Id: GlobalIssueType.java,v 1.1 2002/06/01 02:24:34 jvanzyl Exp $ */ package org.apache.commons.betwixt.scarab; import java.io.Serializable; import java.util.ArrayList; import java.util.Enumeration; import java.util.Iterator; import java.util.List; import java.util.Map; import org.apache.commons.collections.IteratorEnumeration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** *

* * CustomerBean is a sample bean for use by the test cases.

* * @author James Strachan * @version $Revision: 1.1 $ */ public class GlobalIssueType implements Serializable { private String name; /** * Constructor for the ScarabSettings object */ public GlobalIssueType() { } public void setName(String name) { this.name = name; } public String getName() { return name; } } -- To unsubscribe, e-mail: For additional commands, e-mail: