diff --git a/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java b/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java
index e2a6a9d..1450b1e 100644
--- a/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java
+++ b/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java
@@ -27,22 +27,30 @@
         return userMap.get(userId);
     }
 
-    public User deleteUser(String userId) {
+    public ArrayList<User> getAllUsers() {
+        ArrayList<User> u = new ArrayList<>();
+        for (String key : userMap.keySet()) {
+            u.add(userMap.get(key));
+        }
+        return u;
+    }
+
+    public User deleteUser(String userId) {//ユーザー情報の削除
         return userMap.remove(userId);
     }
 
-    public User addFriendPair(String userId, FriendPair pair) {
+    public User addFriendPair(String userId, FriendPair pair) {//ユーザー側のフレンドペア追加
         User user = getUser(userId);
         user.getFriendPairs().add(pair);
         return user;
     }
 
-    public ArrayList<FriendPair> getFriendPairs(String userId) {
+    public ArrayList<FriendPair> getFriendPairs(String userId) {//ユーザー側のフレンドペアの取得
         User user = getUser(userId);
         return user.getFriendPairs();
     }
 
-    public boolean deleteFriendPair(String userId, FriendPair pair) {
+    public boolean deleteFriendPair(String userId, FriendPair pair) {//ユーザー側のフレンドペアの削除
         User user = getUser(userId);
         if (user == null) return false;
         if (pair == null) return false;
diff --git a/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java b/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java
index 0b61740..6ac9843 100644
--- a/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java
+++ b/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java
@@ -14,9 +14,16 @@
     @Test
     void contextLoads() {
        UserRepository userRepository = new UserRepository();
-//        User u1 = userRepository.addUser("u01", "asdf", "xyz","asdf@gmail.com","123a876bca878de3");
-//        User u2 = userRepository.addUser("u02", "zcv", "abc","dfgdf@gmail.com","123a876bca878d125");
+        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", "ghj", "yyi","yijdh@gmail.com","143a876bca878d125");
 //        User u = userRepository.getUser("u02");
+        //getAllUsersテスト
+        ArrayList<User> users = userRepository.getAllUsers();
+        for (User u : users) {
+            System.out.println(u.getUserId());
+        }
+//        System.out.println(users);
 //        assertEquals(u2, u);
 //        assertNotEquals(u1, u);
 //        userRepository.deleteUser("u02");
@@ -24,38 +31,37 @@
 //        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);
-        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());
+//        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("u01", "u02");
+//        FriendPair pair2 = new FriendPair("u01", "u03");
+//        userRepository.addFriendPair("u01", pair);
+//        userRepository.addFriendPair("u02", pair);
+//        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