/*
 * Copyright 2015 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License
 */
package io.atomix;

import io.atomix.group.DistributedGroup;
import io.atomix.group.LocalMember;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

import java.util.concurrent.TimeUnit;
import java.util.function.Function;

import static org.testng.Assert.assertEquals;

/**
 * Atomix membership group test.
 *
 * @author <a href="http://github.com/kuujo>Jordan Halterman</a>
 */
@Test
public class AtomixGroupTest extends AbstractAtomixTest {
  @BeforeClass
  protected void setupCluster() throws Throwable {
    createReplicas(3);
  }
  
  public void testClientGroupGet() throws Throwable {
    Atomix client1 = createClient();
    Atomix client2 = createClient();
    testGroup(client1, client2, getResource("test-client-group-get", DistributedGroup.class));
  }

  public void testReplicaGroupGet() throws Throwable {
    testGroup(replicas.get(0), replicas.get(1), getResource("test-replica-group-get", DistributedGroup.class));
  }

  /**
   * Tests a membership group.
   */
  private void testGroup(Atomix client1, Atomix client2, Function<Atomix, DistributedGroup> factory) throws Throwable {
    DistributedGroup group1 = factory.apply(client1);
    DistributedGroup group2 = factory.apply(client2);

    LocalMember localMember = group2.join().get(5, TimeUnit.SECONDS);
    assertEquals(group2.members().size(), 1);

    group1.join().thenRun(() -> {
      threadAssertEquals(group1.members().size(), 2);
      threadAssertEquals(group2.members().size(), 2);
      resume();
    });

    await(5000);

    group1.onLeave(member -> resume());
    localMember.leave().thenRun(this::resume);

    await(5000, 2);
  }

}

@@ -1851,97 +1851,45 @@
     
-LocalMember localMember = group2.join().get(5, TimeUnit.SECONDS);%0A    assertEquals
+group1.onJoin(m -%3E %7B%0A      if 
 (group
-2
+1
 .mem
@@ -1905,116 +1905,228 @@
 ze()
-, 1);%0A%0A    group1.join().thenRun(() -%3E %7B%0A      threadAssertEquals(group1.members().size(), 2);%0A      threadA
+ == 2) %7B%0A        resume();%0A      %7D%0A    %7D);%0A    group2.onJoin(m -%3E %7B%0A      if (group1.members().size() == 2) %7B%0A        resume();%0A      %7D%0A    %7D);%0A%0A    LocalMember localMember = group2.join().get(5, TimeUnit.SECONDS);%0A    a
 sser
@@ -2162,33 +2162,51 @@
 (), 
-2
+1
 );%0A
+%0A
     
-  resume();%0A    %7D
+group1.join().thenRun(this::resume
 );%0A%0A
@@ -2219,16 +2219,19 @@
 ait(5000
+, 3
 );%0A%0A    

Update core DistributedGroup tests.