Projects >> atlas >>622d3d9dfb4b2de75614f595ef5806277f08e754

Chunk
Conflicting content 
	public void setUp() {
@RunWith(MockitoJUnitRunner.class)
public class C4BrandBasicDetailsExtractorTest extends TestCase {

<<<<<<< HEAD
    private static final Channel FM = new Channel(Publisher.METABROADCAST, "4Music", "more4", MediaType.VIDEO, "http://www.4music.com");
    private static final Channel E4 = new Channel(Publisher.METABROADCAST, "E4", "more4", MediaType.VIDEO, "http://www.e4.com");
    private static final Channel F4 = new Channel(Publisher.METABROADCAST, "Film4", "more4", MediaType.VIDEO, "http://film4.com");
    private static final Channel C4 = new Channel(Publisher.METABROADCAST, "Channel 4", "channel4", MediaType.VIDEO, "http://www.channel4.com");
    private static final Channel M4 = new Channel(Publisher.METABROADCAST, "More4", "more4", MediaType.VIDEO, "http://www.more4.com");
    private static final Channel FS = new Channel(Publisher.METABROADCAST, "FourSeven", "fourseven", MediaType.VIDEO, "http://www.channel4.com/4seven");
    
    private final Clock clock = new TimeMachine(new DateTime(DateTimeZones.UTC));
    private final ChannelResolver channelResolver = mock(ChannelResolver.class);
    
    private C4BrandBasicDetailsExtractor extractor;
=======
    private final Mockery context = new Mockery();
	private C4BrandBasicDetailsExtractor extractor;
	
	@Before
		final ChannelResolver channelResolver = context.mock(ChannelResolver.class);
		context.checking(new Expectations() {
			{
				one(channelResolver).fromUri("http://www.channel4.com");
				will(returnValue(Maybe.just(new Channel(Publisher.METABROADCAST, "Channel 4", "channel4", false, MediaType.VIDEO, "http://www.channel4.com"))));
				one(channelResolver).fromUri("http://www.channel4.com/more4");
				will(returnValue(Maybe.just(new Channel(Publisher.METABROADCAST, "More4", "more4", false, MediaType.VIDEO, "http://www.more4.com"))));
				one(channelResolver).fromUri("http://film4.com");
				will(returnValue(Maybe.just(new Channel(Publisher.METABROADCAST, "Film4", "more4", false, MediaType.VIDEO, "http://film4.com"))));
				one(channelResolver).fromUri("http://www.e4.com");
				will(returnValue(Maybe.just(new Channel(Publisher.METABROADCAST, "E4", "more4", false, MediaType.VIDEO, "http://www.e4.com"))));
				one(channelResolver).fromUri("http://www.4music.com");
				will(returnValue(Maybe.just(new Channel(Publisher.METABROADCAST, "4Music", "more4", false, MediaType.VIDEO, "http://www.4music.com"))));
				allowing(channelResolver).fromUri("http://www.channel4.com/4seven");
                will(returnValue(Maybe.just(new Channel(Publisher.METABROADCAST, "4seven", "4seven", false, MediaType.VIDEO, "http://www.channel4.com/4seven"))));
			}
		});
		extractor = new C4BrandBasicDetailsExtractor(channelResolver);
	}
>>>>>>> 4cac19f3b2c8a02316331871af4e5f92d8f69d74
	
    @Before
    public void setUp() {
Solution content 
@RunWith(MockitoJUnitRunner.class)
public class C4BrandBasicDetailsExtractorTest extends TestCase {

    private static final Channel FM = new Channel(Publisher.METABROADCAST, "4Music", "more4", false, MediaType.VIDEO, "http://www.4music.com");
    private static final Channel E4 = new Channel(Publisher.METABROADCAST, "E4", "more4", false, MediaType.VIDEO, "http://www.e4.com");
    private static final Channel F4 = new Channel(Publisher.METABROADCAST, "Film4", "more4", false, MediaType.VIDEO, "http://film4.com");
    private static final Channel C4 = new Channel(Publisher.METABROADCAST, "Channel 4", "channel4", false, MediaType.VIDEO, "http://www.channel4.com");
    private static final Channel M4 = new Channel(Publisher.METABROADCAST, "More4", "more4", false, MediaType.VIDEO, "http://www.more4.com");
    private static final Channel FS = new Channel(Publisher.METABROADCAST, "FourSeven", "fourseven", false, MediaType.VIDEO, "http://www.channel4.com/4seven");
    
    private final Clock clock = new TimeMachine(new DateTime(DateTimeZones.UTC));
    private final ChannelResolver channelResolver = mock(ChannelResolver.class);
    
    private C4BrandBasicDetailsExtractor extractor;
	
    @Before
    public void setUp() {
File
C4BrandBasicDetailsExtractorTest.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
Method declaration
Method invocation
Chunk
Conflicting content 
public class ScheduleProbeTest extends TestCase {

<<<<<<< HEAD
=======
	private static final Channel CHANNEL4 = new Channel(Publisher.METABROADCAST, "Channel 4", "c4", false, MediaType.AUDIO, "http://channel4.com");

    private final TimeMachine clock = new TimeMachine();
>>>>>>> 4cac19f3b2c8a02316331871af4e5f92d8f69d74
    private final Mockery context = new Mockery();
    private final ScheduleResolver scheduleResolver = context.mock(ScheduleResolver.class);
Solution content 
public class ScheduleProbeTest extends TestCase {

    private final Mockery context = new Mockery();
    private final ScheduleResolver scheduleResolver = context.mock(ScheduleResolver.class);
File
ScheduleProbeTest.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation