Projects >> geocamMemoAndroid >>f24893de1c7d31e26b5eaa0087fa0fe726baa8d6

Chunk
Conflicting content 
package gov.nasa.arc.geocam.memo.service.test;

<<<<<<< HEAD
import static org.junit.Assert.assertNotNull;
import gov.nasa.arc.geocam.memo.bean.GeoCamMemoMessage;
import gov.nasa.arc.geocam.memo.injected.InjectedTestRunner;
import gov.nasa.arc.geocam.memo.service.DjangoMemoImplementation;

import java.util.List;

import org.junit.Test;
import org.junit.runner.RunWith;

import com.google.inject.Inject;

@RunWith(InjectedTestRunner.class)
public class DjangoMemoImplementationTest {

	@Inject DjangoMemoImplementation memoImpl;
	
	@Test
	public void ensureGetMemosReturnsMemos() {
=======
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import gov.nasa.arc.geocam.memo.bean.GeoCamMemoMessage;
import gov.nasa.arc.geocam.memo.service.DjangoMemoImplementation;
import gov.nasa.arc.geocam.memo.service.DjangoMemoJsonConverterInterface;
import gov.nasa.arc.geocam.memo.test.GeoCamTestCase;

import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;

import org.junit.Test;


public class DjangoMemoImplementationTest extends GeoCamTestCase {

	@Test
	public void shouldEnsureGetMemosReturnsMemos() throws Exception {
		DjangoMemoImplementation memoImpl = new DjangoMemoImplementation();
		
		//let's mock the json interface...
		DjangoMemoJsonConverterInterface jsonConv = 
			mock(DjangoMemoJsonConverterInterface.class);
		
		// ...and make sure we're calling what we intend to.
		List expectedList = new ArrayList();
		when(jsonConv.deserializeList(anyString()))
				.thenReturn(expectedList);

		setHiddenField(memoImpl, "jsonConverter", jsonConv);
		
>>>>>>> b49effc4be25e6d9e239ee8c8883d37219b464d9
		// act
		List memos = memoImpl.getMemos();
Solution content 
package gov.nasa.arc.geocam.memo.service.test;

import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import gov.nasa.arc.geocam.memo.bean.GeoCamMemoMessage;
import gov.nasa.arc.geocam.memo.service.DjangoMemoImplementation;
import gov.nasa.arc.geocam.memo.service.DjangoMemoJsonConverterInterface;
import gov.nasa.arc.geocam.memo.test.GeoCamTestCase;

import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;

import org.junit.Test;


public class DjangoMemoImplementationTest extends GeoCamTestCase {

	@Test
	public void shouldEnsureGetMemosReturnsMemos() throws Exception {
		DjangoMemoImplementation memoImpl = new DjangoMemoImplementation();
		
		//let's mock the json interface...
		DjangoMemoJsonConverterInterface jsonConv = 
			mock(DjangoMemoJsonConverterInterface.class);
		
		// ...and make sure we're calling what we intend to.
		List expectedList = new ArrayList();
		when(jsonConv.deserializeList(anyString()))
				.thenReturn(expectedList);

		setHiddenField(memoImpl, "jsonConverter", jsonConv);
		
		// act
		List memos = memoImpl.getMemos();
File
DjangoMemoImplementationTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Class signature
Comment
Import
Method invocation
Method signature
Variable
Chunk
Conflicting content 
		// assert
<<<<<<< HEAD
		assertNotNull(memos);
		List memos = memoImpl.getMemos();
		
=======
		assertEquals(expectedList, memos);
		verify(jsonConv).deserializeList(anyString());
>>>>>>> b49effc4be25e6d9e239ee8c8883d37219b464d9
	}
}
Solution content 
		List memos = memoImpl.getMemos();
		
		// assert
		assertEquals(expectedList, memos);
		verify(jsonConv).deserializeList(anyString());
	}
}
File
DjangoMemoImplementationTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation