From eeb860cff30ae923a57851503cba7c6be63b8bfb Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 30 Nov 2024 17:00:47 +0800 Subject: [PATCH 1/2] Reuse Turkish setup --- .../ApacheLicenseResourceTransformerTest.groovy | 6 +----- .../ApacheNoticeResourceTransformerTest.groovy | 6 +----- .../shadow/transformers/AppendingTransformerTest.groovy | 9 ++------- .../shadow/transformers/TransformerTestSupport.groovy | 8 ++++++++ .../transformers/XmlAppendingTransformerTest.groovy | 6 +----- 5 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformerTest.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformerTest.groovy index 85f59721d..20227b9cd 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformerTest.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformerTest.groovy @@ -36,11 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue class ApacheLicenseResourceTransformerTest extends TransformerTestSupport { static { - /* - * NOTE: The Turkish locale has an usual case transformation for the letters "I" and "i", making it a prime - * choice to test for improper case-less string comparisions. - */ - Locale.setDefault(new Locale("tr")) + setupTurkishLocale() } @BeforeEach diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.groovy index 102e35ba2..874e2ac3d 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.groovy @@ -39,11 +39,7 @@ class ApacheNoticeResourceTransformerTest extends TransformerTestSupport { - static - { - /* - * NOTE: The Turkish locale has an usual case transformation for the letters "I" and "i", making it a prime - * choice to test for improper case-less string comparisions. - */ - Locale.setDefault(new Locale("tr")) + static { + setupTurkishLocale() } @BeforeEach diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/TransformerTestSupport.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/TransformerTestSupport.groovy index a89d1ed41..4ad957bd4 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/TransformerTestSupport.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/TransformerTestSupport.groovy @@ -12,4 +12,12 @@ abstract class TransformerTestSupport { protected static FileTreeElement getFileElement(String path) { return new DefaultFileTreeElement(null, RelativePath.parse(true, path), null, null) } + + /** + * NOTE: The Turkish locale has an usual case transformation for the letters "I" and "i", making it a prime + * choice to test for improper case-less string comparisions. + */ + protected static setupTurkishLocale() { + Locale.setDefault(new Locale("tr")) + } } diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendingTransformerTest.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendingTransformerTest.groovy index 51cfb6c62..80dc2a2a1 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendingTransformerTest.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendingTransformerTest.groovy @@ -36,11 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue class XmlAppendingTransformerTest extends TransformerTestSupport { static { - /* - * NOTE: The Turkish locale has an usual case transformation for the letters "I" and "i", making it a prime - * choice to test for improper case-less string comparisons. - */ - Locale.setDefault(new Locale("tr")) + setupTurkishLocale() } @BeforeEach From 07cd0e3205a88777b5ebed5106749f8475774937 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 30 Nov 2024 17:01:47 +0800 Subject: [PATCH 2/2] Fix typo --- .../plugins/shadow/transformers/TransformerTestSupport.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/TransformerTestSupport.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/TransformerTestSupport.groovy index 4ad957bd4..a6b4e0bee 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/TransformerTestSupport.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/TransformerTestSupport.groovy @@ -15,7 +15,7 @@ abstract class TransformerTestSupport { /** * NOTE: The Turkish locale has an usual case transformation for the letters "I" and "i", making it a prime - * choice to test for improper case-less string comparisions. + * choice to test for improper case-less string comparisons. */ protected static setupTurkishLocale() { Locale.setDefault(new Locale("tr"))