Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/
Date: Thu, 26 Aug 2021 06:17:19
Message-Id: 1629958623.c0fa7cf02179c972ea0ae279cc1670f2a4427c1f.fordfrog@gentoo
1 commit: c0fa7cf02179c972ea0ae279cc1670f2a4427c1f
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Wed Aug 25 14:35:20 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 26 06:17:03 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0fa7cf0
7
8 dev-java/stringtemplate: remove unused patch
9
10 Package-Manager: Portage-3.0.22, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/22098
13 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
14
15 .../stringtemplate/files/3.2.1-test-fixes.patch | 53 ----------------------
16 1 file changed, 53 deletions(-)
17
18 diff --git a/dev-java/stringtemplate/files/3.2.1-test-fixes.patch b/dev-java/stringtemplate/files/3.2.1-test-fixes.patch
19 deleted file mode 100644
20 index fd625abd066..00000000000
21 --- a/dev-java/stringtemplate/files/3.2.1-test-fixes.patch
22 +++ /dev/null
23 @@ -1,53 +0,0 @@
24 -https://github.com/antlr/stringtemplate3/pull/3
25 -
26 ---- test/org/antlr/stringtemplate/test/TestStringTemplate.java.orig 2015-09-18 22:04:18.131902875 +0100
27 -+++ test/org/antlr/stringtemplate/test/TestStringTemplate.java 2015-09-18 22:04:21.651848456 +0100
28 -@@ -36,6 +36,10 @@
29 - import java.text.SimpleDateFormat;
30 - import java.util.*;
31 -
32 -+import org.junit.FixMethodOrder;
33 -+import org.junit.runners.MethodSorters;
34 -+
35 -+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
36 - public class TestStringTemplate extends TestCase {
37 - static final String newline = System.getProperty("line.separator");
38 -
39 -@@ -87,7 +91,7 @@
40 - assertEquals(expecting,I.toString());
41 - }
42 -
43 -- public void testNoGroupLoader() throws Exception {
44 -+ public void testAaaNoGroupLoader() throws Exception {
45 - // this also tests the group loader
46 - StringTemplateErrorListener errors = new ErrorBuffer();
47 - String tmpdir = System.getProperty("java.io.tmpdir");
48 -@@ -2214,8 +2218,12 @@
49 - s.add("2");
50 - s.add("3");
51 - st.setAttribute("items", s);
52 -- expecting = "<li>3</li><li>2</li><li>1</li>";
53 -- assertEquals(expecting, st.toString());
54 -+ String[] split = st.toString().split("(</?li>){1,2}");
55 -+ Arrays.sort(split);
56 -+ assertEquals("", split[0]);
57 -+ assertEquals("1", split[1]);
58 -+ assertEquals("2", split[2]);
59 -+ assertEquals("3", split[3]);
60 - }
61 -
62 - public void testDumpMapAndSet() throws Exception {
63 -@@ -2235,8 +2243,11 @@
64 - s.add("2");
65 - s.add("3");
66 - st.setAttribute("items", s);
67 -- expecting = "3,2,1";
68 -- assertEquals(expecting, st.toString());
69 -+ String[] split = st.toString().split(",");
70 -+ Arrays.sort(split);
71 -+ assertEquals("1", split[0]);
72 -+ assertEquals("2", split[1]);
73 -+ assertEquals("3", split[2]);
74 - }
75 -
76 - public class Connector3 {