CVS update: JGroups/tests/junit-functional/org/jgroups/tests ConfiguratorTest.java ProtocolConfigurationTest.java InetAddressChecksTest.java

  User: belaban 
  Date: 10/09/15 15:51:10

  Modified:    tests/junit-functional/org/jgroups/tests
                        ConfiguratorTest.java
                        ProtocolConfigurationTest.java
                        InetAddressChecksTest.java
  Log:
  using ProtocolConfiguration instead of Configurator.ProtocolConfiguration
  
  Revision  Changes    Path
  1.15      +3 -2      JGroups/tests/junit-functional/org/jgroups/tests/ConfiguratorTest.java
  
  Index: ConfiguratorTest.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/tests/junit-functional/org/jgroups/tests/ConfiguratorTest.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ConfiguratorTest.java	28 Oct 2009 15:57:21 -0000	1.14
  +++ ConfiguratorTest.java	15 Sep 2010 15:51:09 -0000	1.15
  @@ -2,6 +2,7 @@
   
   import org.jgroups.JChannel;
   import org.jgroups.Global;
  +import org.jgroups.conf.ProtocolConfiguration;
   import org.jgroups.stack.Configurator;
   import org.jgroups.stack.Protocol;
   import org.jgroups.stack.ProtocolStack;
  @@ -15,7 +16,7 @@
   /**
    * Tests ProtocolStack.insertProtocol() and removeProtocol()
    * @author Bela Ban
  - * @version $Id: ConfiguratorTest.java,v 1.14 2009/10/28 15:57:21 belaban Exp $
  + * @version $Id: ConfiguratorTest.java,v 1.15 2010/09/15 15:51:09 belaban Exp $
    */
   @Test(groups=Global.FUNCTIONAL,sequential=true)
   public class ConfiguratorTest {
  @@ -152,7 +153,7 @@
                   "FRAG2(frag_size=60000):" +
                   "pbcast.STREAMING_STATE_TRANSFER(use_reading_thread=true)";
           
  -        Vector<Configurator.ProtocolConfiguration> ret=Configurator.parseConfigurations(config);
  +        Vector<ProtocolConfiguration> ret=Configurator.parseConfigurations(config);
           System.out.println("config:\n" + ret);
           Assert.assertEquals(14, ret.size());
   
  
  
  
  1.7       +2 -3      JGroups/tests/junit-functional/org/jgroups/tests/ProtocolConfigurationTest.java
  
  Index: ProtocolConfigurationTest.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/tests/junit-functional/org/jgroups/tests/ProtocolConfigurationTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ProtocolConfigurationTest.java	26 Oct 2009 14:34:21 -0000	1.6
  +++ ProtocolConfigurationTest.java	15 Sep 2010 15:51:09 -0000	1.7
  @@ -2,11 +2,11 @@
   
   import org.jgroups.Event;
   import org.jgroups.Global;
  +import org.jgroups.conf.ProtocolConfiguration;
   import org.jgroups.util.StackType;
   import org.jgroups.annotations.Property;
   import org.jgroups.conf.PropertyConverters;
   import org.jgroups.stack.Configurator;
  -import org.jgroups.stack.Configurator.ProtocolConfiguration;
   import org.jgroups.stack.IpAddress;
   import org.jgroups.stack.Protocol;
   import org.jgroups.stack.ProtocolStack;
  @@ -21,12 +21,11 @@
   /**
    * Tests the use of @Property dependency processing and default assignment.
    * @author Richard Achmatowicz
  - * @version $Id: ProtocolConfigurationTest.java,v 1.6 2009/10/26 14:34:21 belaban Exp $
  + * @version $Id: ProtocolConfigurationTest.java,v 1.7 2010/09/15 15:51:09 belaban Exp $
    */
   @Test(groups=Global.FUNCTIONAL,sequential=true)
   public class ProtocolConfigurationTest {
   	ProtocolStack stack = null;
  -	ProtocolConfiguration protocol_config = null ;
   	Protocol protocol = null ;
   	static final String orderProps="org.jgroups.tests.ProtocolConfigurationTest$ORDERING(a=1;b=2;c=3)";
   	static final String refsProps="org.jgroups.tests.ProtocolConfigurationTest$REFS(a=1;b=2;c=3)";
  
  
  
  1.4       +3 -4      JGroups/tests/junit-functional/org/jgroups/tests/InetAddressChecksTest.java
  
  Index: InetAddressChecksTest.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/tests/junit-functional/org/jgroups/tests/InetAddressChecksTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InetAddressChecksTest.java	20 Oct 2009 14:46:30 -0000	1.3
  +++ InetAddressChecksTest.java	15 Sep 2010 15:51:09 -0000	1.4
  @@ -2,12 +2,12 @@
   
   import org.jgroups.Event;
   import org.jgroups.Global ;
  +import org.jgroups.conf.ProtocolConfiguration;
   import org.jgroups.stack.Protocol;
   import org.jgroups.stack.ProtocolStack;
   import org.jgroups.stack.Configurator ;
   import org.jgroups.stack.Configurator.InetAddressInfo;
  -import org.jgroups.stack.Configurator.ProtocolConfiguration;
  -import org.jgroups.annotations.Property; 
  +import org.jgroups.annotations.Property;
   import org.jgroups.util.Util ;
   
   import org.testng.annotations.BeforeMethod;
  @@ -19,12 +19,11 @@
   /**
    * Tests checks made on InetAddress and related addresses in Configurator.
    * @author Richard Achmatowicz
  - * @version $Id: InetAddressChecksTest.java,v 1.3 2009/10/20 14:46:30 belaban Exp $
  + * @version $Id: InetAddressChecksTest.java,v 1.4 2010/09/15 15:51:09 belaban Exp $
    */
   @Test(groups=Global.FUNCTIONAL,sequential=true)
   public class InetAddressChecksTest {
   	ProtocolStack stack = null;
  -	ProtocolConfiguration protocol_config = null ;
   	Protocol protocol = null ;
   	static final String ipCheckNoConsistentProps="org.jgroups.tests.InetAddressChecksTest$IPCHECK(" + 
   								"inetAddress1=127.0.0.1;inetAddress2=::1;inetAddress3=192.168.0.100;i=3)" ;
  
  
  

------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev