Skip to content

Commit

Permalink
Update tests to new API.
Browse files Browse the repository at this point in the history
Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>
  • Loading branch information
johnmay authored and egonw committed Sep 2, 2014
1 parent b034e68 commit 315e6bf
Showing 1 changed file with 6 additions and 5 deletions.
Expand Up @@ -7,6 +7,7 @@
import org.openscience.cdk.interfaces.IAtomContainer;
import org.openscience.cdk.interfaces.IBond;
import org.openscience.cdk.interfaces.IChemObject;
import org.openscience.cdk.renderer.RendererModel;
import org.openscience.cdk.renderer.SymbolVisibility;
import org.openscience.cdk.silent.Atom;

Expand All @@ -33,7 +34,7 @@ public class SelectionVisibilityTest {
methyl.addBond(0, 3, IBond.Order.SINGLE);
methyl.addBond(0, 4, IBond.Order.SINGLE);
SymbolVisibility visibility = SelectionVisibility.all(SymbolVisibility.iupacRecommendations());
assertFalse(visibility.visible(methyl.getAtom(0), methyl.getConnectedBondsList(methyl.getAtom(0))));
assertFalse(visibility.visible(methyl.getAtom(0), methyl.getConnectedBondsList(methyl.getAtom(0)), new RendererModel()));
}

@Test public void withHighlight() {
Expand All @@ -49,7 +50,7 @@ public class SelectionVisibilityTest {
methyl.addBond(0, 3, IBond.Order.SINGLE);
methyl.addBond(0, 4, IBond.Order.SINGLE);
SymbolVisibility visibility = SelectionVisibility.all(SymbolVisibility.iupacRecommendations());
assertTrue(visibility.visible(methyl.getAtom(0), methyl.getConnectedBondsList(methyl.getAtom(0))));
assertTrue(visibility.visible(methyl.getAtom(0), methyl.getConnectedBondsList(methyl.getAtom(0)), new RendererModel()));
}

@Test public void isolated() {
Expand All @@ -65,7 +66,7 @@ public class SelectionVisibilityTest {
methyl.addBond(0, 4, IBond.Order.SINGLE);
methyl.getAtom(0).setProperty(StandardGenerator.HIGHLIGHT_COLOR, Color.RED);
SymbolVisibility visibility = SelectionVisibility.disconnected(SymbolVisibility.iupacRecommendations());
assertTrue(visibility.visible(methyl.getAtom(0), methyl.getConnectedBondsList(methyl.getAtom(0))));
assertTrue(visibility.visible(methyl.getAtom(0), methyl.getConnectedBondsList(methyl.getAtom(0)), new RendererModel()));
}

@Test public void unIsolated() {
Expand All @@ -82,13 +83,13 @@ public class SelectionVisibilityTest {
methyl.getAtom(0).setProperty(StandardGenerator.HIGHLIGHT_COLOR, Color.RED);
methyl.getBond(0).setProperty(StandardGenerator.HIGHLIGHT_COLOR, Color.RED);
SymbolVisibility visibility = SelectionVisibility.disconnected(SymbolVisibility.iupacRecommendations());
assertFalse(visibility.visible(methyl.getAtom(0), methyl.getConnectedBondsList(methyl.getAtom(0))));
assertFalse(visibility.visible(methyl.getAtom(0), methyl.getConnectedBondsList(methyl.getAtom(0)), new RendererModel()));
}

@Test public void highlightIsSelected() {
IChemObject chemObject = mock(IChemObject.class);
when(chemObject.getProperty(StandardGenerator.HIGHLIGHT_COLOR)).thenReturn(Color.RED);
assertTrue(SelectionVisibility.isSelected(chemObject));
assertTrue(SelectionVisibility.isSelected(chemObject, new RendererModel()));
}

static IAtom atomAt(String symb, Point2d p) {
Expand Down

0 comments on commit 315e6bf

Please sign in to comment.