Merge commit 'refs/tickets/08/8/3' of https://dev.gitblit.com/r/gitblit

3 files changed, 116 insertions, 0 deletions

diff --git a/src/test/java/com/gitblit/tests/GitBlitSuite.java b/src/test/java/com/gitblit/tests/GitBlitSuite.java
index 81180276..7b38c183 100644
--- a/src/test/java/com/gitblit/tests/GitBlitSuite.java
+++ b/src/test/java/com/gitblit/tests/GitBlitSuite.java
@@ -56,6 +56,7 @@ import com.gitblit.utils.JGitUtils;
 @RunWith(Suite.class)

 @SuiteClasses({ ArrayUtilsTest.class, FileUtilsTest.class, TimeUtilsTest.class,

 		StringUtilsTest.class, Base64Test.class, JsonUtilsTest.class, ByteFormatTest.class,

+		UserModelTest.class, UserChoiceTest.class,

 		ObjectCacheTest.class, PermissionsTest.class, UserServiceTest.class, LdapAuthenticationTest.class,

 		MarkdownUtilsTest.class, JGitUtilsTest.class, SyndicationUtilsTest.class,

 		DiffUtilsTest.class, MetricUtilsTest.class, X509UtilsTest.class,

diff --git a/src/test/java/com/gitblit/tests/UserChoiceTest.java b/src/test/java/com/gitblit/tests/UserChoiceTest.java
new file mode 100644
index 00000000..b0effcd1
--- /dev/null
+++ b/src/test/java/com/gitblit/tests/UserChoiceTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.tests;
+
+import org.junit.Test;
+
+import com.gitblit.models.UserChoice;
+
+/**
+ * Test behavior of UserChoice class.
+ *
+ * @author Alfred Schmid
+ *
+ */
+public class UserChoiceTest extends GitblitUnitTest {
+
+	@Test(expected=IllegalArgumentException.class)
+	public void creatingUserChoiceWithNullAsUserIdIsImpossible() {
+		new UserChoice(null);
+	}
+
+	@Test(expected=IllegalArgumentException.class)
+	public void creatingUserChoiceWithEmptyStringAsUserIdIsImpossible() {
+		new UserChoice("");
+	}
+
+	@Test
+	public void toStringPrintsPlainUserIdWhenDisplayNameIsNull() {
+		String userId = "runnerr";
+		UserChoice userChoice = new UserChoice(userId);
+		assertEquals("", userId, userChoice.toString());
+	}
+
+	@Test
+	public void toStringPrintsPlainUserIdWhenDisplayNameIsEmpty() {
+		String userId = "runnerr";
+		UserChoice userChoice = new UserChoice("", userId);
+		assertEquals("", userId, userChoice.toString());
+	}
+
+	@Test
+	public void toStringPrintsDisplaNameWithUserIdInBracketsWhenDisplayNameIsSet() {
+		String userId = "runnerr";
+		String displayName = "The Road Runner";
+		UserChoice userChoice = new UserChoice(displayName, userId);
+		assertEquals(
+				"displayName + userId have to be concatenated to: displayName (userId)",
+				displayName + " (" + userId + ")", userChoice.toString());
+	}
+}
diff --git a/src/test/java/com/gitblit/tests/UserModelTest.java b/src/test/java/com/gitblit/tests/UserModelTest.java
new file mode 100644
index 00000000..0de02d57
--- /dev/null
+++ b/src/test/java/com/gitblit/tests/UserModelTest.java
@@ -0,0 +1,52 @@
+/*

+ * Copyright 2014 gitblit.com.

+ *

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ *     http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

+package com.gitblit.tests;

+

+import org.junit.Test;

+

+import com.gitblit.models.UserModel;

+

+/**

+ * @author Alfred Schmid

+ *

+ */

+public class UserModelTest extends GitblitUnitTest {

+

+	@Test

+	public void whenDisplayNameIsEmptyUsernameIsUsed() {

+		String username = "test";

+		UserModel userModel = new UserModel(username);

+		userModel.displayName = "";

+		assertEquals("When displayName is empty the username has to be returnd from getDisplayName().", username, userModel.getDisplayName());

+	}

+

+	@Test

+	public void whenDisplayNameIsNullUsernameIsUsed() {

+		String username = "test";

+		UserModel userModel = new UserModel(username);

+		userModel.displayName = null;

+		assertEquals("When displayName is null the username has to be returnd from getDisplayName().", username, userModel.getDisplayName());

+	}

+

+	@Test

+	public void whenDisplayNameIsNotEmptyDisplayNameIsUsed() {

+		String displayName = "Test User";

+		UserModel userModel = new UserModel("test");

+		userModel.displayName = displayName;

+		assertEquals("When displayName is not empty its value has to be returnd from getDisplayName().", displayName, userModel.getDisplayName());

+	}

+

+}