変更後のディレクトリ構成に合わせてテストケース内のパスを変更

diff --git a/src/test/java/com/ozacc/mail/impl/JDomXMLMailBuilderTest.java b/src/test/java/com/ozacc/mail/impl/JDomXMLMailBuilderTest.java
index f5d67fc..f4d862c 100755 (executable)
--- a/src/test/java/com/ozacc/mail/impl/JDomXMLMailBuilderTest.java
+++ b/src/test/java/com/ozacc/mail/impl/JDomXMLMailBuilderTest.java
@@ -63,7 +63,7 @@ public class JDomXMLMailBuilderTest extends TestCase {
         * 存在しないファイルを指定して失敗\r
         */\r
        public final void testBuildMailFromFileNotExist() throws Exception {\r
-               String path = "src/test/com/ozacc/mail/testtest-mail1.xml";\r
+               String path = "src/test/java/com/ozacc/mail/testtest-mail1.xml";\r
                File file = new File(path);\r
                try {\r
                        Mail result = builder.buildMail(file);\r
@@ -138,7 +138,7 @@ public class JDomXMLMailBuilderTest extends TestCase {
         * XMLファイルのFileインスタンスからMailインスタンスを生成。\r
         */\r
        public final void testBuildMailFromFile() throws Exception {\r
-               String path = "src/test/com/ozacc/mail/test-mail1.xml";\r
+               String path = "src/test/java/com/ozacc/mail/test-mail1.xml";\r
                File file = new File(path);\r
 \r
                String subject = "XMLMailBuilderのテストケース";\r
@@ -215,7 +215,7 @@ public class JDomXMLMailBuilderTest extends TestCase {
         * Class under test for Mail buildMail(File, VelocityContext)\r
         */\r
        public final void testBuildMailFileVelocityContext() throws Exception {\r
-               String path = "src/test/com/ozacc/mail/test-mail3-velocity.xml";\r
+               String path = "src/test/java/com/ozacc/mail/test-mail3-velocity.xml";\r
                File file = new File(path);\r
 \r
                String name = "伊東美咲";\r
@@ -244,7 +244,7 @@ public class JDomXMLMailBuilderTest extends TestCase {
        }\r
 \r
        public void testBuildMailFromMultipleMailsTemplate() throws Exception {\r
-               String path = "src/test/com/ozacc/mail/test-mail7-multiple.xml";\r
+               String path = "src/test/java/com/ozacc/mail/test-mail7-multiple.xml";\r
                File file = new File(path);\r
 \r
                Mail result1 = builder.buildMail(file, "first");\r

diff --git a/src/test/java/com/ozacc/mail/impl/SendMailImplRealTest.java b/src/test/java/com/ozacc/mail/impl/SendMailImplRealTest.java
index ebcce4f..3691aec 100755 (executable)
--- a/src/test/java/com/ozacc/mail/impl/SendMailImplRealTest.java
+++ b/src/test/java/com/ozacc/mail/impl/SendMailImplRealTest.java
@@ -54,7 +54,7 @@ public class SendMailImplRealTest extends TestCase {
         Mail mail = builder.buildMail(classPath);\r
         mail.addTo(email);\r
 \r
-        File image1 = new File("src/test/com/ozacc/mail/image1.jpg");\r
+        File image1 = new File("src/test/java/com/ozacc/mail/image1.jpg");\r
         FileInputStream fis = new FileInputStream(image1);\r
 \r
         mail.addFile(fis, "野菜画像.jpg");\r
@@ -85,8 +85,8 @@ public class SendMailImplRealTest extends TestCase {
         Mail mail = builder.buildMail(classPath);\r
         mail.addTo(email);\r
 \r
-        File image1 = new File("src/test/com/ozacc/mail/image1.jpg");\r
-        File image2 = new File("src/test/com/ozacc/mail/image2.png");\r
+        File image1 = new File("src/test/java/com/ozacc/mail/image1.jpg");\r
+        File image2 = new File("src/test/java/com/ozacc/mail/image2.png");\r
 \r
         mail.addFile(image1);\r
         mail.addFile(image2, "野菜画像.png");\r
@@ -121,7 +121,7 @@ public class SendMailImplRealTest extends TestCase {
         mail.setHtmlText(mail.getText());\r
         mail.setText("プレーンテキスト");\r
 \r
-        File image1 = new File("src/test/com/ozacc/mail/image1.jpg");\r
+        File image1 = new File("src/test/java/com/ozacc/mail/image1.jpg");\r
         mail.addFile(image1);\r
 \r
         sendMail.send(mail);\r

diff --git a/src/test/java/com/ozacc/mail/impl/SendMailProImplRealTest.java b/src/test/java/com/ozacc/mail/impl/SendMailProImplRealTest.java
index 418634b..74a1768 100755 (executable)
--- a/src/test/java/com/ozacc/mail/impl/SendMailProImplRealTest.java
+++ b/src/test/java/com/ozacc/mail/impl/SendMailProImplRealTest.java
@@ -53,7 +53,7 @@ public class SendMailProImplRealTest extends TestCase {
         Mail mail = builder.buildMail(classPath);\r
         mail.addTo(email);\r
 \r
-        File image1 = new File("src/test/com/ozacc/mail/image1.jpg");\r
+        File image1 = new File("src/test/java/com/ozacc/mail/image1.jpg");\r
         FileInputStream fis = new FileInputStream(image1);\r
 \r
         mail.addFile(fis, "野菜画像.jpg");\r

diff --git a/src/test/java/com/ozacc/mail/impl/XMLMailBuilderImplTest.java b/src/test/java/com/ozacc/mail/impl/XMLMailBuilderImplTest.java
index 25dfb9a..cdd9e7d 100755 (executable)
--- a/src/test/java/com/ozacc/mail/impl/XMLMailBuilderImplTest.java
+++ b/src/test/java/com/ozacc/mail/impl/XMLMailBuilderImplTest.java
@@ -51,7 +51,7 @@ public class XMLMailBuilderImplTest extends TestCase {
        }\r
 \r
        public final void testBuildMultipartMailFromFile() throws Exception {\r
-               String path = "src/test/com/ozacc/mail/test-mail1.xml";\r
+               String path = "src/test/java/com/ozacc/mail/test-mail1.xml";\r
                File file = new File(path);\r
 \r
                String subject = "XMLMailBuilderのテストケース";\r
@@ -149,7 +149,7 @@ public class XMLMailBuilderImplTest extends TestCase {
         * Class under test for Mail buildMail(File)\r
         */\r
        public final void testBuildMailFile() throws Exception {\r
-               String path = "src/test/com/ozacc/mail/test-mail1.xml";\r
+               String path = "src/test/java/com/ozacc/mail/test-mail1.xml";\r
                File file = new File(path);\r
 \r
                String subject = "XMLMailBuilderのテストケース";\r
@@ -192,7 +192,7 @@ public class XMLMailBuilderImplTest extends TestCase {
        }\r
 \r
        public void testBuildMailFromMultipleMailsTemplate() throws Exception {\r
-               String path = "src/test/com/ozacc/mail/test-mail7-multiple.xml";\r
+               String path = "src/test/java/com/ozacc/mail/test-mail7-multiple.xml";\r
                File file = new File(path);\r
 \r
                Mail result1 = builder.buildMail(file, "first");\r

diff --git a/src/test/java/com/ozacc/mail/impl/XMLVelocityMailBuilderImplTest.java b/src/test/java/com/ozacc/mail/impl/XMLVelocityMailBuilderImplTest.java
index abd9be8..8a02330 100755 (executable)
--- a/src/test/java/com/ozacc/mail/impl/XMLVelocityMailBuilderImplTest.java
+++ b/src/test/java/com/ozacc/mail/impl/XMLVelocityMailBuilderImplTest.java
@@ -40,7 +40,7 @@ public class XMLVelocityMailBuilderImplTest extends TestCase {
        }\r
 \r
        public void testBuildMailFromFile() throws Exception {\r
-               String path = "src/test/com/ozacc/mail/test-mail3-velocity.xml";\r
+               String path = "src/test/java/com/ozacc/mail/test-mail3-velocity.xml";\r
                File file = new File(path);\r
 \r
                String name = "伊東美咲";\r

diff --git a/src/test/java/com/ozacc/mail/spring/XMLMailFactoryBeanTest.java b/src/test/java/com/ozacc/mail/spring/XMLMailFactoryBeanTest.java
index 48a3630..4d5031d 100755 (executable)
--- a/src/test/java/com/ozacc/mail/spring/XMLMailFactoryBeanTest.java
+++ b/src/test/java/com/ozacc/mail/spring/XMLMailFactoryBeanTest.java
@@ -51,7 +51,7 @@ public class XMLMailFactoryBeanTest extends TestCase {
                mail.addBcc("ccb@example.com");\r
 \r
                ApplicationContext context = new FileSystemXmlApplicationContext(\r
-                               "src/test/com/ozacc/mail/spring/testContext.xml");\r
+                               "src/test/java/com/ozacc/mail/spring/testContext.xml");\r
                Mail result = (Mail)context.getBean("mail");\r
 \r
                assertFalse(EqualityCheck.equals(mail, result));\r
@@ -60,7 +60,7 @@ public class XMLMailFactoryBeanTest extends TestCase {
 \r
        public void testMailFactoryBeanClassPath() throws Exception {\r
                ApplicationContext context = new FileSystemXmlApplicationContext(\r
-                               "src/test/com/ozacc/mail/spring/testContext.xml");\r
+                               "src/test/java/com/ozacc/mail/spring/testContext.xml");\r
                Mail result = (Mail)context.getBean("mail");\r
 \r
                assertTrue(EqualityCheck.equals(mail, result));\r
@@ -68,7 +68,7 @@ public class XMLMailFactoryBeanTest extends TestCase {
 \r
        public void testMailFactoryBeanFilePath() throws Exception {\r
                ApplicationContext context = new FileSystemXmlApplicationContext(\r
-                               "src/test/com/ozacc/mail/spring/testContext.xml");\r
+                               "src/test/java/com/ozacc/mail/spring/testContext.xml");\r
                Mail result = (Mail)context.getBean("mail2");\r
 \r
                assertTrue(EqualityCheck.equals(mail, result));\r
@@ -76,7 +76,7 @@ public class XMLMailFactoryBeanTest extends TestCase {
 \r
        public void testMailFactoryBeanLocation() throws Exception {\r
                ApplicationContext context = new FileSystemXmlApplicationContext(\r
-                               "src/test/com/ozacc/mail/spring/testContext.xml");\r
+                               "src/test/java/com/ozacc/mail/spring/testContext.xml");\r
                Mail result = (Mail)context.getBean("mail3");\r
 \r
                assertTrue(EqualityCheck.equals(mail, result));\r
@@ -84,7 +84,7 @@ public class XMLMailFactoryBeanTest extends TestCase {
 \r
        public void testMailFactoryBeanLocationClasspath() throws Exception {\r
                ApplicationContext context = new FileSystemXmlApplicationContext(\r
-                               "src/test/com/ozacc/mail/spring/testContext.xml");\r
+                               "src/test/java/com/ozacc/mail/spring/testContext.xml");\r
                Mail result = (Mail)context.getBean("mail4");\r
 \r
                assertTrue(EqualityCheck.equals(mail, result));\r

diff --git a/src/test/java/com/ozacc/mail/spring/testContext.xml b/src/test/java/com/ozacc/mail/spring/testContext.xml
index d4ce8dc..e5b50c1 100755 (executable)
--- a/src/test/java/com/ozacc/mail/spring/testContext.xml
+++ b/src/test/java/com/ozacc/mail/spring/testContext.xml
@@ -9,12 +9,12 @@
        </bean>\r
        <bean id="mail2" class="com.ozacc.mail.spring.XMLMailFactoryBean">\r
                <property name="filePath">\r
-                       <value>src/test/com/ozacc/mail/test-mail1.xml</value>\r
+                       <value>src/test/java/com/ozacc/mail/test-mail1.xml</value>\r
                </property>\r
        </bean>\r
        <bean id="mail3" class="com.ozacc.mail.spring.XMLMailFactoryBean">\r
                <property name="location">\r
-                       <value>file:src/test/com/ozacc/mail/test-mail1.xml</value>\r
+                       <value>file:src/test/java/com/ozacc/mail/test-mail1.xml</value>\r
                </property>\r
        </bean>\r
        <bean id="mail4" class="com.ozacc.mail.spring.XMLMailFactoryBean">\r