From: Iwao AVE! <harawata@gmail.com>
Date: Tue, 15 Nov 2011 14:28:28 +0000 (+0900)
Subject: 変更後のディレクトリ構成に合わせてテストケース内のパスを変更
X-Git-Tag: ozacc-mail-1.2.3~15
X-Git-Url: http://git.sourceforge.jp/view?p=spring-ext%2Fozacc-mail.git;a=commitdiff_plain;h=e7ee08bccd1ff5fb1b3c55eea7124464827f5c13

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

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
--- 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 {
 	 * 存在しないファイルを指定して失敗
 	 */
 	public final void testBuildMailFromFileNotExist() throws Exception {
-		String path = "src/test/com/ozacc/mail/testtest-mail1.xml";
+		String path = "src/test/java/com/ozacc/mail/testtest-mail1.xml";
 		File file = new File(path);
 		try {
 			Mail result = builder.buildMail(file);
@@ -138,7 +138,7 @@ public class JDomXMLMailBuilderTest extends TestCase {
 	 * XMLファイルのFileインスタンスからMailインスタンスを生成。
 	 */
 	public final void testBuildMailFromFile() throws Exception {
-		String path = "src/test/com/ozacc/mail/test-mail1.xml";
+		String path = "src/test/java/com/ozacc/mail/test-mail1.xml";
 		File file = new File(path);
 
 		String subject = "XMLMailBuilderのテストケース";
@@ -215,7 +215,7 @@ public class JDomXMLMailBuilderTest extends TestCase {
 	 * Class under test for Mail buildMail(File, VelocityContext)
 	 */
 	public final void testBuildMailFileVelocityContext() throws Exception {
-		String path = "src/test/com/ozacc/mail/test-mail3-velocity.xml";
+		String path = "src/test/java/com/ozacc/mail/test-mail3-velocity.xml";
 		File file = new File(path);
 
 		String name = "伊東美咲";
@@ -244,7 +244,7 @@ public class JDomXMLMailBuilderTest extends TestCase {
 	}
 
 	public void testBuildMailFromMultipleMailsTemplate() throws Exception {
-		String path = "src/test/com/ozacc/mail/test-mail7-multiple.xml";
+		String path = "src/test/java/com/ozacc/mail/test-mail7-multiple.xml";
 		File file = new File(path);
 
 		Mail result1 = builder.buildMail(file, "first");
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
--- 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);
 	 mail.addTo(email);
 
-	 File image1 = new File("src/test/com/ozacc/mail/image1.jpg");
+	 File image1 = new File("src/test/java/com/ozacc/mail/image1.jpg");
 	 FileInputStream fis = new FileInputStream(image1);
 
 	 mail.addFile(fis, "野菜画像.jpg");
@@ -85,8 +85,8 @@ public class SendMailImplRealTest extends TestCase {
 	 Mail mail = builder.buildMail(classPath);
 	 mail.addTo(email);
 
-	 File image1 = new File("src/test/com/ozacc/mail/image1.jpg");
-	 File image2 = new File("src/test/com/ozacc/mail/image2.png");
+	 File image1 = new File("src/test/java/com/ozacc/mail/image1.jpg");
+	 File image2 = new File("src/test/java/com/ozacc/mail/image2.png");
 
 	 mail.addFile(image1);
 	 mail.addFile(image2, "野菜画像.png");
@@ -121,7 +121,7 @@ public class SendMailImplRealTest extends TestCase {
 	 mail.setHtmlText(mail.getText());
 	 mail.setText("プレーンテキスト");
 
-	 File image1 = new File("src/test/com/ozacc/mail/image1.jpg");
+	 File image1 = new File("src/test/java/com/ozacc/mail/image1.jpg");
 	 mail.addFile(image1);
 
 	 sendMail.send(mail);
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
--- 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);
 	 mail.addTo(email);
 
-	 File image1 = new File("src/test/com/ozacc/mail/image1.jpg");
+	 File image1 = new File("src/test/java/com/ozacc/mail/image1.jpg");
 	 FileInputStream fis = new FileInputStream(image1);
 
 	 mail.addFile(fis, "野菜画像.jpg");
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
--- 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 {
 	}
 
 	public final void testBuildMultipartMailFromFile() throws Exception {
-		String path = "src/test/com/ozacc/mail/test-mail1.xml";
+		String path = "src/test/java/com/ozacc/mail/test-mail1.xml";
 		File file = new File(path);
 
 		String subject = "XMLMailBuilderのテストケース";
@@ -149,7 +149,7 @@ public class XMLMailBuilderImplTest extends TestCase {
 	 * Class under test for Mail buildMail(File)
 	 */
 	public final void testBuildMailFile() throws Exception {
-		String path = "src/test/com/ozacc/mail/test-mail1.xml";
+		String path = "src/test/java/com/ozacc/mail/test-mail1.xml";
 		File file = new File(path);
 
 		String subject = "XMLMailBuilderのテストケース";
@@ -192,7 +192,7 @@ public class XMLMailBuilderImplTest extends TestCase {
 	}
 
 	public void testBuildMailFromMultipleMailsTemplate() throws Exception {
-		String path = "src/test/com/ozacc/mail/test-mail7-multiple.xml";
+		String path = "src/test/java/com/ozacc/mail/test-mail7-multiple.xml";
 		File file = new File(path);
 
 		Mail result1 = builder.buildMail(file, "first");
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
--- 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 {
 	}
 
 	public void testBuildMailFromFile() throws Exception {
-		String path = "src/test/com/ozacc/mail/test-mail3-velocity.xml";
+		String path = "src/test/java/com/ozacc/mail/test-mail3-velocity.xml";
 		File file = new File(path);
 
 		String name = "伊東美咲";
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
--- 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");
 
 		ApplicationContext context = new FileSystemXmlApplicationContext(
-				"src/test/com/ozacc/mail/spring/testContext.xml");
+				"src/test/java/com/ozacc/mail/spring/testContext.xml");
 		Mail result = (Mail)context.getBean("mail");
 
 		assertFalse(EqualityCheck.equals(mail, result));
@@ -60,7 +60,7 @@ public class XMLMailFactoryBeanTest extends TestCase {
 
 	public void testMailFactoryBeanClassPath() throws Exception {
 		ApplicationContext context = new FileSystemXmlApplicationContext(
-				"src/test/com/ozacc/mail/spring/testContext.xml");
+				"src/test/java/com/ozacc/mail/spring/testContext.xml");
 		Mail result = (Mail)context.getBean("mail");
 
 		assertTrue(EqualityCheck.equals(mail, result));
@@ -68,7 +68,7 @@ public class XMLMailFactoryBeanTest extends TestCase {
 
 	public void testMailFactoryBeanFilePath() throws Exception {
 		ApplicationContext context = new FileSystemXmlApplicationContext(
-				"src/test/com/ozacc/mail/spring/testContext.xml");
+				"src/test/java/com/ozacc/mail/spring/testContext.xml");
 		Mail result = (Mail)context.getBean("mail2");
 
 		assertTrue(EqualityCheck.equals(mail, result));
@@ -76,7 +76,7 @@ public class XMLMailFactoryBeanTest extends TestCase {
 
 	public void testMailFactoryBeanLocation() throws Exception {
 		ApplicationContext context = new FileSystemXmlApplicationContext(
-				"src/test/com/ozacc/mail/spring/testContext.xml");
+				"src/test/java/com/ozacc/mail/spring/testContext.xml");
 		Mail result = (Mail)context.getBean("mail3");
 
 		assertTrue(EqualityCheck.equals(mail, result));
@@ -84,7 +84,7 @@ public class XMLMailFactoryBeanTest extends TestCase {
 
 	public void testMailFactoryBeanLocationClasspath() throws Exception {
 		ApplicationContext context = new FileSystemXmlApplicationContext(
-				"src/test/com/ozacc/mail/spring/testContext.xml");
+				"src/test/java/com/ozacc/mail/spring/testContext.xml");
 		Mail result = (Mail)context.getBean("mail4");
 
 		assertTrue(EqualityCheck.equals(mail, result));
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
--- 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>
 	<bean id="mail2" class="com.ozacc.mail.spring.XMLMailFactoryBean">
 		<property name="filePath">
-			<value>src/test/com/ozacc/mail/test-mail1.xml</value>
+			<value>src/test/java/com/ozacc/mail/test-mail1.xml</value>
 		</property>
 	</bean>
 	<bean id="mail3" class="com.ozacc.mail.spring.XMLMailFactoryBean">
 		<property name="location">
-			<value>file:src/test/com/ozacc/mail/test-mail1.xml</value>
+			<value>file:src/test/java/com/ozacc/mail/test-mail1.xml</value>
 		</property>
 	</bean>
 	<bean id="mail4" class="com.ozacc.mail.spring.XMLMailFactoryBean">