| Chunk |
|---|
| Conflicting content |
|---|
expect(vBox.getGuestOSType(eq("os-type"))).andReturn(guestOsType);
expect(vbm.getVBox()).andReturn(vBox);
expect(guestOsType.getIs64Bit()).andReturn(true);
<<<<<<< HEAD
expect(vm.getId()).andReturn(machineId).atLeastOnce();
=======
>>>>>>> d7aa0bda771178b3605d138d31b3cc19c6e81626
replay(vbm, vBox, vm, guestOsType);
|
| Solution content |
|---|
expect(vBox.getGuestOSType(eq("os-type"))).andReturn(guestOsType);
expect(vbm.getVBox()).andReturn(vBox);
expect(guestOsType.getIs64Bit()).andReturn(true);
replay(vbm, vBox, vm, guestOsType);
|
| File |
|---|
| IMachineToHardwareTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |