diff --git a/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java b/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java
index a571337..e2a6a9d 100644
--- a/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java
+++ b/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java
@@ -11,19 +11,19 @@
 public class UserRepository {
     private final HashMap<String, User> userMap = new HashMap<>();
 
-    public User addUser(String userId, String password) {
+    public User addUser(String userId, String password) {//アカウント新規作成時追加
         User u = new User(userId, password);
         userMap.put(userId, u);
         return u;
     }
 
-    public User addUser(String userId, String name, String password, String email, String icon) {
+    public User addUser(String userId, String name, String password, String email, String icon) {//アカウント追加
         User u = new User(userId, name, password, email, icon);
         userMap.put(userId, u);
         return u;
     }
 
-    public User getUser(String userId) {
+    public User getUser(String userId) {//ユーザー情報取得
         return userMap.get(userId);
     }
 
@@ -42,8 +42,11 @@
         return user.getFriendPairs();
     }
 
-    public void deleteFriendPair(String userId, FriendPair pair) {
+    public boolean deleteFriendPair(String userId, FriendPair pair) {
         User user = getUser(userId);
-        user.getFriendPairs().remove(pair);
+        if (user == null) return false;
+        if (pair == null) return false;
+        boolean result =  user.getFriendPairs().remove(pair);
+        return result;
     }
-}
+}
\ No newline at end of file
diff --git a/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java b/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java
index 08c3f3b..0b61740 100644
--- a/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java
+++ b/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java
@@ -5,6 +5,10 @@
 import org.ntlab.tampoposerver.models.User;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.util.ArrayList;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 @SpringBootTest
 public class UserRepositoryTest {
     @Test
@@ -19,12 +23,39 @@
 //        u = userRepository.getUser("u02");
 //        assertNull(u);
 //        User user = userRepository.addPairId("u01", 2);
+        //usersのfriend(add.get.delete)テスト
         User u1 = userRepository.addUser("u01", "asdf", "xyz","asdf@gmail.com","123a876bca878de3");
         User u2 = userRepository.addUser("u02", "zcv", "abc","dfgdf@gmail.com","123a876bca878d125");
+        User u3 = userRepository.addUser("u03", "jkl", "jkl","dfgdrgsf@gmail.com","123a876897878d125");
         FriendPair pair = new FriendPair(1, "u01", "u02");
+        FriendPair pair2 = new FriendPair(2, "u01", "u03");
         userRepository.addFriendPair("u01", pair);
         userRepository.addFriendPair("u02", pair);
-        System.out.println(userRepository.getFriendPairs("u01").get(0).getUser1Id());
-        System.out.println(userRepository.getFriendPairs("u02").get(0).getUser0Id());
+        userRepository.addFriendPair("u01", pair2);
+        userRepository.addFriendPair("u03", pair2);
+        ArrayList<FriendPair> u01FriendPairs = userRepository.getFriendPairs("u01");
+        for (FriendPair fp : u01FriendPairs) {
+            System.out.println(fp.getUser1Id());
+        }
+        assertEquals(2, u01FriendPairs.size());//数が正しいか判定
+        ArrayList<FriendPair> u02FriendPairs = userRepository.getFriendPairs("u02");
+        for (FriendPair fp : u02FriendPairs) {
+            System.out.println(fp.getUser1Id());
+        }
+        assertEquals(1, u02FriendPairs.size());
+
+//        System.out.println(userRepository.getFriendPairs("u01").get(1).getUser1Id());
+//        System.out.println(userRepository.getFriendPairs("u02").get(0).getUser1Id());
+        userRepository.deleteFriendPair("u01", pair2);
+        u01FriendPairs = userRepository.getFriendPairs("u01");
+        for (FriendPair fp : u01FriendPairs) {
+            System.out.println(fp.getUser1Id());
+        }
+        assertEquals(1, u01FriendPairs.size());
+        u02FriendPairs = userRepository.getFriendPairs("u02");
+        for (FriendPair fp : u02FriendPairs) {
+            System.out.println(fp.getUser1Id());
+        }
+        assertEquals(1, u02FriendPairs.size());
     }
 }
\ No newline at end of file