#354 Fixed CheckStyle Issues
This commit is contained in:
@ -5,6 +5,6 @@ import com.iluwatar.featuretoggle.user.User;
|
||||
|
||||
public interface Service {
|
||||
|
||||
String getWelcomeMessage(User user);
|
||||
String getWelcomeMessage(User user);
|
||||
|
||||
}
|
||||
|
@ -6,13 +6,13 @@ import com.iluwatar.featuretoggle.user.UserGroup;
|
||||
|
||||
public class TieredFeatureToggleVersion implements Service {
|
||||
|
||||
@Override
|
||||
public String getWelcomeMessage(User user) {
|
||||
if(UserGroup.isPaid(user)){
|
||||
return "You're amazing " + user.getName() + ". Thanks for paying for this awesome software.";
|
||||
}
|
||||
|
||||
return "I suppose you can use this software.";
|
||||
@Override
|
||||
public String getWelcomeMessage(User user) {
|
||||
if (UserGroup.isPaid(user)) {
|
||||
return "You're amazing " + user.getName() + ". Thanks for paying for this awesome software.";
|
||||
}
|
||||
|
||||
return "I suppose you can use this software.";
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -2,13 +2,13 @@ package com.iluwatar.featuretoggle.user;
|
||||
|
||||
public class User {
|
||||
|
||||
private String name;
|
||||
private String name;
|
||||
|
||||
public User(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
public User(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
@ -3,32 +3,43 @@ package com.iluwatar.featuretoggle.user;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Contains the lists of users of different groups paid and free
|
||||
*/
|
||||
public class UserGroup {
|
||||
|
||||
private static List<User> freeGroup = new ArrayList<>();
|
||||
private static List<User> paidGroup = new ArrayList<>();
|
||||
private static List<User> freeGroup = new ArrayList<>();
|
||||
private static List<User> paidGroup = new ArrayList<>();
|
||||
|
||||
public static void addUserToFreeGroup(final User user){
|
||||
if(paidGroup.contains(user)){
|
||||
throw new IllegalArgumentException("User all ready member of paid group.");
|
||||
}else{
|
||||
if(!freeGroup.contains(user)){
|
||||
freeGroup.add(user);
|
||||
}
|
||||
}
|
||||
/**
|
||||
*
|
||||
* @param user {@link User} to be added to the free group
|
||||
*/
|
||||
public static void addUserToFreeGroup(final User user) {
|
||||
if (paidGroup.contains(user)) {
|
||||
throw new IllegalArgumentException("User all ready member of paid group.");
|
||||
} else {
|
||||
if (!freeGroup.contains(user)) {
|
||||
freeGroup.add(user);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void addUserToPaidGroup(final User user){
|
||||
if(freeGroup.contains(user)){
|
||||
throw new IllegalArgumentException("User all ready member of free group.");
|
||||
}else{
|
||||
if(!paidGroup.contains(user)){
|
||||
paidGroup.add(user);
|
||||
}
|
||||
}
|
||||
/**
|
||||
*
|
||||
* @param user {@link User} to be added to the paid group
|
||||
*/
|
||||
public static void addUserToPaidGroup(final User user) {
|
||||
if (freeGroup.contains(user)) {
|
||||
throw new IllegalArgumentException("User all ready member of free group.");
|
||||
} else {
|
||||
if (!paidGroup.contains(user)) {
|
||||
paidGroup.add(user);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isPaid(User user) {
|
||||
return paidGroup.contains(user);
|
||||
}
|
||||
public static boolean isPaid(User user) {
|
||||
return paidGroup.contains(user);
|
||||
}
|
||||
}
|
||||
|
@ -6,31 +6,31 @@ import com.iluwatar.featuretoggle.user.UserGroup;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
public class TieredFeatureToggleVersionTest {
|
||||
|
||||
final User paidUser = new User("Jamie Coder");
|
||||
final User freeUser = new User("Alan Defect");
|
||||
final Service service = new TieredFeatureToggleVersion();
|
||||
final User paidUser = new User("Jamie Coder");
|
||||
final User freeUser = new User("Alan Defect");
|
||||
final Service service = new TieredFeatureToggleVersion();
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
UserGroup.addUserToPaidGroup(paidUser);
|
||||
UserGroup.addUserToFreeGroup(freeUser);
|
||||
}
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
UserGroup.addUserToPaidGroup(paidUser);
|
||||
UserGroup.addUserToFreeGroup(freeUser);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetWelcomeMessageForPaidUser() throws Exception {
|
||||
final String welcomeMessage = service.getWelcomeMessage(paidUser);
|
||||
final String expected = "You're amazing Jamie Coder. Thanks for paying for this awesome software.";
|
||||
assertEquals(expected,welcomeMessage);
|
||||
}
|
||||
@Test
|
||||
public void testGetWelcomeMessageForPaidUser() throws Exception {
|
||||
final String welcomeMessage = service.getWelcomeMessage(paidUser);
|
||||
final String expected = "You're amazing Jamie Coder. Thanks for paying for this awesome software.";
|
||||
assertEquals(expected, welcomeMessage);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetWelcomeMessageForFreeUser() throws Exception {
|
||||
final String welcomeMessage = service.getWelcomeMessage(freeUser);
|
||||
final String expected = "I suppose you can use this software.";
|
||||
assertEquals(expected,welcomeMessage);
|
||||
}
|
||||
@Test
|
||||
public void testGetWelcomeMessageForFreeUser() throws Exception {
|
||||
final String welcomeMessage = service.getWelcomeMessage(freeUser);
|
||||
final String expected = "I suppose you can use this software.";
|
||||
assertEquals(expected, welcomeMessage);
|
||||
}
|
||||
}
|
@ -7,31 +7,31 @@ import static org.junit.Assert.assertTrue;
|
||||
|
||||
public class UserGroupTest {
|
||||
|
||||
@Test
|
||||
public void testAddUserToFreeGroup() throws Exception {
|
||||
User user = new User("Free User");
|
||||
UserGroup.addUserToFreeGroup(user);
|
||||
assertFalse(UserGroup.isPaid(user));
|
||||
}
|
||||
@Test
|
||||
public void testAddUserToFreeGroup() throws Exception {
|
||||
User user = new User("Free User");
|
||||
UserGroup.addUserToFreeGroup(user);
|
||||
assertFalse(UserGroup.isPaid(user));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddUserToPaidGroup() throws Exception {
|
||||
User user = new User("Paid User");
|
||||
UserGroup.addUserToPaidGroup(user);
|
||||
assertTrue(UserGroup.isPaid(user));
|
||||
}
|
||||
@Test
|
||||
public void testAddUserToPaidGroup() throws Exception {
|
||||
User user = new User("Paid User");
|
||||
UserGroup.addUserToPaidGroup(user);
|
||||
assertTrue(UserGroup.isPaid(user));
|
||||
}
|
||||
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void testAddUserToPaidWhenOnFree() throws Exception {
|
||||
User user = new User("Paid User");
|
||||
UserGroup.addUserToFreeGroup(user);
|
||||
UserGroup.addUserToPaidGroup(user);
|
||||
}
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void testAddUserToPaidWhenOnFree() throws Exception {
|
||||
User user = new User("Paid User");
|
||||
UserGroup.addUserToFreeGroup(user);
|
||||
UserGroup.addUserToPaidGroup(user);
|
||||
}
|
||||
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void testAddUserToFreeWhenOnPaid() throws Exception {
|
||||
User user = new User("Free User");
|
||||
UserGroup.addUserToPaidGroup(user);
|
||||
UserGroup.addUserToFreeGroup(user);
|
||||
}
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void testAddUserToFreeWhenOnPaid() throws Exception {
|
||||
User user = new User("Free User");
|
||||
UserGroup.addUserToPaidGroup(user);
|
||||
UserGroup.addUserToFreeGroup(user);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user