Projects >> facebook-connector >>8cd338bdc4f68f8a12211183985d85465dbaf4ec

Chunk
Conflicting content 
		return "automation-test-flows.xml";
	}
	
<<<<<<< HEAD
    protected MessageProcessor lookupMessageProcessor(String name) {
        return (MessageProcessor) muleContext.getRegistry().lookupFlowConstruct(name);
    }
	
=======
>>>>>>> da834d0501de227b89723b1f76621143da4d28b5
    @BeforeClass
    public static void beforeClass() {
    	context = new ClassPathXmlApplicationContext(SPRING_CONFIG_FILES);
Solution content 
		return "automation-test-flows.xml";
	}

    protected MessageProcessor lookupMessageProcessor(String name) {
        return (MessageProcessor) muleContext.getRegistry().lookupFlowConstruct(name);
    }

    @BeforeClass
    public static void beforeClass() {
    	context = new ClassPathXmlApplicationContext(SPRING_CONFIG_FILES);
File
FacebookTestParent.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
	@Category({RegressionTests.class})
	@Test
	public void testGetUser() {
<<<<<<< HEAD
    	
    	testObjects = (HashMap) context.getBean("getUserTestData");
    	
		MessageProcessor flow = lookupMessageProcessor("get-user");
    	
=======
>>>>>>> da834d0501de227b89723b1f76621143da4d28b5
		try {
			MessageProcessor flow = lookupFlowConstruct("get-user");
			MuleEvent response = flow.process(getTestEvent(testObjects));
Solution content 
	@Category({RegressionTests.class})
	@Test
	public void testGetUser() {
		try {
			MessageProcessor flow = lookupFlowConstruct("get-user");
			MuleEvent response = flow.process(getTestEvent(testObjects));
File
GetUserTestCases.java
Developer's decision
Version 2
Kind of conflict
Cast expression
Method invocation
Variable