Moved AuthHandler into dedicated class (code redundancy--).

Added AuthHandler for account subscription in MSN tests.
cusax-fix
Valentin Martinet 16 years ago
parent 7d4211fe15
commit 4a9c6c769d

@ -0,0 +1,44 @@
/*
* SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package net.java.sip.communicator.slick.protocol.generic;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.util.*;
/**
* Implementation for the authorization handler.
*/
public class AuthHandler
implements AuthorizationHandler
{
private static final Logger logger =
Logger.getLogger(AuthHandler.class);
public AuthorizationResponse processAuthorisationRequest(
AuthorizationRequest req, Contact sourceContact)
{
logger.trace("processAuthorisationRequest " + req + " " +
sourceContact);
return new AuthorizationResponse(AuthorizationResponse.ACCEPT, "");
}
public AuthorizationRequest createAuthorizationRequest(Contact contact)
{
logger.trace("createAuthorizationRequest " + contact);
return new AuthorizationRequest();
}
public void processAuthorizationResponse(
AuthorizationResponse response, Contact sourceContact)
{
logger.debug("auth response from: " +
sourceContact.getAddress() + " " +
response.getResponseCode().getCode());
}
}

@ -10,6 +10,7 @@
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.util.*;
import junit.framework.*;
/**
@ -19,6 +20,9 @@
*/
public abstract class TestOperationSetAdHocMultiUserChat extends TestCase
{
private Logger logger = Logger.getLogger(
TestOperationSetAdHocMultiUserChat.class);
/**
* The name for the AdHocChatRoom we will use in this test case.
*/
@ -803,15 +807,8 @@ public void prepareContactList() throws Exception
try
{
opSetPresence1.setAuthorizationHandler(new AuthHandler());
opSetPresence1.subscribe(fixture.userID2);
}
catch (OperationFailedException e)
{
// means that the contacts already exits.
}
try
{
opSetPresence1.subscribe(fixture.userID3);
}
catch (OperationFailedException e)
@ -821,15 +818,8 @@ public void prepareContactList() throws Exception
try
{
opSetPresence2.setAuthorizationHandler(new AuthHandler());
opSetPresence2.subscribe(fixture.userID1);
}
catch (OperationFailedException e)
{
// means that the contacts already exits.
}
try
{
opSetPresence2.subscribe(fixture.userID3);
}
catch (OperationFailedException e)
@ -839,20 +829,20 @@ public void prepareContactList() throws Exception
try
{
opSetPresence3.setAuthorizationHandler(new AuthHandler());
opSetPresence3.subscribe(fixture.userID1);
opSetPresence3.subscribe(fixture.userID2);
}
catch (OperationFailedException e)
{
// means that the contacts already exits.
}
try
logger.info("Will wait until the list prepare is completed");
Object o = new Object();
synchronized(o)
{
opSetPresence3.subscribe(fixture.userID2);
}
catch (OperationFailedException e)
{
// means that the contacts already exits.
o.wait(2000);
}
}
}

@ -234,30 +234,4 @@ public boolean enableTestSenderCancelsWhileTransfering()
{
return true;
}
private class AuthHandler
implements AuthorizationHandler
{
public AuthorizationResponse processAuthorisationRequest(AuthorizationRequest req, Contact sourceContact)
{
logger.trace("processAuthorisationRequest " + req + " " +
sourceContact);
return new AuthorizationResponse(AuthorizationResponse.ACCEPT, "");
}
public AuthorizationRequest createAuthorizationRequest(Contact contact)
{
logger.trace("createAuthorizationRequest " + contact);
return new AuthorizationRequest();
}
public void processAuthorizationResponse(AuthorizationResponse response, Contact sourceContact)
{
logger.debug("auth response from: " +
sourceContact.getAddress() + " " +
response.getResponseCode().getCode());
}
}
}

@ -235,30 +235,4 @@ public boolean enableTestSenderCancelsWhileTransfering()
{
return true;
}
private class AuthHandler
implements AuthorizationHandler
{
public AuthorizationResponse processAuthorisationRequest(AuthorizationRequest req, Contact sourceContact)
{
logger.trace("processAuthorisationRequest " + req + " " +
sourceContact);
return new AuthorizationResponse(AuthorizationResponse.ACCEPT, "");
}
public AuthorizationRequest createAuthorizationRequest(Contact contact)
{
logger.trace("createAuthorizationRequest " + contact);
return new AuthorizationRequest();
}
public void processAuthorizationResponse(AuthorizationResponse response, Contact sourceContact)
{
logger.debug("auth response from: " +
sourceContact.getAddress() + " " +
response.getResponseCode().getCode());
}
}
}

Loading…
Cancel
Save