Skip to content

Commit

Permalink
Fix style
Browse files Browse the repository at this point in the history
  • Loading branch information
juherr committed Jun 8, 2021
1 parent 7b47f89 commit e39413a
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 15 deletions.
4 changes: 0 additions & 4 deletions testng-core/src/test/java/test/guice/GuiceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.testng.Assert.assertEquals;

import org.testng.Assert;
import org.testng.TestListenerAdapter;
import org.testng.TestNG;
import org.testng.annotations.Test;
import org.testng.xml.XmlSuite;
Expand All @@ -21,8 +19,6 @@
import test.guice.issue2427.modules.TestModuleTwo;
import test.guice.issue2427.modules.TestParentConfigModule;

import java.util.Collections;

public class GuiceTest extends SimpleBaseTest {

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public void verifyWithListener() {
public void verifyWithChildSuite() {
TestNG testNG = create();
testNG.setTestSuites(
Collections.singletonList(getPathToResource("samples/test/listeners/github1284/github1284.xml")));
Collections.singletonList(
getPathToResource("samples/test/listeners/github1284/github1284.xml")));
testNG.run();
Assert.assertEquals(testNG.getStatus(), 0);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ public void programmaticXmlSuite() {
@Test
public void xmlXmlSuite() {
TestNG tng = create();
tng.setTestSuites(Collections.singletonList(getPathToResource("samples/methodselector-in-xml.xml")));
tng.setTestSuites(
Collections.singletonList(getPathToResource("samples/methodselector-in-xml.xml")));
tng.addListener((ITestNGListener) m_tla);
tng.run();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ public class ParamInheritanceTest extends SimpleBaseTest {
+ " during execution. This test makes sure we dont run into any NPEs")
public void noNPEInCountingResults() {
TestNG tng = create();
tng.setTestSuites(Arrays.asList(getPathToResource("samples/param-inheritance/parent-suite.xml")));
tng.setTestSuites(
Arrays.asList(getPathToResource("samples/param-inheritance/parent-suite.xml")));

TestListenerAdapter tla = new TestListenerAdapter();
tng.addListener((ITestNGListener) tla);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ public void failedFile() throws ParserConfigurationException, SAXException, IOEx
public void testParameterPreservationWithFactory() throws IOException {
final SuiteXmlParser parser = new SuiteXmlParser();
final String testSuite = "src/test/resources/samples/xml/github2445/test-suite.xml";
final String expectedResult = "src/test/resources/samples/xml/github2445/expected-failed-report.xml";
final String expectedResult =
"src/test/resources/samples/xml/github2445/expected-failed-report.xml";
final XmlSuite xmlSuite = parser.parse(testSuite, new FileInputStream(testSuite), true);
final TestNG tng = create(xmlSuite);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ public class DuplicateChildSuitesInitializationTest extends SimpleBaseTest {
@Test
public void checkDuplicateChildSuites() throws IOException {
String path =
getPathToResource("samples/checksuitesinitialization/parent-suite-with-duplicate-child.xml");
getPathToResource(
"samples/checksuitesinitialization/parent-suite-with-duplicate-child.xml");
Parser parser = new Parser(path);
List<XmlSuite> suites = parser.parseToList();
XmlSuite rootSuite = suites.get(0);
Expand Down
3 changes: 2 additions & 1 deletion testng-core/src/test/java/test/testnames/TestNamesTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ public void checkWithoutChildSuites() {
TestListenerAdapter tla = new TestListenerAdapter();
TestNG tng = create();
tng.setTestNames(Collections.singletonList("testGroup2"));
tng.setTestSuites(Collections.singletonList(getPathToResource("samples/testnames/upstream-suite.xml")));
tng.setTestSuites(
Collections.singletonList(getPathToResource("samples/testnames/upstream-suite.xml")));
tng.addListener((ITestNGListener) tla);
tng.run();
Assert.assertEquals(tla.getFailedTests().size(), 0);
Expand Down
23 changes: 18 additions & 5 deletions testng-core/src/test/java/test/thread/ParallelSuiteTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,18 @@ public void suitesShouldRunInParallel1() {
2,
null,
Arrays.asList(
getPathToResource("samples/suite-parallel-1.xml"), getPathToResource("samples/suite-parallel-2.xml")));
getPathToResource("samples/suite-parallel-1.xml"),
getPathToResource("samples/suite-parallel-2.xml")));
}

@Test
public void suitesShouldRunInParallel2() {
runTest(5, 3, 3, null, Collections.singletonList(getPathToResource("samples/suite-parallel-0.xml")));
runTest(
5,
3,
3,
null,
Collections.singletonList(getPathToResource("samples/suite-parallel-0.xml")));
}

@Test(description = "Number of threads (2) is less than number of suites (3)")
Expand Down Expand Up @@ -92,7 +98,8 @@ public void suitesShouldRunInParallel5() {
5,
7,
null,
Collections.singletonList(getPathToResource("samples/parallel-suites/suite-parallel-0.xml")));
Collections.singletonList(
getPathToResource("samples/parallel-suites/suite-parallel-0.xml")));
}

@Test(description = "Number of threads (2) is less than level of suites (3)")
Expand All @@ -102,7 +109,8 @@ public void suitesShouldRunInParallel6() {
2,
7,
null,
Collections.singletonList(getPathToResource("samples/parallel-suites/suite-parallel-0.xml")));
Collections.singletonList(
getPathToResource("samples/parallel-suites/suite-parallel-0.xml")));
}

@Test(
Expand Down Expand Up @@ -134,6 +142,11 @@ public void suitesShouldRunInOrder() {

@Test(description = "Number of threads (1) is less than number of levels of suites (2)")
public void suitesShouldRun1() {
runTest(1, 1, 3, true, Collections.singletonList(getPathToResource("samples/suite-parallel-0.xml")));
runTest(
1,
1,
3,
true,
Collections.singletonList(getPathToResource("samples/suite-parallel-0.xml")));
}
}

0 comments on commit e39413a

Please sign in to comment.