From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mFttIZRGxWT1FQEASxT56A (envelope-from ) for ; Sat, 29 Jul 2023 19:04:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id eFVhIZRGxWRBUwAAauVa8A (envelope-from ) for ; Sat, 29 Jul 2023 19:04:20 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 185E240CD6 for ; Sat, 29 Jul 2023 19:04:20 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=gn6x24pg; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1690650260; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=cYkQuNL3WWJpfJp4Foi1o7XfPjreVCIQUPZXODjWmZU=; b=GUsW9lajOWxrBRn1Bkl+XKUr0yeNiNfdyI1vYB8ztDEtybtv63vZsVf3QW19M5ye4z+aIS GSVcDfkwWQbZQIGPC5YcmhcJRE2q/JJmsj3tH6EVsCHaCM/eWZTCU7HhxLi44eQ25Dd16L 8jqx1VtAFe3Ogcgn5Kefqv2Rnfbf9y1lmzJONLJvPWavL/H32USAR09fTdp6fZNaaeF9Ge +2M67R0CvmuKHJSRQARNEAw2b/M68o0rUPRwyByQwh6zM9SwOmKSZVQL7OV8OwjoQb2WuR gEAOvllFUp2bzxLy6AYTwWzMWvmQQtKRy9c+6HOIfLeLd+3DeFwpoUtQsUNwbA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1690650260; a=rsa-sha256; cv=none; b=RMTBr9CQ/HRIdq3oRnM3R+uasfv4Orm1NMjqMw7w83L/th2CdoNrWShFX2vv7jc8F5Lw8Q 9d/ccakGBH19218xqyFyXg+o7jcyFl8mhD461tR8I7LG9Zv7hFJPaPo9ugixh50SAzY0JP u5LwM4yxk62A06lU4oqD4o6AWdaAGrMXPjpLG/owIJJ9ko9yYpz0sb0vzH5BFxjcS3iUd4 XSuTWQ2M9Pr24YPBFzIzmN3ElBb37GnbF7yJbUfQGM2yDN/0dA8iFfETchIscA/9cjRPNH fui0PBUwZUk3BSCEyFY+QENz6mJkNAQqf60tmEtW0wbza1zeTkbutobgolbRXQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=gn6x24pg; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPn9p-0000x0-BZ; Sat, 29 Jul 2023 12:51:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPn9o-0000wA-8D for guix-patches@gnu.org; Sat, 29 Jul 2023 12:51:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qPn9o-0000ix-0Q for guix-patches@gnu.org; Sat, 29 Jul 2023 12:51:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qPn9n-0005Cz-S5; Sat, 29 Jul 2023 12:51:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64934] [PATCH 08/42] gnu: Add java-easymock version 3.2. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: bjoern.hoefling@bjoernhoefling.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Sat, 29 Jul 2023 16:51:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64934 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64934@debbugs.gnu.org Cc: bjoern.hoefling@bjoernhoefling.de, julien@lepiller.eu X-Debbugs-Original-Xcc: bjoern.hoefling@bjoernhoefling.de, julien@lepiller.eu Received: via spool by 64934-submit@debbugs.gnu.org id=B64934.169064946019894 (code B ref 64934); Sat, 29 Jul 2023 16:51:07 +0000 Received: (at 64934) by debbugs.gnu.org; 29 Jul 2023 16:51:00 +0000 Received: from localhost ([127.0.0.1]:48754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPn9f-0005AW-0y for submit@debbugs.gnu.org; Sat, 29 Jul 2023 12:51:00 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:48607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPn9S-00056G-9s for 64934@debbugs.gnu.org; Sat, 29 Jul 2023 12:50:47 -0400 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-5222a38c0a0so4322330a12.1 for <64934@debbugs.gnu.org>; Sat, 29 Jul 2023 09:50:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690649440; x=1691254240; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=cYkQuNL3WWJpfJp4Foi1o7XfPjreVCIQUPZXODjWmZU=; b=gn6x24pgPfxA4g/ztgZ9rExrWnWH78CRR3F7EW+nsREmVIOxbpmCPfl2rCh2S1sY7u YPdR4M4sZvlmOxOpYiubFuZauWq0x6/K5uLZrevkno0GpbQPWc7XVCoxy4ytO+KzCQLa LPwc5ke1WXqHKgNYy7LRLW9fygvyYmitP2bVBGB3TJPNmQbmlTSN4r/hU/KVVqig93xS BhC9/qxE4KmQUKW76tLNU/74vL5WT+4xCwPd+ExmUMz3zS9DWPM3TwGdMqFY0NfLOjzo 2bwEh5Tjia69bmQQw3BXHm9mDc7JTBgXPKMdKrQy9W7/ELx+hUsp3VpTUnOaI1FwtdlR +rvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690649440; x=1691254240; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cYkQuNL3WWJpfJp4Foi1o7XfPjreVCIQUPZXODjWmZU=; b=X5Imviw5mRuzLBKqz+IvOcgTugJDwLyqUDvLO2e1erly+JPxXMaMN0tUG1ybZyuXy/ eUxqovVXupTdGzkm3MjERYBIHU5pp6Jz6jI2DjJU5RF31nKSqHqDh0Hdaiu4+DqR+/pO zsGTozpCLBM93DMVDXyD5nhCSXVI/gBggyDHnx/Dheupp99j37S2RpH7QZtUgBu8Hun8 p1anhDFSnGjxujX3YZVQ+b8BbMkqcc5bCsoQR9S9iMjdq7cLfKqFYWwwqFaZzRkyrhBT Po2ElXmkb4r/AILLJ5li1R1yEhqRKShCnYlezDw/2AQvyd9G4Zz+2U31N5YvX1ib3Qhk CdHw== X-Gm-Message-State: ABy/qLZv6HUGErRAvdJ793H5Up++lLfxegdy1xA2rudHwDVcprkJ7NCt rPGQIHZmJyxCzoguaYVXV9CRwTblljd4OA== X-Google-Smtp-Source: APBJJlEz/Bp53M+6eHPrsqfCyfQ8MdCBKNS3iC/PrFq4VFHD5379fx0JiDxyIVi3FahuqfWJHbnbew== X-Received: by 2002:a17:907:1dc9:b0:99b:c2b2:e498 with SMTP id og9-20020a1709071dc900b0099bc2b2e498mr2421269ejc.52.1690649440671; Sat, 29 Jul 2023 09:50:40 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a24-20020a170906245800b0099bcd1fa5b0sm3473807ejb.192.2023.07.29.09.50.40 for <64934@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 09:50:40 -0700 (PDT) Message-ID: <54e8fe4f3a701cd960882a7347f7655c6d32e3d5.1690646441.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:20:11 +0200 MIME-Version: 1.0 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: 4.36 X-Spam-Score: 4.36 X-Migadu-Queue-Id: 185E240CD6 X-TUID: CwNsmhz2lIEi * gnu/packages/java.scm (java-easymock-3.2): New variable. --- gnu/packages/java.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index dd6c549a25..b2ad568375 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5019,6 +5019,47 @@ (define-public java-easymock mock objects in unit testing.") (license license:asl2.0))) +(define-public java-easymock-3.2 + (package + (inherit java-easymock) + (name "java-easymock") + (version "3.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/easymock/easymock/") + (commit (string-append "easymock-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cn6qqa261mhk9mwxrsz39lkkknfv2h7iprr5zw7wpz9p96dwgv4")))) + (arguments + (list #:jar-name "easymock.jar" + #:source-dir "easymock/src/main" + #:test-dir "easymock/src/test" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-android-support + (lambda _ + (with-directory-excursion "easymock/src/main/java/org/easymock/internal" + (substitute* "MocksControl.java" + (("AndroidSupport.isAndroid\\(\\)") "false") + (("return classProxyFactory = new AndroidClassProxyFactory\\(\\);") "")) + (delete-file "AndroidClassProxyFactory.java")))) + (add-after 'unpack 'delete-broken-tests + (lambda _ + (with-directory-excursion "easymock/src/test/java/org/easymock" + ;; This test depends on dexmaker. + (delete-file "tests2/ClassExtensionHelperTest.java") + ;; This is not a test. + (delete-file "tests/BaseEasyMockRunnerTest.java") + ;; ...but deleting it means that we also have to delete these + ;; dependent files. + (delete-file "tests2/EasyMockRunnerTest.java") + ;; This test fails because the file "easymock.properties" does + ;; not exist. + (delete-file "tests2/EasyMockPropertiesTest.java"))))))))) + (define-public java-jmock-1 (package (name "java-jmock") -- 2.41.0