Fixed test

src/main/resources/languages/default/general.properties

@@ -1,36 +1,66 @@
+# Must be one word.
 command.create=create
+# Must be one word.
 command.rename=rename
+# Must be one word.
 command.leave=leave
+# Must be one word.
 command.invite=invite
+# Must be one word.
 command.list=list
+# Must be one word.
 command.profile=profile
+# Must be one word.
 command.join=join
+# Must be one word.
 command.fastjoin=fjoin
+# Must be one word.
 command.roster=roster
+# Must be one word.
 command.vote.cancel=cancel
+# Must be one word.
 command.verify=verify
+# Must be one word.
 command.unverify=unverify
+# Must be one word.
 command.untrust=untrust
+# Must be one word.
 command.trust=trust
+# Must be one word.
 command.kick=kick
 
+# Must be one word.
 command.relation.relation=relation
+# Must be one word.
 command.relation.remove=remove
+# Must be one word.
 command.relation.list=list
+# Must be one word.
 command.relation.create=create
 
+# Must be one word.
 command.rank.rank=rank
+# Must be one word.
 command.rank.remove=remove
+# Must be one word.
 command.rank.list=list
+# Must be one word.
 command.rank.create=create
+# Must be one word.
 command.rank.assign=assign
 
+# Must be one word.
 command.home.set=set
+# Must be one word.
 command.home.remove=remove
+# Must be one word.
 command.home.home=home
 
+# Must be one word.
 command.vote.abstain=abstain
+# Must be one word.
 command.vote.accept=accept
+# Must be one word.
 command.vote.deny=deny
 
 argument.society.name-new=newName
@@ -44,15 +74,21 @@ argument.rank.priority=priority
 argument.page=page
 
 society.not-found=Sorry, but seems like you're in no society.
+# {0} is the name of the society
 target-society.not-found=Sorry, but the society {0} could not be found.
 target-society.not-specified=Sorry, but you need to specify a society.
+# {0} is the name of the society
 you.society-left=You successfully left the society {0}
 
+# {0} is the name of the society, {1} is the tag of the society
 society.created=The society {0} with the tag {1} has been created successfully.
 societies.not-found=Sorry, but no societies could have been found.
 
+# {0} is the player, {1} is the name of the society
 you.kicked-member=You've successfully kicked {0} from {1}.
+# {0} is the name of the society
 member.kicked=Sorry, but you've been kicked from the group {0}.
+# {0} is the name of the other player
 member.not-same-group=Sorry, but you you have to be in the same group as {0}.
 
 reload.started=Reload started.
@@ -62,8 +98,11 @@ reload.finished=Reload finished.
 home.not-set=Sorry, but your home is not set yet.
 
 rank.not-found=Sorry, but this rank wasn't found.
+# {0} is the rank
 rank.created="Rank {0} successfully created."
+# {0} is the rank
 rank.removed="Rank {0} successfully removed."
+# {0} is the rank, {1} is the name the player
 rank.assigned="{1} has been assigned to rank {0}."
 
 ranks.not-found=Sorry, but no ranks could have been found.
@@ -72,6 +111,7 @@ relations.not-found=Sorry, but no relations could have been found.
 
 home.teleporting=Teleporting you to your home...
 home.removed=Your home has been successfully removed.
+# {0} is the x component, {1} the y and {2} the z
 home.set=Your society's home has been set to X:{0} Y:{1} Z:{2}
 
 request.voted.deny=You voted to deny.
@@ -80,10 +120,15 @@ request.voted.abstain=You voted to abstain.
 request.none-received="Sorry, but no request received."
 request.none-supplied="Sorry, but there's no request supplied by you."
 request.cancelled-by-you="Request successfully canceled."
+# {0} is the name of the request
 request.cancelled="Request {0} has been cancelled."
+# {0} is the name of the request
 request.started="Request {0} has been started."
+# {0} is the name the player who voted, {1} is the vote result
 request.voted="{0} has been voted {1}."
+# {0} is the name of the request
 request.finished="Request {0} finished."
-
+# {0} is the name the player, {1} is the name of the society
 requests.invite={0} invited you to the society {1}.
+# {0} is the name the player
 requests.join={0} asks to join your society.

src/main/resources/todo

@@ -2,6 +2,7 @@
 - pvp stuff
 - Vitals and some formatting for commands
 - configurable data store
+- Verify states and unnecessary publishes
 
 
 Bukkit dependencies:

src/test/java/net/catharos/societies/database/json/MemberMapperTest.java → src/test/java/net/catharos/societies/database/json/GroupMapperTest.java

@@ -10,7 +10,6 @@
 import net.catharos.groups.rank.Rank;
 import net.catharos.groups.rank.RankFactory;
 import net.catharos.lib.core.uuid.TimeUUIDProvider;
-import net.catharos.societies.member.SocietyMember;
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.junit.Assert;
@@ -20,7 +19,7 @@
 import java.util.UUID;
 
 @RunWith(JukitoRunner.class)
-public class MemberMapperTest {
+public class GroupMapperTest {
 
     public static class Module extends JukitoModule {
         @Override
@@ -38,8 +37,6 @@ protected void configureTest() {
     }
 
     @Inject
-    MemberMapper<SocietyMember> mapper;
-
     GroupMapper groupMapper;
 
     @Inject