Projects >> socialize-sdk-android >>cdd2063a2f94b033232b0b175ef07978f9ac6964

Chunk
Conflicting content 
		verifyDefaultMocks();
	}
<<<<<<< HEAD
	
	@Deprecated
	@UsesMocks ({SocializeAuthListener.class})
	public void  testAuthenticateWithListener() {
		final SocializeAuthListener mockListener = AndroidMock.createMock(SocializeAuthListener.class);
=======

	
	@UsesMocks({ SocializeAuthListener.class })
	public void testAuthenticateWithListener() {
		final SocializeAuthListener mockListener = AndroidMock
				.createMock(SocializeAuthListener.class);
>>>>>>> b1301cb2d4f81d0b1239976866ef22fa0d9505a3
		PublicSocialize socializeService = new PublicSocialize() {
			@Override
			public void authenticate(Context context,
Solution content 
		verifyDefaultMocks();
	}
	
	@Deprecated
	@UsesMocks({ SocializeAuthListener.class })
	public void testAuthenticateWithListener() {
		final SocializeAuthListener mockListener = AndroidMock
				.createMock(SocializeAuthListener.class);
		PublicSocialize socializeService = new PublicSocialize() {
			@Override
			public void authenticate(Context context,
File
SocializeServiceTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method invocation
Method signature
Variable
Chunk
Conflicting content 
		};
		socializeService.authenticate(mockListener);
	}
<<<<<<< HEAD
	
	@UsesMocks ({SocializeAuthListener.class, IBeanFactory.class, AuthProviderData.class})
=======

	@UsesMocks({ SocializeAuthListener.class, IBeanFactory.class,
			AuthProviderData.class })
>>>>>>> b1301cb2d4f81d0b1239976866ef22fa0d9505a3
	public void testAuthenticate() throws SocializeException {
		SocializeAuthListener listener = AndroidMock
				.createMock(SocializeAuthListener.class);
Solution content 
		};
		socializeService.authenticate(mockListener);
	}

	@UsesMocks({ SocializeAuthListener.class, IBeanFactory.class,
			AuthProviderData.class })
	public void testAuthenticate() throws SocializeException {
		SocializeAuthListener listener = AndroidMock
				.createMock(SocializeAuthListener.class);
File
SocializeServiceTest.java
Developer's decision
Version 1
Kind of conflict
Annotation