From 4b61d1bcac0c0c23d9b741fd901f25ddae2a6f4e Mon Sep 17 00:00:00 2001 From: ebner Date: Tue, 25 Oct 2011 09:19:56 +0200 Subject: [PATCH] Removed hardcoded channel --- .../java/ch/psi/fda/core/manipulator/ManipulatorTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/core/manipulator/ManipulatorTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/core/manipulator/ManipulatorTest.java index 11e99a1..28cf243 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/core/manipulator/ManipulatorTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/core/manipulator/ManipulatorTest.java @@ -33,6 +33,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import ch.psi.fda.TestChannels; import ch.psi.fda.core.manipulator.JythonManipulation; import ch.psi.fda.core.manipulator.Manipulation; import ch.psi.fda.core.manipulator.Manipulator; @@ -402,10 +403,9 @@ public class ManipulatorTest { @Test public void testRunMultipleParameterAndChannel() throws InterruptedException, CAException { - String testChannel = "MTEST-PC-X10:AO"; Double setValue = 12.22; - ChannelBean cbean = ChannelBeanFactory.getFactory().createChannelBean(Double.class, testChannel, false); + ChannelBean cbean = ChannelBeanFactory.getFactory().createChannelBean(Double.class, TestChannels.ANALOG_OUT, false); DataMessageMetadata dmm = new DataMessageMetadata(); dmm.getComponents().add(new ComponentMetadata("myid")); @@ -423,7 +423,7 @@ public class ManipulatorTest { List mapping = new ArrayList(); mapping.add(new JythonParameterMappingID("o", "myid")); mapping.add(new JythonParameterMappingID("c", "myid2")); - mapping.add(new JythonParameterMappingChannel("d", testChannel, Double.class)); + mapping.add(new JythonParameterMappingChannel("d", TestChannels.ANALOG_OUT, Double.class)); JythonManipulation manipulation = new JythonManipulation(id, script, mapping); List manipulations = new ArrayList();