Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for DTMF from MediaServer #2418

Merged
merged 2 commits into from
Aug 17, 2017
Merged

Fix for DTMF from MediaServer #2418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37c72c2
Fix for DTMF using SIP INFO
Aug 9, 2017
1a4950b
Fix for DTMF from MediaServer
Aug 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ...restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,10 +841,7 @@ else if (is(gathering) || is(continuousGathering) || (is(finishGathering) && !su
}
}
} else {
// Skip digits collecting if empty CollectResult received
if (!(data instanceof CollectedResult) || !StringUtils.isEmpty(((CollectedResult)data).getResult())) {
collectedDigits.append(data);
}
collectedDigits.append(((CollectedResult)data).getResult());
fsm.transition(message, finishGathering);
}
}
Expand Down
18 changes: 18 additions & 0 deletions ...restcomm.interpreter/src/test/java/org/restcomm/connect/interpreter/GatherSpeechTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,24 @@ public void testIgnoreRcmlFromPartialCallback() throws Exception {
};
}

@Test
@SuppressWarnings("unchecked")
public void testDtmfFromMediaServer() throws Exception {
new JavaTestKit(system) {
{
final ActorRef observer = getRef();
final TestActorRef<VoiceInterpreter> interpreterRef = createVoiceInterpreter(observer);
VoiceInterpreter interpreter = interpreterRef.underlyingActor();
interpreter.fsm = spy(new FiniteStateMachine(interpreter.continuousGathering, interpreter.transitions));
doNothing().when(interpreter.fsm).transition(any(), eq(interpreter.finishGathering));
interpreter.collectedDigits = new StringBuffer();
interpreter.finishOnKey="#";
interpreterRef.tell(new MediaGroupResponse(new CollectedResult("5", false, false)), observer);
assertEquals("5", interpreter.collectedDigits.toString());
}
};
}

private NameValuePair findParam(final List<NameValuePair> params, final String key) {
return Iterables.find(params, new Predicate<NameValuePair>() {
public boolean apply(NameValuePair p) {
Expand Down