--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sample/merge/Merge.java	Sun Oct 22 15:32:23 2006 +0900
@@ -0,0 +1,8 @@
+package sample.merge;
+
+public class Merge {
+
+	public int add(int i, int j) {
+		return i+j;
+	}
+}

--- a/src/sample/merge/MergeTest.java	Sun Oct 22 15:31:48 2006 +0900
+++ b/src/sample/merge/MergeTest.java	Sun Oct 22 15:32:23 2006 +0900
@@ -1,13 +1,17 @@
 package sample.merge;
 
-public class MergeTest {
+import junit.framework.TestCase;
 
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
+public class MergeTest extends TestCase {
+	
+	private Merge merge;
 
+	protected void setUp() throws Exception {
+		merge = new Merge();
+		super.setUp();
 	}
 
+	public void testAdd() {
+		assertEquals("hoge", merge.add(1, 1), 2);
+	}
 }