Merge pull request #2735 from RestComm/restcomm-1485

reproduced and fixed restcomm-1485

Author: maria-farooq

restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java

@@ -333,6 +333,10 @@ public void execute(Object message) throws Exception {
             }
             //tell call api client to kick all remote calls
             kickoutRemoteParticipants();
+            // Stop the conference if ALL local participants have been evicted
+            if (calls.isEmpty()) {
+                fsm.transition(message, stopping);
+            }
         }
     }
 

restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/telephony/ConferenceTest.java

@@ -42,6 +42,7 @@
 import org.restcomm.connect.telephony.api.ConferenceResponse;
 import org.restcomm.connect.telephony.api.ConferenceStateChanged;
 import org.restcomm.connect.telephony.api.CreateConference;
+import org.restcomm.connect.telephony.api.StopConference;
 import org.restcomm.connect.telephony.util.ConferenceTestUtil;
 
 import akka.actor.ActorRef;
@@ -303,4 +304,41 @@ public UntypedActor create() throws Exception {
         return system.actorOf(props);
     }
 
+    @Test
+	public void testStopConferenceWithNoLocalParticipants() throws URISyntaxException {
+        new JavaTestKit(system) {
+            {
+            	daoManager = mock(DaoManager.class);
+            	CallDetailRecordsDao callDetailRecordsDao = mock(CallDetailRecordsDao.class);
+            	ConferenceDetailRecordsDao conferenceDetailRecordsDao = mock(ConferenceDetailRecordsDao.class);
+            	when(callDetailRecordsDao.getTotalRunningCallDetailRecordsByConferenceSid(any(Sid.class))).thenReturn(0);
+            	when(daoManager.getCallDetailRecordsDao()).thenReturn(callDetailRecordsDao);
+            	when(daoManager.getConferenceDetailRecordsDao()).thenReturn(conferenceDetailRecordsDao);
+            	
+            	
+                final ActorRef tester = getRef();
+                // Create MockFailingMmsControllerFactory
+                MediaServerControllerFactory factory = new MockMmsControllerFactory(system, null);
+                // Create ConferenceCenter
+                final ActorRef conferenceCenter = conferenceCenter(factory, daoManager);
+
+                // get a fresh conference from conferenecneter
+                final CreateConference create = new CreateConference(CONFERENCE_FRIENDLY_NAME_1, new Sid(CALL_SID));
+                conferenceCenter.tell(create, tester);
+                ConferenceCenterResponse conferenceCenterResponse = expectMsgClass(ConferenceCenterResponse.class);
+                ActorRef conferene = conferenceCenterResponse.get();
+                
+                // start observing conference
+                conferene.tell(new Observe(tester), tester);
+                Observing observingResponse = expectMsgClass(Observing.class);
+                assertTrue(observingResponse.succeeded());
+
+                // stop conference while no local participants is there
+                conferene.tell(new StopConference(), tester);
+                ConferenceStateChanged conferenceStateChanged = expectMsgClass(ConferenceStateChanged.class);
+                assertEquals(ConferenceStateChanged.State.COMPLETED, conferenceStateChanged.state());
+            	
+            }};
+	}
+
 }