[virtualcommons-svn] commit/foraging: alllee: fixing tests

[Bitbucket <com...@bi...>]

1 new commit in foraging:


https://bitbucket.org/virtualcommons/foraging/changeset/3f6c45f01375/
changeset:   3f6c45f01375
user:        alllee
date:        2012-02-28 03:17:58
summary:     fixing tests
affected #:  2 files

diff -r 8280c7df6ac4fa0c77bb24be1dcaf6cd84bcf58c -r 3f6c45f013754e0efd95406a289432aa2234aa98 src/test/java/edu/asu/commons/foraging/conf/RoundConfigurationTest.java
--- a/src/test/java/edu/asu/commons/foraging/conf/RoundConfigurationTest.java
+++ b/src/test/java/edu/asu/commons/foraging/conf/RoundConfigurationTest.java
@@ -15,7 +15,7 @@
     
     @Before
     public void setUp() {
-        ServerConfiguration serverConfiguration = new ServerConfiguration("configuration/indiana-experiments/2011/vote-punish");
+        ServerConfiguration serverConfiguration = new ServerConfiguration("configuration/iu/2011/vote-punish");
         roundConfiguration = serverConfiguration.getAllParameters().get(4);
     }
 


diff -r 8280c7df6ac4fa0c77bb24be1dcaf6cd84bcf58c -r 3f6c45f013754e0efd95406a289432aa2234aa98 src/test/java/edu/asu/commons/foraging/model/GroupDataModelTest.java
--- a/src/test/java/edu/asu/commons/foraging/model/GroupDataModelTest.java
+++ b/src/test/java/edu/asu/commons/foraging/model/GroupDataModelTest.java
@@ -13,6 +13,7 @@
 import org.junit.Test;
 
 import edu.asu.commons.foraging.conf.RoundConfiguration;
+import edu.asu.commons.foraging.conf.ServerConfiguration;
 import edu.asu.commons.foraging.rules.Strategy;
 import edu.asu.commons.foraging.rules.iu.ForagingStrategy;
 import edu.asu.commons.net.Identifier;
@@ -21,18 +22,16 @@
 public class GroupDataModelTest {
     
     private ServerDataModel serverDataModel;
-    private int numberOfParticipants = 15;
+    private int numberOfGroups = 3;
     
     @Before
     public void setUp() {
         serverDataModel = new ServerDataModel();
-        RoundConfiguration configuration = new RoundConfiguration();
-        configuration.setProperty("clients-per-group", "5");
-        serverDataModel.setRoundConfiguration(configuration);
-        for (int i = 0; i < numberOfParticipants; i++) {
-            serverDataModel.addClient(new ClientData(new Identifier.Mock()));
-        }
-        
+        ServerConfiguration serverConfiguration = new ServerConfiguration("configuration/asu/2011/t1");
+        RoundConfiguration roundConfiguration = serverConfiguration.getAllParameters().get(4);
+        serverDataModel.setRoundConfiguration(roundConfiguration);
+        int numberOfParticipants = roundConfiguration.getClientsPerGroup() * numberOfGroups;
+        addClients(numberOfParticipants);
     }
 
     @Test
@@ -49,9 +48,17 @@
             }
         }
     }
+
+    private void addClients(int numberOfParticipants) {
+        serverDataModel.clear();
+        for (int i = 0; i < numberOfParticipants; i++) {
+            serverDataModel.addClient(new ClientData(new Identifier.Mock()));
+        }
+    }
     
     @Test
     public void testTiebreaker() {
+        addClients(10);
         for (GroupDataModel group: serverDataModel.getGroups()) {
             List<ForagingStrategy> rules = Arrays.asList(ForagingStrategy.values());
             // add some more randomness into the mix.
@@ -68,6 +75,7 @@
             Map<ForagingStrategy, Integer> votingResults = group.generateVotingResults();
             assertEquals("There should be 3 rules voted on, total" + votingResults, 3, votingResults.size());
             for (ForagingStrategy tieBreaker: tieBreakerRules) {
+                System.err.println("Inspecting tiebreaker: " + tieBreaker);
             	assertEquals(2, votingResults.get(tieBreaker).intValue()); 
             }
             assertTrue(tieBreakerRules.contains(group.getSelectedRule()));
@@ -76,16 +84,16 @@
     
     @Test
     public void testImposedStrategyDistribution() {
-    	int numberOfGroups = numberOfParticipants / serverDataModel.getRoundConfiguration().getClientsPerGroup();
     	Map<Strategy, Integer> imposedStrategyDistribution = new HashMap<Strategy, Integer>();
     	// test all the same
     	for (ForagingStrategy strategy: ForagingStrategy.values()) {
-    		imposedStrategyDistribution.put(strategy, numberOfGroups);
-    		serverDataModel.allocateImposedStrategyDistribution(imposedStrategyDistribution);
-    		for (GroupDataModel group: serverDataModel.getGroups()) {
-    			assertEquals("mismatched imposed strategies", strategy, group.getImposedStrategy());
-    		}
-    	}
+            imposedStrategyDistribution.clear();
+            imposedStrategyDistribution.put(strategy, numberOfGroups);
+            serverDataModel.allocateImposedStrategyDistribution(imposedStrategyDistribution);
+            for (GroupDataModel group: serverDataModel.getGroups()) {
+                assertEquals("mismatched imposed strategies", strategy, group.getImposedStrategy());
+            }
+        }
     	
     }

Repository URL: https://bitbucket.org/virtualcommons/foraging/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.