* [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/
@ 2021-05-24 6:38 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2021-05-24 6:38 UTC (permalink / raw
To: gentoo-commits
commit: 43ef1fcc34f28ffe540618dc4a8e89ae18ad6557
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun May 23 14:50:48 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon May 24 06:37:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ef1fcc
dev-java/stringtemplate: remove unused patch
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20950
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../stringtemplate/files/4.0.8-test-fixes.patch | 38 ----------------------
1 file changed, 38 deletions(-)
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 9480abe3ed3..00000000000
--- 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" +
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/
@ 2021-08-26 6:17 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2021-08-26 6:17 UTC (permalink / raw
To: gentoo-commits
commit: c0fa7cf02179c972ea0ae279cc1670f2a4427c1f
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Aug 25 14:35:20 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 06:17:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0fa7cf0
dev-java/stringtemplate: remove unused patch
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22098
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../stringtemplate/files/3.2.1-test-fixes.patch | 53 ----------------------
1 file changed, 53 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 fd625abd066..00000000000
--- 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 {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/
@ 2023-12-08 10:39 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2023-12-08 10:39 UTC (permalink / raw
To: gentoo-commits
commit: 7accbac256b52711f5f70597ffcb0777b848ad57
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 8 10:38:42 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 10:38:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7accbac2
dev-java/stringtemplate: fixed tests for java 21 in 4.3.4
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
...stringtemplate-4.3.4-Java21-TestRenderers.patch | 118 ++++++---------------
1 file changed, 34 insertions(+), 84 deletions(-)
diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
index e166440edeeb..127f5e0a4b61 100644
--- a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
+++ b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
@@ -1,91 +1,41 @@
-There were 4 failures:
-1) testRendererForGroup(org.stringtemplate.v4.test.TestRenderers)
-org.junit.ComparisonFailure: expected:<...etime: 7/5/05, 12:00[ ]AM> but was:<...etime: 7/5/05, 12:00[ ]AM>
- at org.junit.Assert.assertEquals(Assert.java:117)
- at org.junit.Assert.assertEquals(Assert.java:146)
- at org.stringtemplate.v4.test.TestRenderers.testRendererForGroup(TestRenderers.java:82)
-2) testRendererWithPredefinedFormat2(org.stringtemplate.v4.test.TestRenderers)
-org.junit.ComparisonFailure: expected:<...uesday, July 5, 2005[ at 12:00:00 ]AM Pacific Daylight ...> but was:<...uesday, July 5, 2005[, 12:00:00 ]AM Pacific Daylight ...>
- at org.junit.Assert.assertEquals(Assert.java:117)
- at org.junit.Assert.assertEquals(Assert.java:146)
- at org.stringtemplate.v4.test.TestRenderers.testRendererWithPredefinedFormat2(TestRenderers.java:131)
-3) testRendererWithPredefinedFormat4(org.stringtemplate.v4.test.TestRenderers)
-org.junit.ComparisonFailure: expected:< time: 12:00:00[ ]AM > but was:< time: 12:00:00[ ]AM >
- at org.junit.Assert.assertEquals(Assert.java:117)
- at org.junit.Assert.assertEquals(Assert.java:146)
- at org.stringtemplate.v4.test.TestRenderers.testRendererWithPredefinedFormat4(TestRenderers.java:164)
-4) testRendererWithPredefinedFormat(org.stringtemplate.v4.test.TestRenderers)
-org.junit.ComparisonFailure: expected:<...etime: 7/5/05, 12:00[ ]AM > but was:<...etime: 7/5/05, 12:00[ ]AM >
- at org.junit.Assert.assertEquals(Assert.java:117)
- at org.junit.Assert.assertEquals(Assert.java:146)
- at org.stringtemplate.v4.test.TestRenderers.testRendererWithPredefinedFormat(TestRenderers.java:111)
+there are different space characters used in java 21 (narrow space)
-FAILURES!!!
-Tests run: 636, Failures: 4
-
-https://github.com/antlr/stringtemplate4/issues/315
--- a/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java
+++ b/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java
-@@ -30,6 +30,7 @@ package org.stringtemplate.v4.test;
- import org.junit.After;
- import org.junit.Before;
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.stringtemplate.v4.DateRenderer;
- import org.stringtemplate.v4.NumberRenderer;
- import org.stringtemplate.v4.ST;
-@@ -66,7 +67,7 @@ public class TestRenderers extends BaseTest {
- Locale.setDefault(origLocale);
- }
-
-- @Test public void testRendererForGroup() throws Exception {
-+ @Test @Ignore public void testRendererForGroup() throws Exception {
- String templates =
- "dateThing(created) ::= \"datetime: <created>\"\n";
- writeFile(tmpdir, "t.stg", templates);
-@@ -95,7 +96,7 @@ public class TestRenderers extends BaseTest {
+@@ -77,6 +77,8 @@ public class TestRenderers extends BaseTest {
+ 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";
++ } else if ( javaVersion.startsWith("21") ) {
++ expecting = "datetime: 7/5/05, 12:00 AM";
+ }
+ String result = st.render();
assertEquals(expecting, result);
- }
-
-- @Test public void testRendererWithPredefinedFormat() throws Exception {
-+ @Test @Ignore public void testRendererWithPredefinedFormat() throws Exception {
- String templates =
- "dateThing(created) ::= << datetime: <created; format=\"short\"> >>\n";
- writeFile(tmpdir, "t.stg", templates);
-@@ -111,7 +112,7 @@ public class TestRenderers extends BaseTest {
+@@ -106,6 +108,8 @@ public class TestRenderers extends BaseTest {
+ 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 ";
++ } else if ( javaVersion.startsWith("21") ) {
++ expecting = " datetime: 7/5/05, 12:00 AM ";
+ }
+ String result = st.render();
assertEquals(expecting, result);
- }
-
-- @Test public void testRendererWithPredefinedFormat2() throws Exception {
-+ @Test @Ignore public void testRendererWithPredefinedFormat2() throws Exception {
- String templates =
- "dateThing(created) ::= << datetime: <created; format=\"full\"> >>\n";
- writeFile(tmpdir, "t.stg", templates);
-@@ -150,7 +151,7 @@ public class TestRenderers extends BaseTest {
+@@ -126,6 +130,8 @@ public class TestRenderers extends BaseTest {
+ String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time ";
+ if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
+ expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT ";
++ } else if ( javaVersion.startsWith("21") ) {
++ expecting = " datetime: Tuesday, July 5, 2005, 12:00:00 AM Pacific Daylight Time ";
+ }
+ String result = st.render();
+ assertEquals(expecting, result);
+@@ -160,6 +166,9 @@ public class TestRenderers extends BaseTest {
+ ST st = group.getInstanceOf("dateThing");
+ st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
+ String expecting = " time: 12:00:00 AM ";
++ if ( javaVersion.startsWith("21") ) {
++ expecting = " time: 12:00:00 AM ";
++ }
+ String result = st.render();
assertEquals(expecting, result);
}
-
-- @Test public void testRendererWithPredefinedFormat4() throws Exception {
-+ @Test @Ignore public void testRendererWithPredefinedFormat4() throws Exception {
- String templates =
- "dateThing(created) ::= << time: <created; format=\"time:medium\"> >>\n";
-
---- a/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestGroups.java
-+++ b/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestGroups.java
-@@ -29,6 +29,7 @@ package org.stringtemplate.v4.test;
-
- import org.junit.Assert;
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.stringtemplate.v4.*;
- import org.stringtemplate.v4.misc.ErrorBuffer;
-
-@@ -813,7 +814,7 @@ public class TestGroups extends BaseTest {
- }
-
-
-- @Test public void testGroupStringMultipleThreads() throws Exception {
-+ @Test @Ignore public void testGroupStringMultipleThreads() throws Exception {
- String templates =
- "stat(name,value={99}) ::= \"x=<value>; // <name>\"" + newline;
- final STGroup group = new STGroupString(templates);
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-08 10:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-26 6:17 [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2023-12-08 10:39 Miroslav Šulc
2021-05-24 6:38 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox