From aa1681aaf36392b852124c3a3fbecb5c68277ae9 Mon Sep 17 00:00:00 2001 From: Simon Ebner Date: Fri, 11 Apr 2014 16:15:38 +0200 Subject: [PATCH] Cleaned messed up stuff --- .../java/ch/psi/fda/rest/ControlClient.java | 0 .../java/ch/psi/fda/rest/StreamClient.java | 0 .../services/ch.psi.fda.DescriptorProvider | 2 +- .../fda/aq/XScanDescriptorProviderTest.java | 31 +++++++++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) rename ch.psi.fda/src/{test => main}/java/ch/psi/fda/rest/ControlClient.java (100%) rename ch.psi.fda/src/{test => main}/java/ch/psi/fda/rest/StreamClient.java (100%) create mode 100644 ch.psi.fda/src/test/java/ch/psi/fda/aq/XScanDescriptorProviderTest.java diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/rest/ControlClient.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/ControlClient.java similarity index 100% rename from ch.psi.fda/src/test/java/ch/psi/fda/rest/ControlClient.java rename to ch.psi.fda/src/main/java/ch/psi/fda/rest/ControlClient.java diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/rest/StreamClient.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/StreamClient.java similarity index 100% rename from ch.psi.fda/src/test/java/ch/psi/fda/rest/StreamClient.java rename to ch.psi.fda/src/main/java/ch/psi/fda/rest/StreamClient.java diff --git a/ch.psi.fda/src/main/resources/META-INF/services/ch.psi.fda.DescriptorProvider b/ch.psi.fda/src/main/resources/META-INF/services/ch.psi.fda.DescriptorProvider index 21e477d..58bbc47 100644 --- a/ch.psi.fda/src/main/resources/META-INF/services/ch.psi.fda.DescriptorProvider +++ b/ch.psi.fda/src/main/resources/META-INF/services/ch.psi.fda.DescriptorProvider @@ -1 +1 @@ -ch.psi.fda.aq.XScanDescriptorProvider \ No newline at end of file +ch.psi.fda.aq.XScanDescriptorProvider diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/aq/XScanDescriptorProviderTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/aq/XScanDescriptorProviderTest.java new file mode 100644 index 0000000..51ce22c --- /dev/null +++ b/ch.psi.fda/src/test/java/ch/psi/fda/aq/XScanDescriptorProviderTest.java @@ -0,0 +1,31 @@ +package ch.psi.fda.aq; + +import java.util.ServiceLoader; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import ch.psi.fda.EContainerFactory; + +public class XScanDescriptorProviderTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void test() { + ServiceLoader factories = ServiceLoader.load(EContainerFactory.class); + for (EContainerFactory factory : factories) { + System.out.println(factory.getClass().getName()); + } + System.out.println("done"); + } + + +}