Skip to content

Commit 36e31b0

Browse files
timyatestimyates
authored
Add tests from micronaut-graal-tests (#666)
* Add tests from micronaut-graal-tests This PR copies the tests across from the micronaut-graal-tests project for cache https://github.com/micronaut-graal-tests/micronaut-cache-graal/tree/3.10.x We can then tick it off on the issue tasks in core micronaut-projects/micronaut-core#9083 * Remove unused server
1 parent fea063b commit 36e31b0

File tree

6 files changed

+252
-1
lines changed

6 files changed

+252
-1
lines changed

‎test-suite-caffeine-native/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ repositories {
1414

1515
dependencies {
1616
testAnnotationProcessor(mn.micronaut.inject.java)
17-
testImplementation projects.micronautCacheCaffeine
17+
testAnnotationProcessor(mnSerde.micronaut.serde.processor)
18+
testImplementation(mnSerde.micronaut.serde.api)
19+
testImplementation(projects.micronautCacheCaffeine)
1820
testImplementation(mn.micronaut.http.server.netty)
1921
testImplementation(mn.micronaut.http.client)
2022
testImplementation(mnTest.micronaut.test.junit5)

‎test-suite-caffeine-native/src/test/java/io/micronaut/cache/News.java

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package io.micronaut.cache;
2+
3+
import io.micronaut.serde.annotation.Serdeable;
4+
5+
import java.time.Month;
6+
import java.util.List;
7+
8+
@Serdeable
9+
public class News {
10+
private Month month;
11+
12+
private List<String> headlines;
13+
14+
public News() {
15+
}
16+
17+
public News(Month month, List<String> headlines) {
18+
this.month = month;
19+
this.headlines = headlines;
20+
}
21+
22+
public Month getMonth() {
23+
return month;
24+
}
25+
26+
public void setMonth(Month month) {
27+
this.month = month;
28+
}
29+
30+
public List<String> getHeadlines() {
31+
return headlines;
32+
}
33+
34+
public void setHeadlines(List<String> headlines) {
35+
this.headlines = headlines;
36+
}
37+
}

‎test-suite-caffeine-native/src/test/java/io/micronaut/cache/NewsController.java

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package io.micronaut.cache;
2+
3+
import io.micronaut.http.annotation.Controller;
4+
import io.micronaut.http.annotation.Get;
5+
6+
import java.time.Month;
7+
8+
@Controller
9+
public class NewsController {
10+
11+
private final NewsService newsService;
12+
13+
public NewsController(NewsService newsService) {
14+
this.newsService = newsService;
15+
}
16+
17+
@Get("/{month}")
18+
public News index(Month month) {
19+
return new News(month, newsService.headlines(month));
20+
}
21+
}

‎test-suite-caffeine-native/src/test/java/io/micronaut/cache/NewsControllerTest.java

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package io.micronaut.cache;
2+
3+
import io.micronaut.http.HttpRequest;
4+
import io.micronaut.http.client.HttpClient;
5+
import io.micronaut.http.client.annotation.Client;
6+
import io.micronaut.http.uri.UriBuilder;
7+
import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
8+
import jakarta.inject.Inject;
9+
import org.junit.jupiter.api.Test;
10+
import org.junit.jupiter.api.Timeout;
11+
12+
import java.time.Month;
13+
import java.util.List;
14+
15+
import static org.junit.jupiter.api.Assertions.assertEquals;
16+
17+
@MicronautTest
18+
class NewsControllerTest {
19+
20+
@Inject
21+
@Client("/")
22+
HttpClient client;
23+
24+
@Timeout(4)
25+
@Test
26+
void fetchingOctoberHeadlinesUsesCache() {
27+
HttpRequest<?> request = HttpRequest.GET(UriBuilder.of("/").path(Month.OCTOBER.toString()).build());
28+
29+
News news = client.toBlocking().retrieve(request, News.class);
30+
String expected = "Micronaut AOP: Awesome flexibility without the complexity";
31+
assertEquals(List.of(expected), news.getHeadlines());
32+
33+
news = client.toBlocking().retrieve(request, News.class);
34+
assertEquals(List.of(expected), news.getHeadlines());
35+
}
36+
}

‎test-suite-caffeine-native/src/test/java/io/micronaut/cache/NewsService.java

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
package io.micronaut.cache;
2+
3+
import io.micronaut.cache.annotation.CacheInvalidate;
4+
import io.micronaut.cache.annotation.CachePut;
5+
import io.micronaut.cache.annotation.Cacheable;
6+
import jakarta.inject.Singleton;
7+
8+
import java.time.Month;
9+
import java.util.ArrayList;
10+
import java.util.Collections;
11+
import java.util.HashMap;
12+
import java.util.List;
13+
import java.util.Map;
14+
import java.util.concurrent.TimeUnit;
15+
16+
@Singleton
17+
public class NewsService {
18+
19+
Map<Month, List<String>> headlines = new HashMap<>(Map.of(
20+
Month.NOVEMBER, List.of(
21+
"Micronaut Graduates to Trial Level in Thoughtworks technology radar Vol.1",
22+
"Micronaut AOP: Awesome flexibility without the complexity"
23+
),
24+
Month.OCTOBER, Collections.singletonList("Micronaut AOP: Awesome flexibility without the complexity")
25+
));
26+
27+
@SuppressWarnings("java:S2925") // Sleep is used for testing purposes only
28+
@Cacheable(value = "headlines", parameters = {"month"})
29+
public List<String> headlines(Month month) {
30+
try {
31+
TimeUnit.SECONDS.sleep(3);
32+
return headlines.get(month);
33+
} catch (InterruptedException e) {
34+
return null;
35+
}
36+
}
37+
38+
@CachePut(value = "headlines", parameters = {"month"})
39+
public List<String> addHeadline(Month month, String headline) {
40+
if (headlines.containsKey(month)) {
41+
List<String> l = new ArrayList<>(headlines.get(month));
42+
l.add(headline);
43+
headlines.put(month, l);
44+
} else {
45+
headlines.put(month, Collections.singletonList(headline));
46+
}
47+
return headlines.get(month);
48+
}
49+
50+
@CacheInvalidate(value = "headlines", parameters = {"month"})
51+
public void removeHeadline(Month month, String headline) {
52+
if (headlines.containsKey(month)) {
53+
List<String> l = new ArrayList<>(headlines.get(month));
54+
l.remove(headline);
55+
headlines.put(month, l);
56+
}
57+
}
58+
}

‎test-suite-caffeine-native/src/test/java/io/micronaut/cache/NewsServiceTest.java

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
package io.micronaut.cache;
2+
3+
import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
4+
import jakarta.inject.Inject;
5+
import org.junit.jupiter.api.MethodOrderer;
6+
import org.junit.jupiter.api.Order;
7+
import org.junit.jupiter.api.Test;
8+
import org.junit.jupiter.api.TestMethodOrder;
9+
import org.junit.jupiter.api.Timeout;
10+
11+
import java.time.Month;
12+
import java.util.List;
13+
14+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
15+
import static org.junit.jupiter.api.Assertions.assertEquals;
16+
17+
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
18+
@MicronautTest
19+
@SuppressWarnings("java:S5976") // Sonar thinks these can be parameterized
20+
class NewsServiceTest {
21+
22+
@Inject
23+
NewsService newsService;
24+
25+
@Timeout(4)
26+
@Test
27+
@Order(1)
28+
void firstInvocationOfNovemberDoesNotHitCache() {
29+
List<String> headlines = newsService.headlines(Month.NOVEMBER);
30+
assertEquals(2, headlines.size());
31+
}
32+
33+
@Timeout(1)
34+
@Test
35+
@Order(2)
36+
void secondInvocationOfNovemberHitsCache() {
37+
List<String> headlines = newsService.headlines(Month.NOVEMBER);
38+
assertEquals(2, headlines.size());
39+
}
40+
41+
@Timeout(4)
42+
@Test
43+
@Order(3)
44+
void firstInvocationOfOctoberDoesNotHitCache() {
45+
List<String> headlines = newsService.headlines(Month.OCTOBER);
46+
assertEquals(1, headlines.size());
47+
}
48+
49+
@Timeout(1)
50+
@Test
51+
@Order(4)
52+
void secondInvocationOfOctoberHitsCache() {
53+
List<String> headlines = newsService.headlines(Month.OCTOBER);
54+
assertEquals(1, headlines.size());
55+
}
56+
57+
@Timeout(1)
58+
@Test
59+
@Order(5)
60+
void addingAHeadlineToNovemberUpdatesCache() {
61+
List<String> headlines = newsService.addHeadline(Month.NOVEMBER, "Micronaut 1.3 Milestone 1 Released");
62+
assertEquals(3, headlines.size());
63+
}
64+
65+
@Timeout(1)
66+
@Test
67+
@Order(6)
68+
void novemberCacheWasUpdatedByCachePutAndThusTheValueIsRetrievedFromTheCache() {
69+
List<String> headlines = newsService.headlines(Month.NOVEMBER);
70+
assertEquals(3, headlines.size());
71+
}
72+
73+
@Timeout(1)
74+
@Test
75+
@Order(7)
76+
void invalidateNovemberCacheWithCacheInvalidate() {
77+
assertDoesNotThrow(() -> {
78+
newsService.removeHeadline(Month.NOVEMBER, "Micronaut 1.3 Milestone 1 Released");
79+
});
80+
}
81+
82+
@Timeout(1)
83+
@Test
84+
@Order(8)
85+
void octoberCacheIsStillValid() {
86+
List<String> headlines = newsService.headlines(Month.OCTOBER);
87+
assertEquals(1, headlines.size());
88+
}
89+
90+
@Timeout(4)
91+
@Test
92+
@Order(9)
93+
void novemberCacheWasInvalidated() {
94+
List<String> headlines = newsService.headlines(Month.NOVEMBER);
95+
assertEquals(2, headlines.size());
96+
}
97+
}

0 commit comments

Comments
 (0)