From fe84be33403acf900efd8464cfeafddb6ec18867 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 25 Jun 2015 13:48:17 +0000
Subject: [PATCH] CCM NG: Current status, some work on UserRepository Test

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3503 8810af33-2d31-482b-a856-94f89814c4df
---
 .../org/libreccm/core/UserRepositoryTest.java  |  4 ++--
 .../libreccm/core/UserRepositoryTest/data.json | 18 ------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/ccm-core/src/test/java/org/libreccm/core/UserRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/UserRepositoryTest.java
index 4a0e6c7ec..e0d2bb2d8 100644
--- a/ccm-core/src/test/java/org/libreccm/core/UserRepositoryTest.java
+++ b/ccm-core/src/test/java/org/libreccm/core/UserRepositoryTest.java
@@ -176,8 +176,8 @@ public class UserRepositoryTest {
         assertThat(joe.getName().getGivenName(), is(equalTo("Joe")));
         assertThat(joe.getHashAlgorithm(), is(equalTo("SHA-512")));
         assertThat(joe.getPassword(), is(equalTo(
-                   "axg8ira8fa")));
-        assertThat(joe.getSalt(), is(equalTo("fjiajhigafgapoa")));
+                   "4e39eba7f2927182a532cd8700bf251e58d4b0359fbb832e6af21db7501d7a49e6d8b950e0d4b15b1841af0f786c8edaa0c09ef7f474804254f7e895969d2975")));
+        assertThat(joe.getSalt(), is(equalTo("axg8ira8fa")));
 
         assertThat(nobody, is(nullValue()));
     }
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.json
index 76bb65a10..a3a5b25c5 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.json
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.json
@@ -45,16 +45,10 @@
                     "hash_algorithm": "MD5",
                     "family_name": "Doe",
                     "given_name": "John",
-                    "middle_name": null,
-                    "title_post": null,
-                    "title_pre": null,
                     "password": "604622dc8a888eb093454ebd77ca1675",
-                    "password_answer": null,
-                    "password_question": null,
                     "password_reset_required": false,
                     "salt": "axg8ira8fa",
                     "screen_name": "jdoe",
-                    "sso_login": null,
                     "subject_id": -10
                 },
                 {
@@ -62,16 +56,10 @@
                     "hash_algorithm": "SHA-512",
                     "family_name": "Mustermann",
                     "given_name": "Max",
-                    "middle_name": null,
-                    "title_post": null,
-                    "title_pre": null,
                     "password": "1c9626af429a6291766d15cbfb38689bd8d49450520765973de70aecaf644b7d4fda711266ba9ec8fb6df30c8ab391d40330829aa85adf371bcde6b4c9bc01e6",
-                    "password_answer": null,
-                    "password_question": null,
                     "password_reset_required": false,
                     "salt": "fjiajhigafgapoa",
                     "screen_name": "mmuster",
-                    "sso_login": null,
                     "subject_id": -20
                 },
                 {
@@ -79,16 +67,10 @@
                     "hash_algorithm": "SHA-512",
                     "family_name": "Public",
                     "given_name": "Joe",
-                    "middle_name": null,
-                    "title_post": null,
-                    "title_pre": null,
                     "password": "4e39eba7f2927182a532cd8700bf251e58d4b0359fbb832e6af21db7501d7a49e6d8b950e0d4b15b1841af0f786c8edaa0c09ef7f474804254f7e895969d2975",
-                    "password_answer": null,
-                    "password_question": null,
                     "password_reset_required": false,
                     "salt": "axg8ira8fa",
                     "screen_name": "joe",
-                    "sso_login": null,
                     "subject_id": -30
                 }
             ]