diff --git a/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/App/config/scripts/medm.sh b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/App/config/scripts/medm.sh
deleted file mode 100644
index ccbef31..0000000
--- a/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/App/config/scripts/medm.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-BASEDIR=$(cd $(dirname $0);pwd)
-
-EPICS_DISPLAY_PATH=/work/sls/config/medm:$EPICS_DISPLAY_PATH
-export EPICS_DISPLAY_PATH
-
-# OTFSCAN MEDM
-medm -x -macro "P=MTEST-HW3-OTFX" G_OTFSCAN_user.adl &
-
-# Motor MEDM
-medm -x -macro "P=MTEST-HW3:, M=MOT1" motorx_more.adl &
-#medm -x -macro "ENC=MTEST-HW3:EC1" G_ECM_514A_encoder.adl &
-
-medm -x -macro "P=MTEST-HW3:, M=MOT2" motorx_more.adl &
-#medm -x -macro "ENC=MTEST-HW3:EC2" G_ECM_514A_encoder.adl &
-
-medm -x -macro "P=MTEST-PC-MOTOR:, M=MOT1" motorx_more.adl &
-
-# Scaler MEDM
-medm -x -macro "P=MTEST-HW3:, S=JS" scaler16.adl &
\ No newline at end of file
diff --git a/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/MTEST-PC-FDA_startup.script b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/MTEST-PC-FDA_startup.script
deleted file mode 100644
index 22df3e8..0000000
--- a/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/MTEST-PC-FDA_startup.script
+++ /dev/null
@@ -1,2 +0,0 @@
-# Load test template
-dbLoadTemplate("MTEST-PC-FDA_test.subs")
diff --git a/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/MTEST-PC-FDA_test.subs b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/MTEST-PC-FDA_test.subs
deleted file mode 100644
index 3e27546..0000000
--- a/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/MTEST-PC-FDA_test.subs
+++ /dev/null
@@ -1,5 +0,0 @@
-file test.template {
- {
- P = MTEST-PC-FDA:
- }
-}
diff --git a/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/Makefile b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/Makefile
deleted file mode 100644
index ff9276a..0000000
--- a/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-MODULE = MTEST-PC-FDA
-export MODULE
-
-build:
-
-clean:
-
-install: build
- swit -V -ioc MTEST-PC-FDA
-
-help:
- @echo "The following targets are available with this Makefile:-"
- @echo "make (calls default target)"
- @echo "make build (default)"
- @echo "make install"
- @echo "make clean"
- @echo "make help"
diff --git a/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/test.template b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/test.template
deleted file mode 100644
index 6cfbe89..0000000
--- a/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/test.template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Binary Output
-record(bo, "$(P)BO") {
- field(DESC, "Binary Output")
-}
-
-# Binary Output
-record(bo, "$(P)BO2") {
- field(DESC, "Binary Output 2")
- field(VAL, "0")
-}
-
-# Analog Output
-record(ao, "$(P)AO") {
- field(PREC, "6")
- field(DESC, "Analog Output")
-}
-
-# String Output
-record(stringout, "$(P)SOUT") {
-}
-
-# Double Waveform (100 Elements)
-record(waveform, "$(P)DWAVE") {
- field(DESC, "Double Waveform")
- field(PREC, "6")
- field(NELM, "100")
- field(FTVL, "DOUBLE")
-}
-
-# Integer Waveform (100 Elements)
-record(waveform, "$(P)LWAVE") {
- field(DESC, "Long Waveform")
- field(NELM, "100")
- field(FTVL, "LONG")
-}
-
-# Character Waveform (100 Elements)
-record(waveform, "$(P)CWAVE") {
- field(DESC, "Character Waveform")
- field(NELM, "100")
- field(FTVL, "CHAR")
-}
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/ui/AcquisitionMainTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/ui/AcquisitionMainTest.java
index e926b40..5bb5db4 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/ui/AcquisitionMainTest.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/ui/AcquisitionMainTest.java
@@ -18,33 +18,13 @@
*/
package ch.psi.fda.ui;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import ch.psi.fda.ui.AcquisitionMain;
-/**
- * @author ebner
- *
- */
public class AcquisitionMainTest {
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
/**
* Test method for {@link ch.psi.fda.ui.AcquisitionMain#main(java.lang.String[])}.
*/
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/ui/ApplicationConfiguratorTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/ui/ApplicationConfiguratorTest.java
index 163458a..44c797c 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/ui/ApplicationConfiguratorTest.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/ui/ApplicationConfiguratorTest.java
@@ -21,38 +21,20 @@ package ch.psi.fda.ui;
import java.io.IOException;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import ch.psi.fda.ui.ApplicationConfigurator;
-/**
- * @author ebner
- *
- */
public class ApplicationConfiguratorTest {
private ApplicationConfigurator configurator;
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- System.setProperty(ApplicationConfigurator.FDA_HOME_ARGUMENT, "target/tmp/home");
- configurator = new ApplicationConfigurator();
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
+ @Ignore
@Test
public void testInitializeApplication() throws IOException{
+ System.setProperty(ApplicationConfigurator.FDA_HOME_ARGUMENT, "target/tmp/home");
+ configurator = new ApplicationConfigurator();
configurator.initializeApplication();
}
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/ui/TestChannels.java b/ch.psi.fda/src/test/java/ch/psi/fda/ui/TestChannels.java
deleted file mode 100644
index e7fba64..0000000
--- a/ch.psi.fda/src/test/java/ch/psi/fda/ui/TestChannels.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *
- * Copyright 2011 Paul Scherrer Institute. All rights reserved.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This code is distributed in the hope that it will be useful, but without any
- * warranty; without even the implied warranty of merchantability or fitness for
- * a particular purpose. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this code. If not, see .
- *
- */
-package ch.psi.fda.ui;
-
-/**
- * @author ebner
- *
- */
-public class TestChannels {
- public static final String BINARY_OUT = "MTEST-PC-FDA:BO";
- public static final String BINARY_OUT_TWO = "MTEST-PC-FDA:BO2";
- public static final String ANALOG_OUT = "MTEST-PC-FDA:AO";
- public static final String STRING_OUT = "MTEST-PC-FDA:SOUT";
- public static final String DOUBLE_WAVEFORM = "MTEST-PC-FDA:DWAVE";
- public static final String STRING_OUT_NOT_EXIST = "MTEST-PC-FDA:SOUT-NOT-EXIST";
-
- public static final String MOTOR_ONE = "MTEST-HW3:MOT1";
-
-}
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/ui/TestConfiguration.java b/ch.psi.fda/src/test/java/ch/psi/fda/ui/TestConfiguration.java
deleted file mode 100644
index 71aed87..0000000
--- a/ch.psi.fda/src/test/java/ch/psi/fda/ui/TestConfiguration.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- *
- * Copyright 2012 Paul Scherrer Institute. All rights reserved.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This code is distributed in the hope that it will be useful, but without any
- * warranty; without even the implied warranty of merchantability or fitness for
- * a particular purpose. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this code. If not, see .
- *
- */
-package ch.psi.fda.ui;
-
-/**
- * @author ebner
- *
- */
-public class TestConfiguration {
- private static final TestConfiguration instance = new TestConfiguration();
-
- private final String otfPrefix = "MTEST-HW3-OTFX";
- private final String crlogicPrefix = "MTEST-HW3-CRL";
- 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://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";
-
- private TestConfiguration(){
- }
-
- public static TestConfiguration getInstance(){
- return instance;
- }
-
- /**
- * @return the prefix
- */
- public String getCrlogicPrefix() {
- return crlogicPrefix;
- }
-
- /**
- * @return the prefixScaler
- */
- public String getPrefixScaler() {
- return prefixScaler;
- }
-
- /**
- * @return the server
- */
- public String getServer() {
- return server;
- }
-
- /**
- * @return the share
- */
- public String getShare() {
- return share;
- }
-
- /**
- * @return the smbShare
- */
- public String getSmbShare() {
- return smbShare;
- }
-
- /**
- * @return the motor1
- */
- public String getMotor1() {
- return motor1;
- }
-
- /**
- * @return the analogIn1
- */
- public String getAnalogIn1() {
- return analogIn1;
- }
-
- /**
- * @return the otfPrefix
- */
- public String getOtfPrefix() {
- return otfPrefix;
- }
-
-
-}
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/ui/VisualizationMainTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/ui/VisualizationMainTest.java
index a471003..7481631 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/ui/VisualizationMainTest.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/ui/VisualizationMainTest.java
@@ -34,8 +34,6 @@ import ch.psi.fda.ui.VisualizationMain;
/**
* Testcase for visualization engine
- * @author ebner
- *
*/
public class VisualizationMainTest {
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/ui/visualizer/DataVisualizerTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/ui/visualizer/DataVisualizerTest.java
index 2702bfe..f14d868 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/ui/visualizer/DataVisualizerTest.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/ui/visualizer/DataVisualizerTest.java
@@ -26,8 +26,6 @@ import java.util.logging.Logger;
import javax.swing.JFrame;
import javax.swing.JPanel;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -51,14 +49,6 @@ public class DataVisualizerTest {
private static final Logger logger = Logger.getLogger(DataVisualizerTest.class.getName());
- @Before
- public void setUp() throws Exception {
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
@Ignore
@Test
public void testRun() throws InterruptedException {
@@ -68,10 +58,6 @@ public class DataVisualizerTest {
metadata.add(new Metadata("id3"));
EventBus bus = new EventBus();
-
-// List list = new ArrayList<>();
-// list.add(new XYSeriesDataFilter(, new LinePlot("One")));
-// list.add(new XYSeriesDataFilter("id1", "id3", new LinePlot("Two")));
VDescriptor vdescriptor = new VDescriptor();
@@ -166,7 +152,7 @@ public class DataVisualizerTest {
Thread.sleep(10000);
}
-// @Ignore
+ @Ignore
@Test
public void testRun2D() throws InterruptedException {