Projects information

Chunk

Conflicting content
List targetLst = pluginController.getTargetDao(). getTargetsByServiceItemByClient(sItem.getId(), client.getId()); <<<<<<< HEAD List

Solution content
List targetLst = pluginController.getTargetDao(). getTargetsByServiceItemByClient(sItem.getId(), client.getId()); List

File
CreateSettingsHandler.java

Developer's decision
Version 1

Kind of conflict
For statement
If statement
Method invocation
Return statement
Variable

Chunk

Conflicting content
} return new HashSet(targets); } <<<<<<< HEAD ======= >>>>>>> 9e96de48151912150a76125aa0291ed894fe5c30 } class WaitingJob extends FrontlineUiUpateJob {

Solution content
} return new HashSet(targets); } private Set mockTargets(Set mockAccounts) { ArrayList targets = new ArrayList(); for (Account account : mockAccounts) { ServiceItem svsItem = mock(ServiceItem.class); svsItem.setAmount(new BigDecimal("8900")); svsItem.setTargetName("PUMP"); Target target = mock(Target.class); when(target.getAccount()).thenReturn(account); when(targetDao.getActiveTargetByAccount(account.getAccountNumber())).thenReturn(target); when(target.getServiceItem()).thenReturn(svsItem); when(target.getId()).thenReturn((long)1234); targets.add(target); } return new HashSet(targets); } private Set mockTargetAnalytics(Set mockAccounts) { ArrayList targets = new ArrayList(); for (Account account : mockAccounts) { ServiceItem svsItem = mock(ServiceItem.class); svsItem.setAmount(new BigDecimal("8900")); svsItem.setTargetName("PUMP"); Target target = mock(Target.class); when(target.getAccount()).thenReturn(account); when(targetDao.getActiveTargetByAccount(account.getAccountNumber())).thenReturn(target); when(target.getServiceItem()).thenReturn(svsItem); when(target.getId()).thenReturn((long)1234); targets.add(target); } return new HashSet(targets); } } class WaitingJob extends FrontlineUiUpateJob {

Solution content

		}
		return new HashSet(targets);
	}
	
	private Set mockTargets(Set mockAccounts) {
		ArrayList targets = new ArrayList();
		for (Account account :  mockAccounts) {
			ServiceItem svsItem = mock(ServiceItem.class);
			svsItem.setAmount(new BigDecimal("8900"));
			svsItem.setTargetName("PUMP");
			
			Target target = mock(Target.class);
			when(target.getAccount()).thenReturn(account);
			when(targetDao.getActiveTargetByAccount(account.getAccountNumber())).thenReturn(target);
			when(target.getServiceItem()).thenReturn(svsItem);
			when(target.getId()).thenReturn((long)1234);
			targets.add(target);
		}
		return new HashSet(targets);
	}
	
	private Set mockTargetAnalytics(Set mockAccounts) {
		ArrayList targets = new ArrayList();
		for (Account account :  mockAccounts) {
			ServiceItem svsItem = mock(ServiceItem.class);
			svsItem.setAmount(new BigDecimal("8900"));
			svsItem.setTargetName("PUMP");
			
			Target target = mock(Target.class);
			when(target.getAccount()).thenReturn(account);
			when(targetDao.getActiveTargetByAccount(account.getAccountNumber())).thenReturn(target);
			when(target.getServiceItem()).thenReturn(svsItem);
			when(target.getId()).thenReturn((long)1234);
			targets.add(target);
		}
		return new HashSet(targets);
	}
	
}

class WaitingJob extends FrontlineUiUpateJob {

File
MpesaPaymentServiceTest.java

Developer's decision
Manual

Kind of conflict
Other

Projects >> plugin-paymentview >>7f0e8f142655f2086b3b39fd8f5269f742bae4cc