Skip to content

Commit bf70048

Browse files
committed
updated and added plugin tests
1 parent 2913cbc commit bf70048

File tree

4 files changed

+98
-5
lines changed

4 files changed

+98
-5
lines changed
+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package fourquant;
2+
3+
import ij.ImagePlus;
4+
import ij.plugin.filter.PlugInFilter;
5+
import ij.process.ImageProcessor;
6+
7+
import java.io.Serializable;
8+
9+
/**
10+
* A fake imagej plugin for testing purposes
11+
* Created by mader on 5/9/16.
12+
*/
13+
public class FakePlugin implements PlugInFilter, Serializable {
14+
15+
@Override
16+
public int setup(String s, ImagePlus imagePlus) {
17+
return 0;
18+
}
19+
20+
@Override
21+
public void run(ImageProcessor imageProcessor) {
22+
System.out.println("FakePlugin has run!");
23+
}
24+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package fourquant;
2+
3+
import fourquant.imagej.ImageJSettings;
4+
import fourquant.pacs.api.PatientTable;
5+
import fourquant.pacs.patients;
6+
import fourquant.riqae.USBImageJSettings;
7+
import org.junit.FixMethodOrder;
8+
import org.junit.Test;
9+
import org.junit.runners.MethodSorters;
10+
11+
import java.io.Serializable;
12+
13+
import static org.junit.Assert.assertEquals;
14+
15+
/**
16+
* Created by mader on 5/9/16.
17+
*/
18+
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
19+
public class FakePluginTests implements Serializable {
20+
final static String fijiPath = "/Applications/Fiji.app/Contents/";
21+
final static ImageJSettings ijs = new USBImageJSettings(fijiPath,false,false,false);
22+
23+
// get the default values from the communication singleton class
24+
final static String bindPort = patients.PacsCommunicationSingleton.port();
25+
final static String bindAddress = patients.PacsCommunicationSingleton.server();
26+
final static String bindName = patients.PacsCommunicationSingleton.bind();
27+
final static String userName = patients.PacsCommunicationSingleton.userName();
28+
static {
29+
// register the fake plugin
30+
}
31+
PatientTable pt = PatientTable.create_from_csv(FakePluginTests.class.getResource("/single_name.csv").getPath(),
32+
ijs,bindPort,bindAddress,userName,bindName);
33+
34+
@Test
35+
public void createFakeTableTest() {
36+
assertEquals("Should only be one element",pt.count(),1);
37+
}
38+
39+
}
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,41 @@
11
package fourquant;
22

3+
import fourquant.imagej.ImageJSettings;
4+
import fourquant.pacs.api.PatientTable;
5+
import fourquant.pacs.patients;
6+
import fourquant.riqae.USBImageJSettings;
7+
import org.junit.FixMethodOrder;
8+
import org.junit.Test;
9+
import org.junit.runners.MethodSorters;
10+
11+
import java.io.Serializable;
12+
13+
import static org.junit.Assert.assertEquals;
14+
315
/**
16+
* Tests to verify the PatientTable works correctly
417
* Created by mader on 5/6/16.
518
*/
619
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
7-
public class PatientTableTests extends Serializable {
20+
public class PatientTableTests implements Serializable {
821
final static String fijiPath = "/Applications/Fiji.app/Contents/";
922
final static ImageJSettings ijs = new USBImageJSettings(fijiPath,false,false,false);
10-
final static int bindPort = 11112;
11-
final static String bindAddress = "localhost";
23+
24+
// get the default values from the communication singleton class
25+
final static String bindPort = patients.PacsCommunicationSingleton.port();
26+
final static String bindAddress = patients.PacsCommunicationSingleton.server();
27+
final static String bindName = patients.PacsCommunicationSingleton.bind();
28+
final static String userName = patients.PacsCommunicationSingleton.userName();
29+
static {
30+
// register the fake plugin
31+
}
32+
PatientTable pt = PatientTable.create_from_csv(FakePluginTests.class.getResource("/single_name.csv").getPath(),
33+
ijs,bindPort,bindAddress,userName,bindName);
34+
35+
@Test
36+
public void testCountOfTable() {
37+
assertEquals("Should only be one element",pt.count(),1);
38+
39+
}
1240

1341
}

src/test/scala/fourquant/SSQLTests.scala

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package fourquant
22

3+
import fourquant.pacs.patients.PacsCommunicationSingleton
34
import fourquant.riqae.USBImageJSettings
45
import org.scalatest.{FunSuite, Matchers}
56

67
class SSQLTests extends FunSuite with Matchers with Serializable {
78
val use_hive = true
89
val fijiPath = "/Applications/Fiji.app/Contents/"
910
val ijs = new USBImageJSettings(fijiPath, false, false, false)
10-
val bindPort = 11112
11-
val bindAddress = "localhost"
11+
val bindPort = PacsCommunicationSingleton.port;
12+
val bindAddress = PacsCommunicationSingleton.server;
13+
1214

1315
val sq = fourquant.db.demo.createSQLContext(None,bindPort,
1416
bindAddress,"", true, ijs,use_hive)

0 commit comments

Comments
 (0)