| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD
return getPackages();
}
});
allowing(myIndexProxy).search(with(any(String.class))); will(returnIterator(myFeed));
=======
allowing(myIndexProxy).getNuGetEntries(with(any(String.class))); will(new CustomAction("lazy return packages") {
public Object invoke(Invocation invocation) throws Throwable {
return getPackages();
}
});
>>>>>>> 549e9b63a793e9d5b16fc3df6599bd71ce38b1aa
allowing(myIndex).getNuGetEntries(); will(returnIterator(myFeed));
allowing(mySettings).getNuGetFeedControllerPath(); will(returnValue(NuGetServerSettingsImpl.PATH));
|
| Solution content |
|---|
return getPackages();
}
});
allowing(myIndexProxy).search(with(any(String.class))); will(returnIterator(myFeed));
allowing(myIndexProxy).getNuGetEntries(with(any(String.class))); will(new CustomAction("lazy return packages") {
public Object invoke(Invocation invocation) throws Throwable {
return getPackages();
}
});
allowing(myIndex).getNuGetEntries(); will(returnIterator(myFeed));
allowing(mySettings).getNuGetFeedControllerPath(); will(returnValue(NuGetServerSettingsImpl.PATH));
|
| File |
|---|
| NuGetJavaFeedIntegrationTestBase.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |