fda/ch.psi.fda
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed tests

Browse Source
This commit is contained in:
ebner
2013-10-09 11:23:34 +02:00
parent 3532f95acb
commit 809caa3ed1
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ch.psi.fda/src/main/java/ch/psi/fda/core/loops/TemplateOTF.java
View File

@@ -58,7 +58,7 @@ public class TemplateOTF {
@CaChannel(type=Double.class, name="${PREFIX}:UEND")
private Channel<Double> end;
@CaChannel(type=Double.class, name=":UEND.DRVL")
@CaChannel(type=Double.class, name="${PREFIX}:UEND.DRVL")
private Channel<Double> endMin;
@CaChannel(type=Double.class, name="${PREFIX}:UEND.DRVH")

2
ch.psi.fda/src/test/java/ch/psi/fda/TestConfiguration.java
View File

@@ -30,7 +30,7 @@ public class TestConfiguration {
private final String prefixScaler = "MTEST-HW3:JS";
private final String server = "yoke.psi.ch";
private final String share = "/usr/nfs";
private final String smbShare = "smb://:@"+server+"/nfs/"; // It is important to have the last slash / !
private final String smbShare = "smb://test:test@"+server+"/nfs/"; // It is important to have the last slash / !
private final String motor1 = "MTEST-HW3:MOT1";
private final String analogIn1 = "MTEST-HW3-AI1:AI_01";

2
ch.psi.fda/src/test/java/ch/psi/fda/core/loops/OTFLoopTest.java
View File

@@ -80,7 +80,7 @@ public class OTFLoopTest {
Map<String, String> macros = new HashMap<>();
macros.put("PREFIX", configuration.getOtfPrefix());
TemplateOTF template = new TemplateOTF();
cservice.createAnnotatedChannels(template);
cservice.createAnnotatedChannels(template, macros);
// ZigZag loop