From c0fa7cf02179c972ea0ae279cc1670f2a4427c1f Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Wed, 25 Aug 2021 16:35:20 +0200 Subject: dev-java/stringtemplate: remove unused patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger Closes: https://github.com/gentoo/gentoo/pull/22098 Signed-off-by: Miroslav Šulc --- .../stringtemplate/files/3.2.1-test-fixes.patch | 53 ---------------------- 1 file changed, 53 deletions(-) delete mode 100644 dev-java/stringtemplate/files/3.2.1-test-fixes.patch (limited to 'dev-java/stringtemplate') diff --git a/dev-java/stringtemplate/files/3.2.1-test-fixes.patch b/dev-java/stringtemplate/files/3.2.1-test-fixes.patch deleted file mode 100644 index fd625abd0668..000000000000 --- a/dev-java/stringtemplate/files/3.2.1-test-fixes.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://github.com/antlr/stringtemplate3/pull/3 - ---- test/org/antlr/stringtemplate/test/TestStringTemplate.java.orig 2015-09-18 22:04:18.131902875 +0100 -+++ test/org/antlr/stringtemplate/test/TestStringTemplate.java 2015-09-18 22:04:21.651848456 +0100 -@@ -36,6 +36,10 @@ - import java.text.SimpleDateFormat; - import java.util.*; - -+import org.junit.FixMethodOrder; -+import org.junit.runners.MethodSorters; -+ -+@FixMethodOrder(MethodSorters.NAME_ASCENDING) - public class TestStringTemplate extends TestCase { - static final String newline = System.getProperty("line.separator"); - -@@ -87,7 +91,7 @@ - assertEquals(expecting,I.toString()); - } - -- public void testNoGroupLoader() throws Exception { -+ public void testAaaNoGroupLoader() throws Exception { - // this also tests the group loader - StringTemplateErrorListener errors = new ErrorBuffer(); - String tmpdir = System.getProperty("java.io.tmpdir"); -@@ -2214,8 +2218,12 @@ - s.add("2"); - s.add("3"); - st.setAttribute("items", s); -- expecting = "
  • 3
  • 2
  • 1
    • "; -- assertEquals(expecting, st.toString()); -+ String[] split = st.toString().split("(){1,2}"); -+ Arrays.sort(split); -+ assertEquals("", split[0]); -+ assertEquals("1", split[1]); -+ assertEquals("2", split[2]); -+ assertEquals("3", split[3]); - } - - public void testDumpMapAndSet() throws Exception { -@@ -2235,8 +2243,11 @@ - s.add("2"); - s.add("3"); - st.setAttribute("items", s); -- expecting = "3,2,1"; -- assertEquals(expecting, st.toString()); -+ String[] split = st.toString().split(","); -+ Arrays.sort(split); -+ assertEquals("1", split[0]); -+ assertEquals("2", split[1]); -+ assertEquals("3", split[2]); - } - - public class Connector3 { -- cgit v1.2.3-65-gdbad