Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Junit5 support #22

Open
wants to merge 41 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
da7e2ba
Initial POC of Testing JUnit 5 Support in JMAQS
May 26, 2020
1d5c27a
Initial POC of Testing JUnit 5 Support in JMAQS
May 27, 2020
df847b4
Merge branch 'main' into junit5-support
jredingcsv May 6, 2022
f418a20
pull in main
jredingcsv May 6, 2022
29aa533
delete old base content, put junit content in the new maqs base
jredingcsv May 6, 2022
0a00439
Merge branch 'main' into junit5-support
jredingcsv Aug 11, 2022
ad12753
updated and set JUnit tests up
jredingcsv Aug 11, 2022
8d8971c
comments and copyright update
jredingcsv Aug 11, 2022
3f8d3dd
checkstyle updates
jredingcsv Aug 11, 2022
01a0ab2
checkstyle updates
jredingcsv Aug 11, 2022
8c8e3f3
checkstyle updates
jredingcsv Aug 11, 2022
a908d46
checkstyle updates
jredingcsv Aug 11, 2022
11c9b87
checkstyle updates
jredingcsv Aug 11, 2022
42ea7e9
checkstyle updates
jredingcsv Aug 11, 2022
4c70b59
code smells
jredingcsv Aug 11, 2022
8d55c69
code smells
jredingcsv Aug 11, 2022
9781d7e
fixing code smells and bugs
jredingcsv Aug 12, 2022
4a21f15
fixing code smells and bugs
jredingcsv Aug 12, 2022
607fb74
fixing code smells
jredingcsv Aug 12, 2022
01b372b
fixing code smells
jredingcsv Aug 12, 2022
38b308b
organizing code
jredingcsv Aug 15, 2022
c5c76e8
Merge branch 'main' into junit5-support
jredingcsv Sep 14, 2022
04a5587
Merge branch 'main' into junit5-support
jredingcsv Oct 24, 2022
7c07dcc
merge with main
jredingcsv Oct 24, 2022
40b6639
checkstyle changes
jredingcsv Oct 24, 2022
a880ca4
Merge branch 'main' into junit5-support
jredingcsv Nov 11, 2022
6f26aef
Merge branch 'main' into junit5-support
jonreding2010 Feb 4, 2023
67e0bd7
fix main merging issues
jonreding2010 Feb 4, 2023
ce32bf9
checkstyle updates
jonreding2010 Feb 4, 2023
d584144
checkstyle updates
jonreding2010 Feb 4, 2023
8bc2d3a
resolve junit unit tests issues
jonreding2010 Feb 7, 2023
b7c07cd
some more code coverage
jonreding2010 Feb 7, 2023
08539f2
Merge branch 'main' into junit5-support
jonreding2010 Feb 18, 2023
dae4d67
Merge branch 'main' into junit5-support
jonreding2010 Feb 27, 2023
56e30d6
Merge branch 'main' into junit5-support
jonreding2010 Mar 18, 2023
aa10ab0
Merge branch 'main' into junit5-support
jonreding2010 Apr 14, 2023
ca339d2
Merge branch 'main' into junit5-support
jonreding2010 Jul 24, 2023
e4e883a
update junit version
jonreding2010 Jul 24, 2023
663c84d
Merge branch 'main' into junit5-support
jonreding2010 Oct 31, 2023
04148b5
Merge branch 'main' into junit5-support
jonreding2010 Oct 31, 2023
0205564
Merge branch 'main' into junit5-support
jonreding2010 Jan 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
checkstyle updates
  • Loading branch information
jredingcsv committed Aug 11, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 8c8e3f325eb4316a0e55885b4b0557b19f2d1345
Original file line number Diff line number Diff line change
@@ -228,13 +228,31 @@ public void setTestObject(BaseTestObject baseTestObject) {
}
}

/**
* Setup before a JUnit test.
*
* @param info the test info of the unit test being run
*/
@BeforeEach public void setup(TestInfo info) {
//this.context = context;

// Get the Fully Qualified Test Class Name and set it in the object
String testName =
info.getTestClass().get().getName() + "." + info.getTestMethod().get().getName();
testName = testName.replaceFirst("class ", "");
this.fullyQualifiedTestClassName.set(testName);

this.createNewTestObject();
}

/**
* Setup before a testng unit test.
*
* @param method The initial executing Method object
* @param testContext The initial executing Test Context object
*/
@BeforeMethod(alwaysRun = true) public void setup(Method method, ITestContext testContext) {
@BeforeMethod(alwaysRun = true)
public void setup(Method method, ITestContext testContext) {
this.testContextInstance = testContext;

// Get the Fully Qualified Test Class Name and set it in the object
@@ -257,23 +275,6 @@ public void customSetup(String testName, ITestContext testContext) {
this.createNewTestObject();
}

/**
* Setup before a JUnit test.
*
* @param info the test info of the unit test being run
*/
@BeforeEach public void setup(TestInfo info) {
//this.context = context;

// Get the Fully Qualified Test Class Name and set it in the object
String testName =
info.getTestClass().get().getName() + "." + info.getTestMethod().get().getName();
testName = testName.replaceFirst("class ", "");
this.fullyQualifiedTestClassName.set(testName);

this.createNewTestObject();
}

/**
* Cleanup after a TestNG test.
*/
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
import com.cognizantsoftvision.maqs.utilities.logging.TestResultType;

public interface TestResult {
TestResultType getStatus();
TestResultType getStatus();

boolean isSuccess();
boolean isSuccess();
}