[Th2-5165] Use cache in BookInfo

.github/workflows/integration-tests.yml

@@ -0,0 +1,26 @@
+name: "Run integration tests for cradle admin tool"
+
+on:
+  push:
+    branches:
+      - '*'
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 'zulu' '11'
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+      - name: Build with Gradle
+        run: ./gradlew --info clean integrationTest
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: integration-test-results
+          path: build/reports/tests/integrationTest/

build.gradle

@@ -55,9 +55,8 @@ allprojects {
 
         implementation "org.slf4j:slf4j-api"
 
-        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
-        testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2'
-        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+        testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+        testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
         testImplementation 'org.mockito:mockito-inline:5.2.0'
         testImplementation 'org.mockito:mockito-junit-jupiter:5.10.0'

cradle-admin-tool-cli/src/test/java/com/exactpro/th2/cradle/adm/cli/BookCliTest.java

@@ -39,14 +39,14 @@ public class BookCliTest extends AbstractCliTest {
     public void addBookTest(@Th2AppFactory CommonFactory appFactory,
                             @Th2TestFactory CommonFactory testFactory) throws Exception {
         CradleStorage cradleStorage = testFactory.getCradleManager().getStorage();
+        int initNumberOfBooks = cradleStorage.listBooks().size();
 
         String bookName = "addBookTest";
 
         Application.run(new String[]{"-c=stub/", "--book", "-bookName", bookName}, args -> appFactory);
 
-        assertEquals(0, cradleStorage.getBooks().size());
         BookInfo bookInfo = cradleStorage.getBook(new BookId(bookName));
-        assertEquals(1, cradleStorage.getBooks().size());
+        assertEquals(initNumberOfBooks + 1, cradleStorage.listBooks().size());
         assertEquals(0, bookInfo.getPages().size());
 
         checkOutput(true, null);
@@ -56,14 +56,14 @@ public void addBookTest(@Th2AppFactory CommonFactory appFactory,
     public void addBookWithoutTimeTest(@Th2AppFactory CommonFactory appFactory,
                                        @Th2TestFactory CommonFactory testFactory) throws Exception {
         CradleStorage cradleStorage = testFactory.getCradleManager().getStorage();
+        int initNumberOfBooks = cradleStorage.listBooks().size();
 
         Instant i1 = Instant.now();
         String bookName = "addBookWithoutTimeTest";
         Application.run(new String[]{"-c=stub/", "--book", "-bookName", bookName}, args -> appFactory);
 
-        assertEquals(0, cradleStorage.getBooks().size());
         BookInfo bookInfo = cradleStorage.getBook(new BookId(bookName));
-        assertEquals(1, cradleStorage.getBooks().size());
+        assertEquals(initNumberOfBooks + 1, cradleStorage.listBooks().size());
         assertNotNull(bookInfo);
         assertNotNull(bookInfo.getCreated());
         assertTrue(bookInfo.getCreated().isAfter(i1));
@@ -76,6 +76,7 @@ public void addBookWithoutTimeTest(@Th2AppFactory CommonFactory appFactory,
     public void addBookWithParamsTest(@Th2AppFactory CommonFactory appFactory,
                                       @Th2TestFactory CommonFactory testFactory) throws Exception {
         CradleStorage cradleStorage = testFactory.getCradleManager().getStorage();
+        int initNumberOfBooks = cradleStorage.listBooks().size();
 
         Instant created = Instant.now().minus(20, ChronoUnit.MINUTES);
         String bookName = "addBookWithParamsTest";
@@ -89,9 +90,8 @@ public void addBookWithParamsTest(@Th2AppFactory CommonFactory appFactory,
                 args -> appFactory);
 
 
-        assertEquals(0, cradleStorage.getBooks().size());
         BookInfo bookInfo = cradleStorage.getBook(bookId);
-        assertEquals(1, cradleStorage.getBooks().size());
+        assertEquals(initNumberOfBooks + 1, cradleStorage.listBooks().size());
         assertNotNull(bookInfo);
         assertEquals(bookFullName, bookInfo.getFullName());
         assertEquals(bookDesc, bookInfo.getDesc());
@@ -105,12 +105,13 @@ public void addBookWithParamsTest(@Th2AppFactory CommonFactory appFactory,
     public void addExistedBookTest(@Th2AppFactory CommonFactory appFactory,
                                    @Th2TestFactory CommonFactory testFactory) throws Exception {
         CradleStorage cradleStorage = testFactory.getCradleManager().getStorage();
+        int initNumberOfBooks = cradleStorage.listBooks().size();
+
         String bookName = "addExistedBookTest";
         BookId bookId = new BookId(bookName);
-        assertEquals(0, cradleStorage.getBooks().size());
         testBookPageBuilder.addBookIds(bookName, Instant.now())
                 .exec(cradleStorage);
-        assertEquals(1, cradleStorage.getBooks().size());
+        assertEquals(initNumberOfBooks + 1, cradleStorage.listBooks().size());
 
         Application.run(new String[]{"-c=stub/", "--book", "-bookName", bookName}, args -> appFactory);
 

cradle-admin-tool-http/build.gradle

@@ -27,10 +27,6 @@ application {
     mainClassName = "com.exactpro.th2.cradle.adm.http.Application"
 }
 
-test {
-    useJUnitPlatform()
-}
-
 applicationName = 'service'
 
 distTar {

gradle.properties

@@ -1 +1 @@
-release_version = 1.9.0
+release_version = 1.9.0