[Cdk-commits] CVS: cdk/org/openscience/cdk/test CloneAtomContainerTest.java,1.1,1.2 ElementFactoryTest.java,1.1,1.2 RandomStructureGeneratorTest.java,1.6,1.7

[Christoph S. <ste...@us...>]

Update of /cvsroot/cdk/cdk/org/openscience/cdk/test
In directory usw-pr-cvs1:/tmp/cvs-serv2871/org/openscience/cdk/test

Modified Files:
	CloneAtomContainerTest.java ElementFactoryTest.java 
	RandomStructureGeneratorTest.java 
Log Message:
RandomGenerator now finally working

Index: CloneAtomContainerTest.java
===================================================================
RCS file: /cvsroot/cdk/cdk/org/openscience/cdk/test/CloneAtomContainerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CloneAtomContainerTest.java	2001/10/18 13:48:32	1.1
--- CloneAtomContainerTest.java	2001/10/19 10:32:10	1.2
***************
*** 55,65 ****
  		Molecule molecule = MoleculeFactory.makeAlphaPinene();
  		Molecule clonedMol = (Molecule)molecule.clone();
- 		System.out.println("CloneAtomContainerTest->molecule: " + molecule);
- 		System.out.println("CloneAtomContainerTest->clonedMolecule: " + clonedMol);
- 		System.out.println("CloneAtomContainerTest->molecule.getAtomAt(3): " + molecule.getAtomAt(3));
- 		System.out.println("CloneAtomContainerTest->clonedMol.getAtomAt(3): " + clonedMol.getAtomAt(3));
  		assert(molecule.getAtomCount() == clonedMol.getAtomCount());
! 		
  	}
- 
  }
--- 55,68 ----
  		Molecule molecule = MoleculeFactory.makeAlphaPinene();
  		Molecule clonedMol = (Molecule)molecule.clone();
  		assert(molecule.getAtomCount() == clonedMol.getAtomCount());
! 		for (int f = 0; f < molecule.getAtomCount(); f++)
! 		{
! 			for (int g = 0; g < clonedMol.getAtomCount(); g++)
! 			{
! 				assertNotNull(molecule.getAtomAt(f));
! 				assertNotNull(clonedMol.getAtomAt(g));
! 				assert(molecule.getAtomAt(f) != clonedMol.getAtomAt(g));
! 			}
! 		}
  	}
  }

Index: ElementFactoryTest.java
===================================================================
RCS file: /cvsroot/cdk/cdk/org/openscience/cdk/test/ElementFactoryTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ElementFactoryTest.java	2001/08/31 13:35:35	1.1
--- ElementFactoryTest.java	2001/10/19 10:32:10	1.2
***************
*** 1,25 ****
! /* 
!   * $RCSfile$    $Author$    $Date$    $Revision$
!  * 
!  * Copyright (C) 1997-2001  The Chemistry Development Kit (CDK) project
!  * 
!  * Contact: ste...@ic..., gez...@ma..., eg...@sc...
!  * 
!  * This program is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU Lesser General Public License
!  * as published by the Free Software Foundation; either version 2.1
!  * of the License, or (at your option) any later version.
!  * 
!  * This program is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  * GNU Lesser General Public License for more details.
!  * 
!  * You should have received a copy of the GNU Lesser General Public License
!  * along with this program; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. 
!  * 
   */
- 
  package org.openscience.cdk.test;
  
--- 1,24 ----
! /*
!  *  $RCSfile$    $Author$    $Date$    $Revision$
!  *
!  *  Copyright (C) 1997-2001  The Chemistry Development Kit (CDK) project
!  *
!  *  Contact: ste...@ic..., gez...@ma..., eg...@sc...
!  *
!  *  This program is free software; you can redistribute it and/or
!  *  modify it under the terms of the GNU Lesser General Public License
!  *  as published by the Free Software Foundation; either version 2.1
!  *  of the License, or (at your option) any later version.
!  *
!  *  This program is distributed in the hope that it will be useful,
!  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  *  GNU Lesser General Public License for more details.
!  *
!  *  You should have received a copy of the GNU Lesser General Public License
!  *  along with this program; if not, write to the Free Software
!  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
!  *
   */
  package org.openscience.cdk.test;
  
***************
*** 30,52 ****
  
  /**
!  * Checks the functionality of the ElementFactory
   */
!  
  public class ElementFactoryTest extends TestCase
  {
  	public ElementFactoryTest(String name)
  	{
  		super(name);
  	}
- 	
- 	public void setUp()
- 	{
  
- 	}
- 	
- 	public static Test suite() {
- 		return new TestSuite(ElementFactoryTest.class);
- 	}
  
  	public void testElementFactory()
  	{
--- 29,60 ----
  
  /**
!  *  Checks the functionality of the ElementFactory
!  *
!  * @author     steinbeck
!  * @created    October 17, 2001
   */
! 
  public class ElementFactoryTest extends TestCase
  {
+ 	/**
+ 	 *  Constructor for the ElementFactoryTest object
+ 	 *
+ 	 * @param  name  Description of Parameter
+ 	 */
  	public ElementFactoryTest(String name)
  	{
  		super(name);
  	}
  
  
+ 	/**
+ 	 *  The JUnit setup method
+ 	 */
+ 	public void setUp() { }
+ 
+ 
+ 	/**
+ 	 *  A unit test for JUnit
+ 	 */
  	public void testElementFactory()
  	{
***************
*** 58,79 ****
  			elfac = new ElementFactory();
  		}
! 		catch(Exception exc)
  		{
! 			throw new AssertionFailedError("Problem instantiating ElementFactory: " +  exc.toString());
  		}
! 		
  		assert(elfac.getSize() > 0);
! 		
  		try
  		{
  			element = elfac.getElement(findThis);
  		}
! 		catch(Exception exc)
  		{
! 			throw new AssertionFailedError("Problem getting isotope " + findThis + " from ElementFactory: "  +  exc.toString());
  		}
! 		
  		assert(element.getAtomicNumber() == 35);
  
  	}
  }
--- 66,97 ----
  			elfac = new ElementFactory();
  		}
! 		catch (Exception exc)
  		{
! 			throw new AssertionFailedError("Problem instantiating ElementFactory: " + exc.toString());
  		}
! 
  		assert(elfac.getSize() > 0);
! 
  		try
  		{
  			element = elfac.getElement(findThis);
  		}
! 		catch (Exception exc)
  		{
! 			throw new AssertionFailedError("Problem getting isotope " + findThis + " from ElementFactory: " + exc.toString());
  		}
! 
  		assert(element.getAtomicNumber() == 35);
+ 	}
  
+ 	/**
+ 	 *  A unit test suite for JUnit
+ 	 *
+ 	 * @return    The test suite
+ 	 */
+ 	public static Test suite()
+ 	{
+ 		return new TestSuite(ElementFactoryTest.class);
  	}
  }
+ 

Index: RandomStructureGeneratorTest.java
===================================================================
RCS file: /cvsroot/cdk/cdk/org/openscience/cdk/test/RandomStructureGeneratorTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** RandomStructureGeneratorTest.java	2001/10/15 16:36:58	1.6
--- RandomStructureGeneratorTest.java	2001/10/19 10:32:10	1.7
***************
*** 88,91 ****
--- 88,92 ----
  				}
  			}
+ 			rg.acceptStructure();
  		}
  		everythingOk(structures);