Merge remote-tracking branch 'upstream/master'

This commit is contained in:
DOHA 2014-10-12 23:12:35 +02:00
commit 56388e1b07
1 changed files with 2 additions and 1 deletions

View File

@ -158,7 +158,6 @@ public class GuavaCacheTest {
final LoadingCache<String, String> cache = CacheBuilder.newBuilder().refreshAfterWrite(1, TimeUnit.MINUTES).build(loader);
}
@Test
public void whenPreloadCache_thenUsePutAll() {
final CacheLoader<String, String> loader = new CacheLoader<String, String>() {
@ -200,6 +199,8 @@ public class GuavaCacheTest {
assertEquals(3, cache.size());
}
// UTIL
private String getSuffix(final String str) {
final int lastIndex = str.lastIndexOf('.');
if (lastIndex == -1)