From patchwork Mon Jun 20 19:26:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 40198 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D784327BBEA; Mon, 20 Jun 2022 20:37:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2060927BBE9 for ; Mon, 20 Jun 2022 20:37:59 +0100 (BST) Received: from localhost ([::1]:48724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3NDi-0000ES-5X for patchwork@mira.cbaines.net; Mon, 20 Jun 2022 15:37:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3N38-0007go-60 for guix-patches@gnu.org; Mon, 20 Jun 2022 15:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36355) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o3N37-0007up-TZ for guix-patches@gnu.org; Mon, 20 Jun 2022 15:27:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o3N37-0004It-Qo for guix-patches@gnu.org; Mon, 20 Jun 2022 15:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56112] [PATCH] gnu: Add java-lambdatest Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Jun 2022 19:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56112@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165575318816499 (code B ref -1); Mon, 20 Jun 2022 19:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jun 2022 19:26:28 +0000 Received: from localhost ([127.0.0.1]:58485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3N2a-0004I2-37 for submit@debbugs.gnu.org; Mon, 20 Jun 2022 15:26:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:41616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3N2S-0004Hp-Cr for submit@debbugs.gnu.org; Mon, 20 Jun 2022 15:26:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3N2S-0006iY-4u for guix-patches@gnu.org; Mon, 20 Jun 2022 15:26:20 -0400 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]:37517) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o3N2Q-0007re-53 for guix-patches@gnu.org; Mon, 20 Jun 2022 15:26:19 -0400 Received: by mail-lf1-x131.google.com with SMTP id t24so6561058lfr.4 for ; Mon, 20 Jun 2022 12:26:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:user-agent:mime-version; bh=cJYhXqXWXpoYbpMzvBzXBvzVYnWSJbVJJM+82WdaxvM=; b=MI+PNHL8vJLH5axZKmMk9i33n0lLnDyeNwHlte2kAN7Az113Ecn5vEt4cdWw/Hh5v9 xxM/hFDDX4P6fDajuAQzKd2fVtgkSKnK6Rnvl58hMbsaccuXDrFQAcYsuuVLAd8NlijX 6/JrUYr+B38ia3ovJybaZTerPWtUaoqhJ3aTYHnEJhnz+MT2ML6mIIUT3DAmxKG8AzT0 GHR/ekZjvB2H+DSQ2GYCxBloGeSUC/08PM6U8Q3C66NhNQ5/BW2mA3pjIgJIEeHzGusx WhdkNjyioI5tnIk2l5xRKDsVL8vm57UNeBHgo3BjAFmyxeLqMwViwpkmwaqBjDxcXBly fKoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:user-agent :mime-version; bh=cJYhXqXWXpoYbpMzvBzXBvzVYnWSJbVJJM+82WdaxvM=; b=Rt2+wh4ilMbNHUE/2sqz6YFndOErtPdZI5TEqD5+6ezke1cw4m8oLB+qfmrZ03gBoo jemcNCNKcPVwiYTD4wXUDUJBwy+UFc2d/oPzOS670LvDQFnRfOKxNo/dbNRpdma3K1iI oQYlaXGBTMcHjx4TdzOs6HzuIYbyBpUZJX2Y7edW+32n4dfRGdHWjqRjcjdQFtPQ/szN rlPmSqKIA73nlNcLwXbUdMUg0rkXAOGDM81/HAc0oZ4LpSJhWQukKNFQiTpetBSCZaBZ gFWeH1uvbkm66NLlePpggvMMv7aimyzcjxtABKbLMstXxwyTV972yN+lsGDgFEWM7qm+ gd9g== X-Gm-Message-State: AJIora8Ef3Z2Rd4GV+HeejDnQrDKUgn0tjCi45u13gn+r9qCZZu6eBkR IoHmHDU2KRtV7ksCRofVHQ8sESxPM4c= X-Google-Smtp-Source: AGRyM1uf2BKUmn83MwD2ARQ1ecbsczzBxRr3Fy7ndfuPvoSfaPgHLdIgiCib4Rt8jk1HHxKe4anOZg== X-Received: by 2002:a05:6512:3a84:b0:479:209a:578a with SMTP id q4-20020a0565123a8400b00479209a578amr14051517lfu.292.1655753175443; Mon, 20 Jun 2022 12:26:15 -0700 (PDT) Received: from elephant ([5.164.222.47]) by smtp.gmail.com with ESMTPSA id q11-20020a05651232ab00b0047f6e07ded3sm629145lfe.152.2022.06.20.12.26.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jun 2022 12:26:14 -0700 (PDT) From: "Artyom V. Poptsov" Date: Mon, 20 Jun 2022 22:26:10 +0300 Message-ID: <87r13j3zn1.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::131; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x131.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello, this patch adds "LambdaTest" under the name "java-lambdatest". [1] "LambdaTest" package is required to pack "java-cmdoption" [2] package properly. Thanks, - Artyom References: 1. LambdaTest - Lambda-enabled functional testing API on top of JUnit and TestNG 2. CmdOption is a simple annotation-driven command line parser toolkit for Java 6+ applications that is configured through annotations. From 2eff8e7fc79336f6eb7795fd942daeb07da63f00 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Mon, 20 Jun 2022 22:06:28 +0300 Subject: [PATCH] gnu: Add java-lambdatest * gnu/packages/java.scm (java-lambdatest): New variable. * gnu/packages/patches/java-lambdatest-fix.patch: Add to the repository. * gnu/local.mk (dist_patch_DATA): Add 'java-lambdatest-fix.patch'. --- gnu/local.mk | 1 + gnu/packages/java.scm | 56 +++++++++++++++++++ .../patches/java-lambdatest-fix.patch | 29 ++++++++++ 3 files changed, 86 insertions(+) create mode 100644 gnu/packages/patches/java-lambdatest-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 197c8679eb..2f0a187125 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1321,6 +1321,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-commons-collections-fix-java8.patch \ %D%/packages/patches/java-commons-lang-fix-dependency.patch \ %D%/packages/patches/java-jeromq-fix-tests.patch \ + %D%/packages/patches/java-lambdatest-fix.patch \ %D%/packages/patches/java-openjfx-build-jdk_version.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ %D%/packages/patches/java-simple-xml-fix-tests.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7b0507d93c..794ccf22f7 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -14282,3 +14282,59 @@ The following TLA+ tools are available in this distribution: @item The PlusCal translator. @end itemize") (license license:expat)))) + +(define-public java-lambdatest + (package + (name "java-lambdatest") + (version "0.7.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lefou/LambdaTest") + (commit version))) + (patches + (search-patches "java-lambdatest-fix.patch")) + (sha256 + (base32 + "172wz2cxrwganx0xwx395z627ph9b20hj8mw21fygq8hwcvmy94m")))) + (build-system ant-build-system) + (native-inputs (list openjdk11 java-logback-classic java-logback-core)) + (inputs (list java-junit + java-slf4j-api + java-testng)) + (arguments + `(#:jar-name "lambdatest.jar" + #:source-dir "src/main" + #:test-dir "src/test" + #:jdk ,openjdk11 + #:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "ant" "compile-tests") + (let ((tests (filter + (lambda (file-name) + ;; Remove non-working tests. + (not (string-contains file-name + "RuntimeTest"))) + (find-files "build" ".*Test.class"))) + (classpath (string-append + (getenv "CLASSPATH") + ":build/classes" + ":build/test-classes"))) + (catch #t + (lambda _ + (invoke "java" + "-cp" classpath + "org.testng.TestNG" "-testclass" + (string-join tests ","))) + (lambda (exception c) + ;; XXX: TestNG exits with exit code 2 when some + ;; tests are skipped. Just ignore this. + (unless (= (invoke-error-exit-status c) 2) + (throw exception c)) + #t)))))))) + (home-page "https://github.com/lefou/LambdaTest") + (synopsis "Functional testing API on top of JUnit and TestNG") + (description "Lambda-enabled functional testing on top of JUnit and +TestNG.") + (license license:asl2.0))) diff --git a/gnu/packages/patches/java-lambdatest-fix.patch b/gnu/packages/patches/java-lambdatest-fix.patch new file mode 100644 index 0000000000..e04ff0471f --- /dev/null +++ b/gnu/packages/patches/java-lambdatest-fix.patch @@ -0,0 +1,29 @@ +From 49645c94fc8bdbea342d6f96d46e0405b81b874c Mon Sep 17 00:00:00 2001 +From: "Artyom V. Poptsov" +Date: Sun, 19 Jun 2022 23:11:42 +0300 +Subject: [PATCH] test: Fix tests + +* src/test/java/de/tobiasroeser/lambdatest/AssertTest.java + (testAssertEqualsInteger): Fix a regex so it will match the actual test + output. + +--- + src/test/java/de/tobiasroeser/lambdatest/AssertTest.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/test/java/de/tobiasroeser/lambdatest/AssertTest.java b/src/test/java/de/tobiasroeser/lambdatest/AssertTest.java +index fe2db12..5ef5ab3 100644 +--- a/src/test/java/de/tobiasroeser/lambdatest/AssertTest.java ++++ b/src/test/java/de/tobiasroeser/lambdatest/AssertTest.java +@@ -51,7 +51,7 @@ public class AssertTest { + Assert.assertEquals(0, 0); + Assert.assertEquals(Integer.valueOf(0), 0); + Assert.assertEquals(0, Integer.valueOf(0)); +- intercept(AssertionError.class, "\\QActual 0 is not equal to 1.\\E", () -> { ++ intercept(AssertionError.class, "\\QActual false is not equal to true\\E", () -> { + Assert.assertEquals(0, 1); + }); + intercept(AssertionError.class, "\\QActual 0 is not equal to 1.\\E", () -> { +-- +2.25.1 + -- 2.25.1