Skip to content

Commit 2e3e3d8

Browse files
committed
Added missing event notification for TestUnitResults
Removed unused/duplicate event notifications
1 parent 4eedfc0 commit 2e3e3d8

File tree

7 files changed

+14
-57
lines changed

7 files changed

+14
-57
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<modelVersion>4.0.0</modelVersion>
1212
<groupId>com.theartos</groupId>
1313
<artifactId>artos</artifactId>
14-
<version>0.0.13</version>
14+
<version>0.0.14-beta-1</version>
1515

1616
<!-- Organisation Info -->
1717
<organization>

src/com/artos/framework/infra/TestContext.java

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,6 @@ protected void generateUnitTestSummary(TestUnitObjectWrapper unit) {
326326
notifyTestStatusUpdate(getCurrentUnitTestStatus(), null, "\n[" + TestStatus.getEnumName(getCurrentUnitTestStatus().getValue())
327327
+ "]: " + unit.getTestUnitMethod().getName() + "(context) " + bugTrackingNum);
328328
notifyTestUnitResult(unit, getCurrentUnitTestStatus(), null, unit.getBugTrackingNumber());
329-
330-
// notify unit final outcome
331-
notifyTestUnitOutcome(unit, getCurrentTestStatus());
332329
// reset status for next test
333330
resetUnitTestStatus();
334331
}
@@ -466,9 +463,8 @@ public void generateStepTestSummary(BDDStep step) {
466463
String bugTrackingNum = "".equals(unit.getBugTrackingNumber()) ? "" : " [Bug_Reference: " + unit.getBugTrackingNumber() + "]";
467464
notifyTestStatusUpdate(getCurrentUnitTestStatus(), null, "\n[" + TestStatus.getEnumName(getCurrentUnitTestStatus().getValue())
468465
+ "]: " + step.getStepDescription() + " " + bugTrackingNum);
469-
470466
// notify step final outcome
471-
notifyTestUnitOutcome(step, getCurrentTestStatus());
467+
notifyTestUnitResult(step, getCurrentUnitTestStatus(), null, unit.getBugTrackingNumber());
472468
// reset status for next test
473469
resetUnitTestStatus();
474470
}
@@ -741,18 +737,6 @@ private void notifyTestStatusUpdate(TestStatus testStatus, File snapshot, String
741737
}
742738
}
743739

744-
private void notifyTestUnitOutcome(TestUnitObjectWrapper unit, TestStatus testStatus) {
745-
for (TestProgress listener : listenerList) {
746-
listener.testUnitOutcome(unit, testStatus);
747-
}
748-
}
749-
750-
private void notifyTestUnitOutcome(BDDStep step, TestStatus testStatus) {
751-
for (TestProgress listener : listenerList) {
752-
listener.testUnitOutcome(step, testStatus);
753-
}
754-
}
755-
756740
private void notifyTestResult(TestObjectWrapper t, TestStatus testStatus, File snapshot, String Msg) {
757741
for (TestProgress listener : listenerList) {
758742
listener.testResult(t, testStatus, snapshot, Msg);
@@ -770,7 +754,13 @@ private void notifyTestUnitResult(TestUnitObjectWrapper unit, TestStatus testSta
770754
listener.testUnitResult(unit, testStatus, snapshot, Msg);
771755
}
772756
}
773-
757+
758+
private void notifyTestUnitResult(BDDStep step, TestStatus testStatus, File snapshot, String Msg) {
759+
for (TestProgress listener : listenerList) {
760+
listener.testUnitResult(step, testStatus, snapshot, Msg);
761+
}
762+
}
763+
774764
private void notifyTestCaseSummary(String FQCN, String description) {
775765
for (TestProgress listener : listenerList) {
776766
listener.testCaseSummaryPrinting(FQCN, description);

src/com/artos/framework/listener/ExtentReportListener.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -584,13 +584,7 @@ public void testUnitResult(TestUnitObjectWrapper unit, TestStatus testStatus, Fi
584584
}
585585

586586
@Override
587-
public void testUnitOutcome(TestUnitObjectWrapper unit, TestStatus testStatus) {
588-
// TODO Auto-generated method stub
589-
590-
}
591-
592-
@Override
593-
public void testUnitOutcome(BDDStep step, TestStatus testStatus) {
587+
public void testUnitResult(BDDStep step, TestStatus testStatus, File snapshot, String description) {
594588
// TODO Auto-generated method stub
595589

596590
}

src/com/artos/framework/listener/JUnitReportListener.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -612,13 +612,7 @@ public void testResult(BDDScenario scenario, TestStatus testStatus, File snapsho
612612
}
613613

614614
@Override
615-
public void testUnitOutcome(TestUnitObjectWrapper unit, TestStatus testStatus) {
616-
// TODO Auto-generated method stub
617-
618-
}
619-
620-
@Override
621-
public void testUnitOutcome(BDDStep step, TestStatus testStatus) {
615+
public void testUnitResult(BDDStep step, TestStatus testStatus, File snapshot, String description) {
622616
// TODO Auto-generated method stub
623617

624618
}

src/com/artos/framework/listener/TestExecutionEventListener.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -475,13 +475,7 @@ public void testUnitResult(TestUnitObjectWrapper unit, TestStatus testStatus, Fi
475475
}
476476

477477
@Override
478-
public void testUnitOutcome(TestUnitObjectWrapper unit, TestStatus testStatus) {
479-
// TODO Auto-generated method stub
480-
481-
}
482-
483-
@Override
484-
public void testUnitOutcome(BDDStep step, TestStatus testStatus) {
478+
public void testUnitResult(BDDStep step, TestStatus testStatus, File snapshot, String description) {
485479
// TODO Auto-generated method stub
486480

487481
}

src/com/artos/framework/listener/UDPReportListener.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -454,13 +454,7 @@ public void testResult(BDDScenario scenario, TestStatus testStatus, File snapsho
454454
}
455455

456456
@Override
457-
public void testUnitOutcome(TestUnitObjectWrapper unit, TestStatus testStatus) {
458-
// TODO Auto-generated method stub
459-
460-
}
461-
462-
@Override
463-
public void testUnitOutcome(BDDStep step, TestStatus testStatus) {
457+
public void testUnitResult(BDDStep step, TestStatus testStatus, File snapshot, String description) {
464458
// TODO Auto-generated method stub
465459

466460
}

src/com/artos/interfaces/TestProgress.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -339,16 +339,6 @@ public interface TestProgress {
339339

340340
public void testUnitExecutionFinished(BDDStep step);
341341

342-
/**
343-
* Method is called when test unit outcome is finalised
344-
*
345-
* @param unit test object wrapper
346-
* @see TestUnitObjectWrapper
347-
*/
348-
public void testUnitOutcome(TestUnitObjectWrapper unit, TestStatus testStatus);
349-
350-
public void testUnitOutcome(BDDStep step, TestStatus testStatus);
351-
352342
// ==========================================================
353343
// Test Skip
354344
// ==========================================================
@@ -462,6 +452,7 @@ public interface TestProgress {
462452
* @see TestStatus
463453
*/
464454
public void testUnitResult(TestUnitObjectWrapper unit, TestStatus testStatus, File snapshot, String description);
455+
public void testUnitResult(BDDStep step, TestStatus testStatus, File snapshot, String description);
465456

466457
/**
467458
* Method is called when test unit execution is finished and summary requires to be printed

0 commit comments

Comments
 (0)