Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Minor fixes for the RasmolColors class.
* Added missing @Testclass and @Testmethod annotation
* Used <a href/> for URL in JavaDoc
* Moved Javadoc in between imports and 'public class'
* Added new unit test class to test suite
  • Loading branch information
egonw committed Dec 22, 2009
1 parent 66ca51f commit d9b1312
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 9 deletions.
20 changes: 12 additions & 8 deletions src/main/org/openscience/cdk/renderer/color/RasmolColors.java
Expand Up @@ -20,20 +20,23 @@
*/
package org.openscience.cdk.renderer.color;

/**
* Atom coloring following RasMol/Chime Color scheme
* http://www.umass.edu/microbio/rasmol/rascolor.htm
*
* @cdk.module render
* @cdk.githash
*
*/
import java.awt.Color;
import java.util.HashMap;
import java.util.Map;

import org.openscience.cdk.annotations.TestClass;
import org.openscience.cdk.annotations.TestMethod;
import org.openscience.cdk.interfaces.IAtom;

/**
* Atom coloring following RasMol/Chime Color scheme
* <a href="http://www.umass.edu/microbio/rasmol/rascolor.htm"
* >http://www.umass.edu/microbio/rasmol/rascolor.htm</a>.
*
* @cdk.module render
* @cdk.githash
*/
@TestClass("org.openscience.cdk.renderer.color.RasmolColorsTest")
public class RasmolColors implements IAtomColorer, java.io.Serializable {

private static final long serialVersionUID = 2588969984094169759L;
Expand Down Expand Up @@ -96,6 +99,7 @@ public Color getAtomColor(IAtom a) {
* @param defaultColor Color returned if this scheme does not define
* a color for the passed IAtom
*/
@TestMethod("testGetAtomColor")
public Color getAtomColor(IAtom atom, Color defaultColor) {
Color color = defaultColor;
String symbol = atom.getSymbol();
Expand Down
4 changes: 3 additions & 1 deletion src/test/org/openscience/cdk/modulesuites/MrenderTests.java
Expand Up @@ -26,6 +26,7 @@
import org.openscience.cdk.coverage.RenderCoverageTest;
import org.openscience.cdk.renderer.color.CDKAtomColorsTest;
import org.openscience.cdk.renderer.color.CPKAtomColorsTest;
import org.openscience.cdk.renderer.color.RasmolColorsTest;

/**
* TestSuite that runs all the tests for the CDK <code>render</code> module.
Expand All @@ -38,6 +39,7 @@
@SuiteClasses(value={
RenderCoverageTest.class,
CPKAtomColorsTest.class,
CDKAtomColorsTest.class
CDKAtomColorsTest.class,
RasmolColorsTest.class
})
public class MrenderTests {}

0 comments on commit d9b1312

Please sign in to comment.