Skip to content

Commit

Permalink
Factored out a AbstractCDKObjectTest now used in AbstractAtomParity t…
Browse files Browse the repository at this point in the history
…est, to add the missing unit test

Signed-off-by: Rajarshi Guha <rajarshi.guha@gmail.com>
  • Loading branch information
egonw authored and rajarshi committed Oct 24, 2010
1 parent a609016 commit 9468d74
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 26 deletions.
Expand Up @@ -33,7 +33,7 @@
*
* @see org.openscience.cdk.AtomParity
*/
public abstract class AbstractAtomParityTest {
public abstract class AbstractAtomParityTest extends AbstractCDKObjectTest {

private static IChemObjectBuilder builder;

Expand Down
59 changes: 59 additions & 0 deletions src/test/org/openscience/cdk/interfaces/AbstractCDKObjectTest.java
@@ -0,0 +1,59 @@
/* Copyright (C) 2010 Egon Willighagen <egonw@users.sf.net>
*
* Contact: cdk-devel@lists.sourceforge.net
*
* 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.
* All we ask is that proper credit is given for our work, which includes
* - but is not limited to - adding the above copyright notice to the beginning
* of your source code files, and to any copyright notice that you may distribute
* with programs based on this work.
*
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
package org.openscience.cdk.interfaces;

import org.junit.Assert;
import org.junit.Test;
import org.openscience.cdk.CDKTestCase;

/**
* Tests the functionality of {@link ICDKObject} implementations.
*
* @cdk.module test-interfaces
* @cdk.created 2010-10-22
*/
public abstract class AbstractCDKObjectTest extends CDKTestCase {

private static ITestObjectBuilder builder;

/**
* Sets the {@link ITestObjectBuilder} that constructs new test objects with
* {@link #newChemObject()}.
*
* @param builder ITestChemObject that instantiates new test objects
*/
public static void setTestObjectBuilder(ITestObjectBuilder builder) {
AbstractCDKObjectTest.builder = builder;
}

public static IChemObject newChemObject() {
return AbstractCDKObjectTest.builder.newTestObject();
}

@Test public void testGetBuilder() {
IChemObject chemObject = newChemObject();
Object object = chemObject.getBuilder();
Assert.assertNotNull(object);
Assert.assertTrue(object instanceof IChemObjectBuilder);
}
}
Expand Up @@ -29,7 +29,6 @@

import org.junit.Assert;
import org.junit.Test;
import org.openscience.cdk.CDKTestCase;
import org.openscience.cdk.tools.diff.ChemObjectDiff;

/**
Expand All @@ -39,31 +38,8 @@
* @cdk.module test-interfaces
* @cdk.created 2001-08-09
*/
public abstract class AbstractChemObjectTest extends CDKTestCase {
public abstract class AbstractChemObjectTest extends AbstractCDKObjectTest {

private static ITestObjectBuilder builder;

/**
* Sets the {@link ITestObjectBuilder} that constructs new test objects with
* {@link #newChemObject()}.
*
* @param builder ITestChemObject that instantiates new test objects
*/
public static void setTestObjectBuilder(ITestObjectBuilder builder) {
AbstractChemObjectTest.builder = builder;
}

public static IChemObject newChemObject() {
return AbstractChemObjectTest.builder.newTestObject();
}

@Test public void testGetBuilder() {
IChemObject chemObject = newChemObject();
Object object = chemObject.getBuilder();
Assert.assertNotNull(object);
Assert.assertTrue(object instanceof IChemObjectBuilder);
}

@Test public void testSetProperty_Object_Object() {
IChemObject chemObject = newChemObject();
String cDescription = new String("description");
Expand Down

0 comments on commit 9468d74

Please sign in to comment.