| Chunk |
|---|
| Conflicting content |
|---|
@Test
public void divisionCallTest() {
<<<<<<< HEAD
MathServiceCallBack divCallBack = new MathServiceCallBack();
=======
IMathServiceCallBack divCallBack = new MathServiceCallBack();
>>>>>>> 438e2942fa83d412fff7041287c30b11357e5a5f
/* we need this injector for the Call Back */
classUnderTest.setMathServiceCallBack(divCallBack);
|
| Solution content |
|---|
@Test
public void divisionCallTest() {
IMathServiceCallBack divCallBack = new MathServiceCallBack();
/* we need this injector for the Call Back */
classUnderTest.setMathServiceCallBack(divCallBack);
|
| File |
|---|
| MathServiceConsumerMockTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |