diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-java/stringtemplate/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-java/stringtemplate/files')
-rw-r--r-- | dev-java/stringtemplate/files/3.2.1-test-fixes.patch | 53 | ||||
-rw-r--r-- | dev-java/stringtemplate/files/4.0.8-test-fixes.patch | 38 |
2 files changed, 0 insertions, 91 deletions
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 = "<li>3</li><li>2</li><li>1</li>"; -- assertEquals(expecting, st.toString()); -+ String[] split = st.toString().split("(</?li>){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 { diff --git a/dev-java/stringtemplate/files/4.0.8-test-fixes.patch b/dev-java/stringtemplate/files/4.0.8-test-fixes.patch deleted file mode 100644 index 9480abe3ed3f..000000000000 --- a/dev-java/stringtemplate/files/4.0.8-test-fixes.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur test.orig/org/stringtemplate/v4/test/TestGroups.java test/org/stringtemplate/v4/test/TestGroups.java ---- test.orig/org/stringtemplate/v4/test/TestGroups.java 2014-03-25 11:55:55.000000000 +0000 -+++ test/org/stringtemplate/v4/test/TestGroups.java 2015-09-13 11:01:07.999800299 +0100 -@@ -29,6 +29,7 @@ - - import org.junit.Assert; - import org.junit.Test; -+import org.junit.Ignore; - import org.stringtemplate.v4.ST; - import org.stringtemplate.v4.STErrorListener; - import org.stringtemplate.v4.STGroup; -@@ -527,6 +528,7 @@ - assertEquals(expected, result); - } - -+ @Ignore - @Test public void testUnknownNamedArg() throws Exception { - String dir = getRandomDir(); - String groupFile = -diff -Naur test.orig/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java ---- test.orig/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java 2014-03-25 11:55:55.000000000 +0000 -+++ test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java 2015-09-13 11:01:05.011850826 +0100 -@@ -28,6 +28,7 @@ - package org.stringtemplate.v4.test; - - import org.junit.Test; -+import org.junit.Ignore; - import org.stringtemplate.v4.STErrorListener; - import org.stringtemplate.v4.STGroup; - import org.stringtemplate.v4.STGroupFile; -@@ -36,6 +37,7 @@ - import static org.junit.Assert.assertEquals; - - public class TestGroupSyntaxErrors extends BaseTest { -+ @Ignore - @Test public void testMissingImportString() throws Exception { - String templates = - "import\n" + |