Permalink
Browse files

changed FCTest to use SHARED_LOOPBACK instead of Simulator

  • Loading branch information...
Bela Ban
Bela Ban committed Apr 12, 2011
1 parent b8b6c07 commit 6dac307ca026abe1cf569c836627c7b6320bf0a6
Showing with 26 additions and 39 deletions.
  1. +26 −39 tests/junit-functional/org/jgroups/tests/FCTest.java
@@ -2,26 +2,23 @@
package org.jgroups.tests;
import org.jgroups.*;
-import org.jgroups.debug.Simulator;
-import org.jgroups.protocols.FC;
-import org.jgroups.protocols.FRAG2;
-import org.jgroups.stack.IpAddress;
-import org.jgroups.stack.Protocol;
+import org.jgroups.protocols.*;
+import org.jgroups.protocols.pbcast.GMS;
+import org.jgroups.protocols.pbcast.NAKACK;
+import org.jgroups.protocols.pbcast.STABLE;
import org.jgroups.util.Util;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import java.util.Vector;
-
/**
* Tests the flow control (FC) protocol
* @author Bela Ban
*/
@Test(groups=Global.FUNCTIONAL,sequential=true)
public class FCTest {
- Simulator s=null;
+ JChannel ch;
static final int SIZE=1000; // bytes
static final int NUM_MSGS=100000;
static final int PRINT=NUM_MSGS / 10;
@@ -30,48 +27,38 @@
@BeforeMethod
void setUp() throws Exception {
- IpAddress a1=new IpAddress(1111);
- Vector<Address> members=new Vector<Address>();
- members.add(a1);
- View v=new View(a1, 1, members);
- s=new Simulator();
- s.setLocalAddress(a1);
- s.setView(v);
- s.addMember(a1);
- FC fc=new FC();
- fc.setMinCredits(1000);
- fc.setMaxCredits(10000);
- fc.setMaxBlockTime(1000);
- FRAG2 frag=new FRAG2();
- frag.setFragSize(8000);
- Protocol[] stack=new Protocol[]{frag, fc};
- s.setProtocolStack(stack);
- s.start();
+ ch=Util.createChannel(new SHARED_LOOPBACK().setValue("thread_pool_rejection_policy", "run").setValue("loopback", true),
+ new PING(),
+ new NAKACK().setValue("use_mcast_xmit", false),
+ new UNICAST2(),
+ new STABLE().setValue("max_bytes", 50000),
+ new GMS().setValue("print_local_addr", false),
+ new FC().setValue("min_credits", 1000).setValue("max_credits", 10000).setValue("max_block_time", 1000),
+ new FRAG2());
+ ch.connect("FCTest");
}
@AfterMethod
void tearDown() throws Exception {
- s.stop();
+ Util.close(ch);
}
- @Test(groups=Global.FUNCTIONAL)
- public void testReceptionOfAllMessages() {
+ public void testReceptionOfAllMessages() throws ChannelNotConnectedException, ChannelClosedException {
int num_received=0;
Receiver r=new Receiver();
- s.setReceiver(r);
+ ch.setReceiver(r);
for(int i=1; i <= NUM_MSGS; i++) {
Message msg=new Message(null, null, createPayload(SIZE));
- Event evt=new Event(Event.MSG, msg);
- s.send(evt);
+ ch.send(msg);
if(i % PRINT == 0)
System.out.println("==> " + i);
}
int num_tries=10;
while(num_tries > 0) {
Util.sleep(1000);
num_received=r.getNumberOfReceivedMessages();
- System.out.println("-- num received=" + num_received + ", stats:\n" + s.dumpStats());
+ System.out.println("-- num received=" + num_received);
if(num_received >= NUM_MSGS)
break;
num_tries--;
@@ -81,6 +68,8 @@ public void testReceptionOfAllMessages() {
+
+
private static byte[] createPayload(int size) {
byte[] retval=new byte[size];
for(int i=0; i < size; i++)
@@ -89,15 +78,13 @@ public void testReceptionOfAllMessages() {
}
- static class Receiver implements Simulator.Receiver {
+ static class Receiver extends ReceiverAdapter {
int num_mgs_received=0;
- public void receive(Event evt) {
- if(evt.getType() == Event.MSG) {
- num_mgs_received++;
- if(num_mgs_received % PRINT == 0)
- System.out.println("<== " + num_mgs_received);
- }
+ public void receive(Message msg) {
+ num_mgs_received++;
+ if(num_mgs_received % PRINT == 0)
+ System.out.println("<== " + num_mgs_received);
}
public int getNumberOfReceivedMessages() {

0 comments on commit 6dac307

Please sign in to comment.