From 958223121a7b6c32d22ccade226f18504263a68a Mon Sep 17 00:00:00 2001 From: yukihane Date: Tue, 23 Aug 2011 13:57:38 +0900 Subject: [PATCH] =?utf8?q?=E3=82=B3=E3=83=B3=E3=83=95=E3=82=A3=E3=82=B0?= =?utf8?q?=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BF=E3=83=86=E3=82=B9=E3=83=88?= =?utf8?q?=E3=82=B1=E3=83=BC=E3=82=B9=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- frontend/src/yukihane/inqubus/Main.java | 19 ++++++++ .../inqubus/{conifg => config}/Config.java | 2 +- .../inqubus/{conifg => config}/Properties.java | 11 ++--- frontend/src/yukihane/inqubus/gui/MainFrame.java | 2 +- frontend/test/testdata/inqubus_ng.xml | 0 frontend/test/testdata/inqubus_ok.xml | 0 .../yukihane/inqubus/config/PropertiesTest.java | 55 +++++++++++++--------- 7 files changed, 57 insertions(+), 32 deletions(-) create mode 100644 frontend/src/yukihane/inqubus/Main.java rename frontend/src/yukihane/inqubus/{conifg => config}/Config.java (92%) rename frontend/src/yukihane/inqubus/{conifg => config}/Properties.java (96%) create mode 100644 frontend/test/testdata/inqubus_ng.xml create mode 100644 frontend/test/testdata/inqubus_ok.xml diff --git a/frontend/src/yukihane/inqubus/Main.java b/frontend/src/yukihane/inqubus/Main.java new file mode 100644 index 0000000..4544bc7 --- /dev/null +++ b/frontend/src/yukihane/inqubus/Main.java @@ -0,0 +1,19 @@ +package yukihane.inqubus; + +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; +import java.nio.file.Path; + +/** + * いんきゅばす起動クラス. + * @author yuki + */ +public class Main { + + public static void main(String[] args) { + final FileSystem fileSystem = FileSystems.getDefault(); + final Path path = fileSystem.getPath("inqubus.xml"); + System.out.println(path.toAbsolutePath()); + + } +} diff --git a/frontend/src/yukihane/inqubus/conifg/Config.java b/frontend/src/yukihane/inqubus/config/Config.java similarity index 92% rename from frontend/src/yukihane/inqubus/conifg/Config.java rename to frontend/src/yukihane/inqubus/config/Config.java index 4c7459a..f9680d1 100644 --- a/frontend/src/yukihane/inqubus/conifg/Config.java +++ b/frontend/src/yukihane/inqubus/config/Config.java @@ -1,4 +1,4 @@ -package yukihane.inqubus.conifg; +package yukihane.inqubus.config; /** * diff --git a/frontend/src/yukihane/inqubus/conifg/Properties.java b/frontend/src/yukihane/inqubus/config/Properties.java similarity index 96% rename from frontend/src/yukihane/inqubus/conifg/Properties.java rename to frontend/src/yukihane/inqubus/config/Properties.java index 88a0f6d..ed1693c 100644 --- a/frontend/src/yukihane/inqubus/conifg/Properties.java +++ b/frontend/src/yukihane/inqubus/config/Properties.java @@ -1,7 +1,8 @@ -package yukihane.inqubus.conifg; +package yukihane.inqubus.config; import java.io.File; import java.lang.reflect.Field; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import org.apache.commons.configuration.ConfigurationException; @@ -132,20 +133,16 @@ public enum Properties { this.p_proxy_use = Boolean.toString(use); } - private String getConfigurationName() { - return "inqubus.xml"; - } - private String getPrefix() { return "p_"; } private Properties() { config = new XMLConfiguration(); - config.setFileName(getConfigurationName()); } - public void load() throws ConfigurationException { + public void load(String fileName) throws ConfigurationException { + config.setFileName(fileName); config.load(); } diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java index d9ab6ca..eed7037 100644 --- a/frontend/src/yukihane/inqubus/gui/MainFrame.java +++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java @@ -22,7 +22,7 @@ import javax.swing.JTextField; import javax.swing.TransferHandler; import javax.swing.UIManager; import javax.swing.UIManager.LookAndFeelInfo; -import yukihane.inqubus.conifg.Properties; +import yukihane.inqubus.config.Properties; import yukihane.inqubus.model.Target; import yukihane.inqubus.model.TargetsTableModel; diff --git a/frontend/test/testdata/inqubus_ng.xml b/frontend/test/testdata/inqubus_ng.xml new file mode 100644 index 0000000..e69de29 diff --git a/frontend/test/testdata/inqubus_ok.xml b/frontend/test/testdata/inqubus_ok.xml new file mode 100644 index 0000000..e69de29 diff --git a/frontend/test/yukihane/inqubus/config/PropertiesTest.java b/frontend/test/yukihane/inqubus/config/PropertiesTest.java index 251328e..2b293e6 100644 --- a/frontend/test/yukihane/inqubus/config/PropertiesTest.java +++ b/frontend/test/yukihane/inqubus/config/PropertiesTest.java @@ -1,14 +1,12 @@ package yukihane.inqubus.config; -import yukihane.inqubus.conifg.Properties; +import static org.junit.Assert.*; + import java.lang.reflect.Field; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; import org.apache.commons.configuration.ConfigurationException; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; /** * @@ -17,25 +15,36 @@ import static org.junit.Assert.*; public class PropertiesTest { @Test - public void test() throws ConfigurationException, IllegalArgumentException, IllegalAccessException { + public void testLoadFail() { + FileSystem fs = FileSystems.getDefault(); + System.out.println(fs.getPath(".").toAbsolutePath()); Properties p = Properties.INSTANCE; - p.load(); - Field[] fields = p.getClass().getDeclaredFields(); - for(Field f: fields){ - f.setAccessible(true); - System.out.println(f.get(p)); + try { + p.load("test/testdata/error.xml"); + fail("ファイルが存在しないので読み込みに失敗するはず"); + } catch (ConfigurationException ex) { } - } - @Test - public void test2() throws ConfigurationException, IllegalArgumentException, IllegalAccessException { - Properties p = Properties.INSTANCE; - p.load(); - p.setDbLocation("d_loc"); - p.save(); - Field[] fields = p.getClass().getDeclaredFields(); - for(Field f: fields){ - f.setAccessible(true); - System.out.println(f.get(p)); + try{ + p.load("test/testdata/inqubus_test.xml"); + fail("ファイルが空なので読み込みに失敗するはず"); + } catch (ConfigurationException ex) { } +// Field[] fields = p.getClass().getDeclaredFields(); +// for(Field f: fields){ +// f.setAccessible(true); +// System.out.println(f.get(p)); +// } } +// @Test +// public void test2() throws ConfigurationException, IllegalArgumentException, IllegalAccessException { +// Properties p = Properties.INSTANCE; +// p.load("test/testdata/inqubus_test.xml"); +// p.setDbLocation("d_loc"); +// p.save(); +// Field[] fields = p.getClass().getDeclaredFields(); +// for(Field f: fields){ +// f.setAccessible(true); +// System.out.println(f.get(p)); +// } +// } } -- 2.11.0