diff --git a/plugins/TestingList.java b/plugins/TestingList.java index 20ac886..c22926e 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -52,7 +52,11 @@ public class TestingList extends Panel { @Override protected JPanel create() { - testingList = new NetbeansPluginPanel(); + try { + testingList = new NetbeansPluginPanel(); + } catch (IOException ex) { + Logger.getLogger(TestingList.class.getName()).log(Level.SEVERE, null, ex); + } return testingList; } @@ -83,9 +87,10 @@ public class TestingList extends Panel { public class NetbeansPluginPanel extends MonitoredPanel { - public NetbeansPluginPanel() { + public NetbeansPluginPanel() throws IOException { initComponents(); buildTable(); + loadTests(); } @SuppressWarnings("unchecked") @@ -326,11 +331,12 @@ public class TestingList extends Panel { public void loadTests() throws FileNotFoundException, IOException{ Properties prop = new Properties(); String fileName = "../script/test/devces/LS"; - InputStream is = new FileInputStream(fileName); + //InputStream is = new FileInputStream(fileName); - prop.load(is); + //prop.load(is); - addToTable(prop.getProperty("name"), prop.getProperty("description")); + //addToTable(prop.getProperty("name"), prop.getProperty("description")); + addToTable(("name"), ("description")); //System.out.println(prop.getProperty("tests")); } diff --git a/script/tests/Production/FIXL/.config b/script/tests/Production/FIXL/.config new file mode 100644 index 0000000..f80a9d8 --- /dev/null +++ b/script/tests/Production/FIXL/.config @@ -0,0 +1,3 @@ +name=FIXL +description=FIXL: Fixation Light +tests=Fixation Light Tests diff --git a/script/tests/Production/MWD/.config b/script/tests/Production/MWD/.config new file mode 100644 index 0000000..29688a3 --- /dev/null +++ b/script/tests/Production/MWD/.config @@ -0,0 +1,3 @@ +name=MWD +description=MWD: Modulator Wheel Display +tests=Modulator Wheel Display Tests diff --git a/script/tests/Production/RS/.config b/script/tests/Production/RS/.config new file mode 100644 index 0000000..b935c82 --- /dev/null +++ b/script/tests/Production/RS/.config @@ -0,0 +1,3 @@ +name=RS +description=RS: Range Shifter +tests=Range Shifter Tests diff --git a/script/tests/Production/SC21/.config b/script/tests/Production/SC21/.config new file mode 100644 index 0000000..191ec6b --- /dev/null +++ b/script/tests/Production/SC21/.config @@ -0,0 +1,3 @@ +name=SC21 +description=SC21: Scatter Foil 2.1 +tests=Linear Slide Tests diff --git a/script/tests/Production/SC22/.config b/script/tests/Production/SC22/.config new file mode 100644 index 0000000..0372357 --- /dev/null +++ b/script/tests/Production/SC22/.config @@ -0,0 +1,3 @@ +name=SC22 +description=SC21: Scatter Foil 2.2 +tests=Linear Slide Tests diff --git a/script/tests/Production/SC23/.config b/script/tests/Production/SC23/.config new file mode 100644 index 0000000..ef7460a --- /dev/null +++ b/script/tests/Production/SC23/.config @@ -0,0 +1,3 @@ +name=SC23 +description=SC23: Scatter Foil 2.3 +tests=Linear Slide Tests diff --git a/script/tests/devices/LS/.config b/script/tests/devices/LS/.config new file mode 100644 index 0000000..f2b2e33 --- /dev/null +++ b/script/tests/devices/LS/.config @@ -0,0 +1,3 @@ +name=LS +description=Linear Slide in test office setup +tests=Office Linear Slide Tests diff --git a/script/tests/tests/Fixation Light Tests/.config b/script/tests/tests/Fixation Light Tests/.config new file mode 100644 index 0000000..f6afae3 --- /dev/null +++ b/script/tests/tests/Fixation Light Tests/.config @@ -0,0 +1,2 @@ +name=Fixation Light Tests +description=Tests on the OPTIS2 fixation light diff --git a/script/tests/tests/Fixation Light Tests/Lamp Test/.config b/script/tests/tests/Fixation Light Tests/Lamp Test/.config new file mode 100644 index 0000000..a87d8c0 --- /dev/null +++ b/script/tests/tests/Fixation Light Tests/Lamp Test/.config @@ -0,0 +1,3 @@ +name=Lamp Test +description=Turns on every LED in sequence +filename=Lamp Test.xml diff --git a/script/tests/tests/Fixation Light Tests/Lamp Test/Lamp Test.xml b/script/tests/tests/Fixation Light Tests/Lamp Test/Lamp Test.xml new file mode 100644 index 0000000..636fff5 --- /dev/null +++ b/script/tests/tests/Fixation Light Tests/Lamp Test/Lamp Test.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + 1000 + + + + 1 + 143 + 1 + + + + + + + 1 + + + + + + + diff --git a/script/tests/tests/Linear Slide Tests/.config b/script/tests/tests/Linear Slide Tests/.config new file mode 100644 index 0000000..8f517bb --- /dev/null +++ b/script/tests/tests/Linear Slide Tests/.config @@ -0,0 +1,2 @@ +name=Linear Slide Tests +description=Tests on the OPTIS2 linear slides diff --git a/script/tests/tests/Linear Slide Tests/Calibrate/.config b/script/tests/tests/Linear Slide Tests/Calibrate/.config new file mode 100644 index 0000000..e75c90e --- /dev/null +++ b/script/tests/tests/Linear Slide Tests/Calibrate/.config @@ -0,0 +1,3 @@ +name=Calibrate +description=Calibrates the device +filename=Calibrate.xml diff --git a/script/tests/tests/Linear Slide Tests/Calibrate/Calibrate.xml b/script/tests/tests/Linear Slide Tests/Calibrate/Calibrate.xml new file mode 100644 index 0000000..866c3cd --- /dev/null +++ b/script/tests/tests/Linear Slide Tests/Calibrate/Calibrate.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + 1000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/script/tests/tests/Linear Slide Tests/Calibrate/doit.sh b/script/tests/tests/Linear Slide Tests/Calibrate/doit.sh new file mode 100644 index 0000000..4807a72 --- /dev/null +++ b/script/tests/tests/Linear Slide Tests/Calibrate/doit.sh @@ -0,0 +1,2 @@ +#!/bin/bash +sleep 5 diff --git a/script/tests/tests/Linear Slide Tests/Check Status/.config b/script/tests/tests/Linear Slide Tests/Check Status/.config new file mode 100644 index 0000000..35dbf62 --- /dev/null +++ b/script/tests/tests/Linear Slide Tests/Check Status/.config @@ -0,0 +1,3 @@ +name=Check Status +description=Checks the drive status +filename=Check Status.xml diff --git a/script/tests/tests/Linear Slide Tests/Check Status/Check Status.xml b/script/tests/tests/Linear Slide Tests/Check Status/Check Status.xml new file mode 100644 index 0000000..369cae6 --- /dev/null +++ b/script/tests/tests/Linear Slide Tests/Check Status/Check Status.xml @@ -0,0 +1,56 @@ + + + + + + + + + 1000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/script/tests/tests/Modulator Wheel Display Tests/.config b/script/tests/tests/Modulator Wheel Display Tests/.config new file mode 100644 index 0000000..fa926ac --- /dev/null +++ b/script/tests/tests/Modulator Wheel Display Tests/.config @@ -0,0 +1,2 @@ +name=Modulator Wheel Display Tests +description=Tests on the OPTIS2 Modulator Wheel Display diff --git a/script/tests/tests/Modulator Wheel Display Tests/Display Test/.config b/script/tests/tests/Modulator Wheel Display Tests/Display Test/.config new file mode 100644 index 0000000..ecbcff6 --- /dev/null +++ b/script/tests/tests/Modulator Wheel Display Tests/Display Test/.config @@ -0,0 +1,3 @@ +name=Display Test +description=Displays an incrementing number +filename=Display Test.xml diff --git a/script/tests/tests/Modulator Wheel Display Tests/Display Test/Display Test.xml b/script/tests/tests/Modulator Wheel Display Tests/Display Test/Display Test.xml new file mode 100644 index 0000000..69b8eb8 --- /dev/null +++ b/script/tests/tests/Modulator Wheel Display Tests/Display Test/Display Test.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + 1000 + + + + 1 + 143 + 1 + + + + + + + 1 + + + + + + + diff --git a/script/tests/tests/Modulator Wheel Display Tests/Lamp Test/.config b/script/tests/tests/Modulator Wheel Display Tests/Lamp Test/.config new file mode 100644 index 0000000..a87d8c0 --- /dev/null +++ b/script/tests/tests/Modulator Wheel Display Tests/Lamp Test/.config @@ -0,0 +1,3 @@ +name=Lamp Test +description=Turns on every LED in sequence +filename=Lamp Test.xml diff --git a/script/tests/tests/Modulator Wheel Display Tests/Lamp Test/Lamp Test.xml b/script/tests/tests/Modulator Wheel Display Tests/Lamp Test/Lamp Test.xml new file mode 100644 index 0000000..636fff5 --- /dev/null +++ b/script/tests/tests/Modulator Wheel Display Tests/Lamp Test/Lamp Test.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + 1000 + + + + 1 + 143 + 1 + + + + + + + 1 + + + + + + + diff --git a/script/tests/tests/Office Linear Slide Tests/.config b/script/tests/tests/Office Linear Slide Tests/.config new file mode 100644 index 0000000..4db5623 --- /dev/null +++ b/script/tests/tests/Office Linear Slide Tests/.config @@ -0,0 +1,2 @@ +name=Office Linear Slide Tests +description=Tests on the office linear slides diff --git a/script/tests/tests/Office Linear Slide Tests/Calibrate/.config b/script/tests/tests/Office Linear Slide Tests/Calibrate/.config new file mode 100644 index 0000000..e75c90e --- /dev/null +++ b/script/tests/tests/Office Linear Slide Tests/Calibrate/.config @@ -0,0 +1,3 @@ +name=Calibrate +description=Calibrates the device +filename=Calibrate.xml diff --git a/script/tests/tests/Office Linear Slide Tests/Calibrate/Calibrate.xml b/script/tests/tests/Office Linear Slide Tests/Calibrate/Calibrate.xml new file mode 100644 index 0000000..eef74b6 --- /dev/null +++ b/script/tests/tests/Office Linear Slide Tests/Calibrate/Calibrate.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + 1000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/script/tests/tests/Office Linear Slide Tests/Calibrate/doit.sh b/script/tests/tests/Office Linear Slide Tests/Calibrate/doit.sh new file mode 100644 index 0000000..4807a72 --- /dev/null +++ b/script/tests/tests/Office Linear Slide Tests/Calibrate/doit.sh @@ -0,0 +1,2 @@ +#!/bin/bash +sleep 5 diff --git a/script/tests/tests/Office Linear Slide Tests/Check Status/.config b/script/tests/tests/Office Linear Slide Tests/Check Status/.config new file mode 100644 index 0000000..35dbf62 --- /dev/null +++ b/script/tests/tests/Office Linear Slide Tests/Check Status/.config @@ -0,0 +1,3 @@ +name=Check Status +description=Checks the drive status +filename=Check Status.xml diff --git a/script/tests/tests/Office Linear Slide Tests/Check Status/Check Status.xml b/script/tests/tests/Office Linear Slide Tests/Check Status/Check Status.xml new file mode 100644 index 0000000..4c716b1 --- /dev/null +++ b/script/tests/tests/Office Linear Slide Tests/Check Status/Check Status.xml @@ -0,0 +1,56 @@ + + + + + + + + + 1000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/script/tests/tests/Range Shifter Tests/.config b/script/tests/tests/Range Shifter Tests/.config new file mode 100644 index 0000000..05be1e2 --- /dev/null +++ b/script/tests/tests/Range Shifter Tests/.config @@ -0,0 +1,2 @@ +name=Range Shifter Tests +description=Tests on the OPTIS2 Range Shifter diff --git a/script/tests/tests/Range Shifter Tests/Calibrate/.config b/script/tests/tests/Range Shifter Tests/Calibrate/.config new file mode 100644 index 0000000..e75c90e --- /dev/null +++ b/script/tests/tests/Range Shifter Tests/Calibrate/.config @@ -0,0 +1,3 @@ +name=Calibrate +description=Calibrates the device +filename=Calibrate.xml diff --git a/script/tests/tests/Range Shifter Tests/Calibrate/Calibrate.xml b/script/tests/tests/Range Shifter Tests/Calibrate/Calibrate.xml new file mode 100644 index 0000000..6b363a5 --- /dev/null +++ b/script/tests/tests/Range Shifter Tests/Calibrate/Calibrate.xml @@ -0,0 +1,78 @@ + + + + + + + + + 70 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/script/tests/tests/Range Shifter Tests/Calibrate/doit.sh b/script/tests/tests/Range Shifter Tests/Calibrate/doit.sh new file mode 100644 index 0000000..4807a72 --- /dev/null +++ b/script/tests/tests/Range Shifter Tests/Calibrate/doit.sh @@ -0,0 +1,2 @@ +#!/bin/bash +sleep 5 diff --git a/script/tests/tests/Range Shifter Tests/Check Linearity/.config b/script/tests/tests/Range Shifter Tests/Check Linearity/.config new file mode 100644 index 0000000..978a7b5 --- /dev/null +++ b/script/tests/tests/Range Shifter Tests/Check Linearity/.config @@ -0,0 +1,3 @@ +name=Check Linearity +description=Compares the position reported by the motor and the incremental encoder +filename=Check Linearity.xml diff --git a/script/tests/tests/Range Shifter Tests/Check Linearity/Check Linearity.xml b/script/tests/tests/Range Shifter Tests/Check Linearity/Check Linearity.xml new file mode 100644 index 0000000..bc9a9c6 --- /dev/null +++ b/script/tests/tests/Range Shifter Tests/Check Linearity/Check Linearity.xml @@ -0,0 +1,83 @@ + + + + + + + + + + 200 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/script/tests/tests/Range Shifter Tests/Check Linearity/doit.sh b/script/tests/tests/Range Shifter Tests/Check Linearity/doit.sh new file mode 100644 index 0000000..4807a72 --- /dev/null +++ b/script/tests/tests/Range Shifter Tests/Check Linearity/doit.sh @@ -0,0 +1,2 @@ +#!/bin/bash +sleep 5 diff --git a/script/tests/tests/Range Shifter Tests/Check Status/.config b/script/tests/tests/Range Shifter Tests/Check Status/.config new file mode 100644 index 0000000..35dbf62 --- /dev/null +++ b/script/tests/tests/Range Shifter Tests/Check Status/.config @@ -0,0 +1,3 @@ +name=Check Status +description=Checks the drive status +filename=Check Status.xml diff --git a/script/tests/tests/Range Shifter Tests/Check Status/Check Status.xml b/script/tests/tests/Range Shifter Tests/Check Status/Check Status.xml new file mode 100644 index 0000000..f1717df --- /dev/null +++ b/script/tests/tests/Range Shifter Tests/Check Status/Check Status.xml @@ -0,0 +1,55 @@ + + + + + + + + 3000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +