Skip to content

Commit 7b28541

Browse files
ben-manesben-manes
committed
Add module descriptor for guava adapters
This change required removing the split test packages. The import of Guava's test suite is now under a compatibility package. The JUnit tests applying to Caffeine (jsr166's suite, testlib suite) are now moved into the caffeine module's test package. The Eclipse workaround is now applied to all projects.
1 parent 99bf56b commit 7b28541

44 files changed

Lines changed: 278 additions & 134 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎caffeine/build.gradle‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,7 @@ idea.module {
2424
}
2525

2626
eclipse.classpath.file.whenMerged {
27-
entries.findAll {
28-
it instanceof SourceFolder && it.output == 'bin/codeGen'
29-
}*.output = 'bin/main'
30-
// Exclude module-info when compiling through Eclipse
31-
def main = entries.find { it instanceof SourceFolder && it.path == 'src/main/java' }
32-
main.excludes.add('module-info.java')
27+
entries.findAll { it instanceof SourceFolder && it.output == 'bin/codeGen' }*.output = 'bin/main'
3328
}
3429

3530
plugins.withType(EclipsePlugin) {

‎caffeine/src/main/java/com/github/benmanes/caffeine/cache/stats/ConcurrentStatsCounter.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package com.github.benmanes.caffeine.cache.stats;
1717

18+
import static java.util.Objects.requireNonNull;
19+
1820
import java.util.concurrent.atomic.LongAdder;
1921

2022
import com.github.benmanes.caffeine.cache.Cache;
@@ -71,6 +73,7 @@ public void recordLoadFailure(long loadTime) {
7173

7274
@Override
7375
public void recordEviction(int weight, RemovalCause cause) {
76+
requireNonNull(cause);
7477
evictionCount.increment();
7578
evictionWeight.add(weight);
7679
}

‎caffeine/src/main/java/com/github/benmanes/caffeine/cache/stats/DisabledStatsCounter.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package com.github.benmanes.caffeine.cache.stats;
1717

18+
import static java.util.Objects.requireNonNull;
19+
1820
import org.checkerframework.checker.index.qual.NonNegative;
1921

2022
import com.github.benmanes.caffeine.cache.RemovalCause;
@@ -40,7 +42,9 @@ public void recordLoadSuccess(long loadTime) {}
4042
public void recordLoadFailure(long loadTime) {}
4143

4244
@Override
43-
public void recordEviction(@NonNegative int weight, RemovalCause cause) {}
45+
public void recordEviction(@NonNegative int weight, RemovalCause cause) {
46+
requireNonNull(cause);
47+
}
4448

4549
@Override
4650
public CacheStats snapshot() {

‎caffeine/src/main/java/com/github/benmanes/caffeine/cache/stats/GuardedStatsCounter.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public void recordLoadFailure(long loadTime) {
7676

7777
@Override
7878
public void recordEviction(int weight, RemovalCause cause) {
79+
requireNonNull(cause);
7980
try {
8081
delegate.recordEviction(weight, cause);
8182
} catch (Throwable t) {

guava/src/test/java/com/github/benmanes/caffeine/cache/CaffeineMapTests.java renamed to caffeine/src/test/java/com/github/benmanes/caffeine/cache/CaffeineMapTests.java

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package com.github.benmanes.caffeine.cache;
1717

18-
import static com.github.benmanes.caffeine.cache.MapTestFactory.asynchronousGenerator;
19-
import static com.github.benmanes.caffeine.cache.MapTestFactory.synchronousGenerator;
18+
import static com.github.benmanes.caffeine.cache.testing.MapTestFactory.asynchronousGenerator;
19+
import static com.github.benmanes.caffeine.cache.testing.MapTestFactory.synchronousGenerator;
2020

21-
import com.github.benmanes.caffeine.guava.CaffeinatedGuava;
21+
import com.github.benmanes.caffeine.cache.testing.MapTestFactory;
2222

2323
import junit.framework.Test;
2424
import junit.framework.TestCase;
@@ -31,15 +31,14 @@
3131
*/
3232
public final class CaffeineMapTests extends TestCase {
3333

34-
public static Test suite() throws Exception {
34+
public static Test suite() {
3535
TestSuite suite = new TestSuite();
36-
addGuavaViewTests(suite);
3736
addUnboundedTests(suite);
3837
addBoundedTests(suite);
3938
return suite;
4039
}
4140

42-
private static void addUnboundedTests(TestSuite suite) throws Exception {
41+
private static void addUnboundedTests(TestSuite suite) {
4342
suite.addTest(MapTestFactory.suite("UnboundedCache", synchronousGenerator(() -> {
4443
Cache<String, String> cache = Caffeine.newBuilder().build();
4544
return cache.asMap();
@@ -54,7 +53,7 @@ private static void addUnboundedTests(TestSuite suite) throws Exception {
5453
})));
5554
}
5655

57-
private static void addBoundedTests(TestSuite suite) throws Exception {
56+
private static void addBoundedTests(TestSuite suite) {
5857
suite.addTest(MapTestFactory.suite("BoundedCache", synchronousGenerator(() -> {
5958
Cache<String, String> cache = Caffeine.newBuilder().maximumSize(Long.MAX_VALUE).build();
6059
return cache.asMap();
@@ -72,17 +71,4 @@ private static void addBoundedTests(TestSuite suite) throws Exception {
7271
return cache.asMap();
7372
})));
7473
}
75-
76-
private static void addGuavaViewTests(TestSuite suite) throws Exception {
77-
suite.addTest(MapTestFactory.suite("GuavaView", synchronousGenerator(() -> {
78-
com.google.common.cache.Cache<String, String> cache = CaffeinatedGuava.build(
79-
Caffeine.newBuilder().maximumSize(Long.MAX_VALUE));
80-
return cache.asMap();
81-
})));
82-
suite.addTest(MapTestFactory.suite("GuavaLoadingView", synchronousGenerator(() -> {
83-
com.google.common.cache.Cache<String, String> cache = CaffeinatedGuava.build(
84-
Caffeine.newBuilder().maximumSize(Long.MAX_VALUE), key -> null);
85-
return cache.asMap();
86-
})));
87-
}
8874
}

guava/src/test/java/com/github/benmanes/caffeine/cache/CaffeineSpecGuavaTest.java renamed to caffeine/src/test/java/com/github/benmanes/caffeine/cache/CaffeineSpecGuavaTest.java

File renamed without changes.

guava/src/test/java/com/github/benmanes/caffeine/cache/LinkedDequeTests.java renamed to caffeine/src/test/java/com/github/benmanes/caffeine/cache/LinkedDequeTests.java

File renamed without changes.

guava/src/test/java/com/github/benmanes/caffeine/cache/MpscGrowableQueueSanityTest.java renamed to caffeine/src/test/java/com/github/benmanes/caffeine/cache/MpscGrowableQueueSanityTest.java

File renamed without changes.

guava/src/test/java/com/github/benmanes/caffeine/cache/PackageSanityTests.java renamed to caffeine/src/test/java/com/github/benmanes/caffeine/cache/PackageSanityTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*
2323
* @author ben.manes@gmail.com (Ben Manes)
2424
*/
25-
public class PackageSanityTests extends AbstractPackageSanityTests {
25+
public final class PackageSanityTests extends AbstractPackageSanityTests {
2626

2727
public PackageSanityTests() {
2828
publicApiOnly();

guava/src/test/java/com/github/benmanes/caffeine/cache/QueueSanityTest.java renamed to caffeine/src/test/java/com/github/benmanes/caffeine/cache/QueueSanityTest.java

File renamed without changes.

0 commit comments

Comments
 (0)