Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
An extra default rendering parameter was added. This parameter (Selec…
…tionColor) is included by default.

Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>
  • Loading branch information
johnmay authored and egonw committed Sep 8, 2014
1 parent 336fd92 commit 3545b7a
Showing 1 changed file with 12 additions and 2 deletions.
Expand Up @@ -28,6 +28,7 @@
import java.util.List;
import java.util.Map;

import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
import org.openscience.cdk.Atom;
Expand All @@ -44,6 +45,9 @@
import org.openscience.cdk.renderer.generators.IGeneratorParameter;
import org.openscience.cdk.renderer.selection.IChemObjectSelection;

import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.MatcherAssert.assertThat;

/**
* @cdk.module test-render
*/
Expand Down Expand Up @@ -202,11 +206,17 @@ public IRenderingElement generate(IChemObject object,
}
};
RendererModel model = new RendererModel();
int nDefaultParams = model.getRenderingParameters().size();
model.registerParameters(generator);
List<IGeneratorParameter<?>> params = model.getRenderingParameters();
Assert.assertNotNull(params);
Assert.assertEquals(3, params.size()); // the registered one + two defaults
Assert.assertEquals(SomeParam.class, params.get(2).getClass());
Assert.assertEquals(nDefaultParams + 1, params.size()); // the registered one + defaults

List<Class<?>> paramClasses = new ArrayList<Class<?>>();
for (IGeneratorParameter<?> param : params)
paramClasses.add(param.getClass());

assertThat(paramClasses, hasItem(SomeParam.class));
}

@Test
Expand Down

0 comments on commit 3545b7a

Please sign in to comment.