From 21a52ff15d21643e46510fd1abacbbee75ed2700 Mon Sep 17 00:00:00 2001 From: speedythesnail Date: Tue, 22 Nov 2022 20:12:05 -0500 Subject: [PATCH] Added tests and changes as requested --- .../main/java/org/testng/internal/YamlParser.java | 4 ++-- testng-core/src/test/java/test/yaml/YamlTest.java | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/testng-core/src/main/java/org/testng/internal/YamlParser.java b/testng-core/src/main/java/org/testng/internal/YamlParser.java index af061b43b9..cb66294860 100644 --- a/testng-core/src/main/java/org/testng/internal/YamlParser.java +++ b/testng-core/src/main/java/org/testng/internal/YamlParser.java @@ -21,7 +21,7 @@ public XmlSuite parse(String filePath, InputStream is, boolean loadClasses) @Override public boolean accept(String fileName) { - return Parser.hasFileScheme(fileName) && fileName.endsWith(".yaml") - || fileName.endsWith(".yml"); + return Parser.hasFileScheme(fileName) + && (fileName.endsWith(".yaml") || fileName.endsWith(".yml")); } } diff --git a/testng-core/src/test/java/test/yaml/YamlTest.java b/testng-core/src/test/java/test/yaml/YamlTest.java index 3d5f6fc33f..701111e3c5 100644 --- a/testng-core/src/test/java/test/yaml/YamlTest.java +++ b/testng-core/src/test/java/test/yaml/YamlTest.java @@ -1,6 +1,8 @@ package test.yaml; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.FileInputStream; @@ -31,6 +33,17 @@ public Object[][] dp() { }; } + @Test( + description = + "Validate that the YamlParser accepts yaml files with a .yaml or a .yml file extension, but not other file types.") + public void accept() { + YamlParser yamlParser = new YamlParser(); + + assertTrue(yamlParser.accept("TestSuite.yml")); + assertTrue(yamlParser.accept("TestSuite.yaml")); + assertFalse(yamlParser.accept("TestSuite.xml")); + } + @Test(dataProvider = "dp") public void compareFiles(String name) throws IOException { Collection s1 =