Remove unnecessary Builder and fix merge issue. Fixes #520

This commit is contained in:
Marcos Nils
2014-02-01 20:50:36 -03:00
parent bd19193cb6
commit 4b53160a74
4 changed files with 7 additions and 26 deletions

View File

@@ -145,9 +145,9 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
@Test
public void pubSubNumSub(){
final Map<String, Long> expectedNumSub = new HashMap<String, Long>();
expectedNumSub.put("testchannel2", 1l);
expectedNumSub.put("testchannel1", 1l);
final Map<String, String> expectedNumSub = new HashMap<String, String>();
expectedNumSub.put("testchannel2", "1");
expectedNumSub.put("testchannel1", "1");
jedis.subscribe(new JedisPubSub() {
private int count=0;
@Override
@@ -159,7 +159,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
count++;
if (count == 2) {
Jedis otherJedis = createJedis();
Map<String, Long> numSub = otherJedis.pubSubNumSub("testchannel1", "testchannel2");
Map<String, String> numSub = otherJedis.pubSubNumSub("testchannel1", "testchannel2");
assertEquals(expectedNumSub, numSub);
unsubscribe();
}