gentoo resync : 20.03.2022

2 files changed, 0 insertions, 145 deletions

diff --git a/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch b/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch
deleted file mode 100644
index 0834ccf9bcce..000000000000
--- a/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/test/org/stringtemplate/v4/test/TestGroups.java	2014-03-25 11:55:55.000000000 +0000
-+++ b/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 =
---- a/test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java	2014-03-25 11:55:55.000000000 +0000
-+++ b/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" +
---- a/test/org/stringtemplate/v4/test/TestRenderers.java
-+++ b/test/org/stringtemplate/v4/test/TestRenderers.java
-@@ -59,7 +59,7 @@ public class TestRenderers extends BaseTest {
- 		group.registerRenderer(GregorianCalendar.class, new DateRenderer());
- 		ST st = group.getInstanceOf("dateThing");
- 		st.add("created", new GregorianCalendar(2005, 07-1, 05));
--		String expecting = "datetime: 7/5/05 12:00 AM";
-+		String expecting = "datetime: 7/5/05, 12:00 AM";
- 		String result = st.render();
- 		assertEquals(expecting, result);
- 	}
-@@ -85,7 +85,7 @@ public class TestRenderers extends BaseTest {
-         group.registerRenderer(GregorianCalendar.class, new DateRenderer());
-         ST st = group.getInstanceOf("dateThing");
-         st.add("created", new GregorianCalendar(2005, 07-1, 05));
--        String expecting = " datetime: 7/5/05 12:00 AM ";
-+        String expecting = " datetime: 7/5/05, 12:00 AM ";
-         String result = st.render();
-         assertEquals(expecting, result);
-     }
-@@ -102,7 +102,7 @@ public class TestRenderers extends BaseTest {
-         	// set Timezone to "PDT"
-         	TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
-         	st.add("created", new GregorianCalendar(2005, 07-1, 05));
--        	String expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT ";
-+        	String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time ";
-         	String result = st.render();
-         	assertEquals(expecting, result);
-         } finally {
-@@ -358,6 +358,6 @@ public class TestRenderers extends BaseTest {
- 		cal.set(2012, Calendar.JUNE, 12);
- 		st.add("date", cal);
- 
--		assertEquals("12 de Junho de 2012", st.render(new Locale("pt")));
-+		assertEquals("12 de junho de 2012", st.render(new Locale("pt")));
- 	}
- }
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
deleted file mode 100644
index 994fd42ad5e6..000000000000
--- a/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 3ea94a870b6e139399abbf932da1dfa2f9bd37e3 Mon Sep 17 00:00:00 2001
-From: parrt <parrt@cs.usfca.edu>
-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")));
- 	}
- }