From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2FCD21382C5 for ; Sat, 29 May 2021 15:58:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F7CCE0802; Sat, 29 May 2021 15:58:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46767E0802 for ; Sat, 29 May 2021 15:58:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A9A7340F15 for ; Sat, 29 May 2021 15:58:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95D1978B for ; Sat, 29 May 2021 15:58:38 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1622303913.2419e959eba7ba4945452325216df3ce7c0b1bf7.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild X-VCS-Directories: dev-java/stringtemplate/ dev-java/stringtemplate/files/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 2419e959eba7ba4945452325216df3ce7c0b1bf7 X-VCS-Branch: master Date: Sat, 29 May 2021 15:58:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c5ae5615-bbbb-43c9-a5b2-f90aed4ae37f X-Archives-Hash: 4b02c30833f5c58822054de250c5cf62 commit: 2419e959eba7ba4945452325216df3ce7c0b1bf7 Author: Miroslav Šulc gentoo org> AuthorDate: Sat May 29 15:58:15 2021 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sat May 29 15:58:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2419e959 dev-java/strimgtemplate: fixed tests in 4.0.8-r1 Closes: https://bugs.gentoo.org/791718 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> .../files/stringtemplate-4.0.8-fix-tests.patch | 72 ++++++++++++++++++++++ .../stringtemplate/stringtemplate-4.0.8-r1.ebuild | 1 + 2 files changed, 73 insertions(+) diff --git a/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch b/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch new file mode 100644 index 00000000000..994fd42ad5e --- /dev/null +++ b/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch @@ -0,0 +1,72 @@ +From 3ea94a870b6e139399abbf932da1dfa2f9bd37e3 Mon Sep 17 00:00:00 2001 +From: parrt +Date: Thu, 8 Nov 2018 11:40:24 -0800 +Subject: [PATCH] make tests work with java 10 and 6, 7, 8 + +--- + .../stringtemplate/v4/test/TestRenderers.java | 24 +++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/test/org/stringtemplate/v4/test/TestRenderers.java b/test/org/stringtemplate/v4/test/TestRenderers.java +index bc5406f7..7b7536e0 100644 +--- a/test/org/stringtemplate/v4/test/TestRenderers.java ++++ b/test/org/stringtemplate/v4/test/TestRenderers.java +@@ -48,6 +48,8 @@ + + public class TestRenderers extends BaseTest { + ++ String javaVersion = System.getProperty("java.version"); ++ + // Make sure to use the US Locale during the tests + private Locale origLocale; + +@@ -73,6 +75,9 @@ public void tearDown() { + ST st = group.getInstanceOf("dateThing"); + st.add("created", new GregorianCalendar(2005, 7 - 1, 5)); + String expecting = "datetime: 7/5/05, 12:00 AM"; ++ if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { ++ expecting = "datetime: 7/5/05 12:00 AM"; ++ } + String result = st.render(); + assertEquals(expecting, result); + } +@@ -99,7 +104,10 @@ public void tearDown() { + ST st = group.getInstanceOf("dateThing"); + st.add("created", new GregorianCalendar(2005, 7 - 1, 5)); + String expecting = " datetime: 7/5/05, 12:00 AM "; +- String result = st.render(); ++ if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { ++ expecting = " datetime: 7/5/05 12:00 AM "; ++ } ++ String result = st.render(); + assertEquals(expecting, result); + } + +@@ -116,9 +124,13 @@ public void tearDown() { + TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles")); + st.add("created", new GregorianCalendar(2005, 7 - 1, 5)); + String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time "; +- String result = st.render(); ++ if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { ++ expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT "; ++ } ++ String result = st.render(); + assertEquals(expecting, result); +- } finally { ++ } ++ finally { + // Restore original Timezone + TimeZone.setDefault(origTimeZone); + } +@@ -371,6 +383,10 @@ public void tearDown() { + cal.set(2012, Calendar.JUNE, 12); + st.add("date", cal); + +- assertEquals("12 de junho de 2012", st.render(new Locale("pt"))); ++ String expected = "12 de junho de 2012"; ++ if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { ++ expected = "12 de Junho de 2012"; ++ } ++ assertEquals(expected, st.render(new Locale("pt"))); + } + } diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild index c2fba7061b0..72831a73fdb 100644 --- a/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild +++ b/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild @@ -37,6 +37,7 @@ JAVA_SRC_DIR="src" PATCHES=( # These tests are broken but are probably fixed in current master. "${FILESDIR}/4.0.8-r1-test-fixes.patch" + "${FILESDIR}/${P}-fix-tests.patch" ) src_unpack() {