[bookkeeper] branch master updated: Migrate bookkeepr-server org.apache.bookkeeper.bookie.* tests to gradle (#2809)

[eo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 5409464  Migrate bookkeepr-server org.apache.bookkeeper.bookie.* tests to gradle (#2809)
5409464 is described below

commit 540946422544cce8a6ac74e3b99c446c398ac59a
Author: Prashant Kumar <65...@users.noreply.github.com>
AuthorDate: Wed Sep 29 00:48:52 2021 -0700

    Migrate bookkeepr-server org.apache.bookkeeper.bookie.* tests to gradle (#2809)
---
 .github/workflows/bookie-tests.yml                      | 17 ++---------------
 .../bookie/{TestEntryLog.java => EntryLogTest.java}     |  4 ++--
 ...erStorage.java => InterleavedLedgerStorageTest.java} |  6 +++---
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/bookie-tests.yml b/.github/workflows/bookie-tests.yml
index 394a67b..ff18df1 100644
--- a/.github/workflows/bookie-tests.yml
+++ b/.github/workflows/bookie-tests.yml
@@ -29,10 +29,6 @@ on:
       - 'site/**'
     workflow_dispatch:
 
-
-env:
-  MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
-
 jobs:
   test:
 
@@ -50,14 +46,5 @@ jobs:
         with:
           java-version: 1.8
 
-      - name: Maven build bookkeeper-server
-        run: mvn -B -nsu -am -pl bookkeeper-server clean install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
-
-      - name: Run EntryLogTests
-        run: mvn -B -nsu -pl bookkeeper-server test -Dtest="org.apache.bookkeeper.bookie.TestEntryLog" -DfailIfNoTests=false -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
-
-      - name: Run InterleavedLedgerStorageTest
-        run: mvn -B -nsu -pl bookkeeper-server test -Dtest="org.apache.bookkeeper.bookie.TestInterleavedLederStorage" -DfailIfNoTests=false -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
-
-      - name: Run bookie tests
-        run: mvn -B -nsu -pl bookkeeper-server test -Dtest="org.apache.bookkeeper.bookie.*Test" -DfailIfNoTests=false -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
+      - name: Run bookie test
+        run: ./gradlew bookkeeper-server:test --tests="org.apache.bookkeeper.bookie.*" -Dtestlogger.theme=plain
\ No newline at end of file
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestEntryLog.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
similarity index 99%
rename from bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestEntryLog.java
rename to bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
index 5f72dd9..045e437 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestEntryLog.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
@@ -77,8 +77,8 @@ import org.slf4j.LoggerFactory;
  * Tests for EntryLog.
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestEntryLog {
-    private static final Logger LOG = LoggerFactory.getLogger(TestEntryLog.class);
+public class EntryLogTest {
+    private static final Logger LOG = LoggerFactory.getLogger(EntryLogTest.class);
 
     final List<File> tempDirs = new ArrayList<File>();
     final Random rand = new Random();
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestInterleavedLedgerStorage.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorageTest.java
similarity index 98%
rename from bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestInterleavedLedgerStorage.java
rename to bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorageTest.java
index 050d0e9..b403bb7 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestInterleavedLedgerStorage.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorageTest.java
@@ -68,15 +68,15 @@ import org.slf4j.LoggerFactory;
  * Test for InterleavedLedgerStorage.
  */
 @RunWith(Parameterized.class)
-public class TestInterleavedLedgerStorage {
-    private static final Logger LOG = LoggerFactory.getLogger(TestInterleavedLedgerStorage.class);
+public class InterleavedLedgerStorageTest {
+    private static final Logger LOG = LoggerFactory.getLogger(InterleavedLedgerStorageTest.class);
 
     @Parameterized.Parameters
     public static Iterable<Boolean> elplSetting() {
         return Arrays.asList(true, false);
     }
 
-    public TestInterleavedLedgerStorage(boolean elplSetting) {
+    public InterleavedLedgerStorageTest(boolean elplSetting) {
         conf.setEntryLogSizeLimit(2048);
         conf.setEntryLogPerLedgerEnabled(elplSetting);
     }