Added unit tests for base and browser event classes

Author: slu-it

webtester-core/src/main/java/info/novatec/testit/webtester/events/EventSystemImpl.java

@@ -11,10 +11,11 @@
 @Slf4j
 public class EventSystemImpl implements EventSystem {
 
-    private final List<EventListener> listeners = new LinkedList<>();
+    private final List<EventListener> listeners;
     private final Browser browser;
 
     public EventSystemImpl(Browser browser) {
+        this.listeners = new LinkedList<>();
         this.browser = browser;
     }
 
@@ -38,7 +39,7 @@ public void clearListeners() {
 
     @Override
     public void fireEvent(Event event) {
-        if(isEnabled()) {
+        if (isEnabled() || event instanceof ExceptionEvent) {
             doFireEvent(event);
         } else {
             log.warn("tried to fire event '{}' but event system is disabled", event);

webtester-core/src/main/java/info/novatec/testit/webtester/events/ExceptionEvent.java

@@ -26,7 +26,7 @@ public ExceptionEvent(Throwable exception) {
 
     @Override
     public String describe() {
-        return "exception occurred: " + exception.getMessage();
+        return "exception occurred: '" + exception.getMessage() + "'";
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/events/browser/AcceptedAlertEvent.java

@@ -23,8 +23,8 @@
  * @see AlertHandler#acceptIfPresent()
  * @since 2.0
  */
-@SuppressWarnings("serial")
 @Getter
+@SuppressWarnings("serial")
 public class AcceptedAlertEvent extends AbstractEvent {
 
     private final String alertMessage;
@@ -35,7 +35,7 @@ public AcceptedAlertEvent(String alertMessage) {
 
     @Override
     public String describe() {
-        return format("accepted an alert message with message: %s", alertMessage);
+        return format("accepted an alert with message: '%s'", alertMessage);
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/events/browser/DeclinedAlertEvent.java

@@ -35,7 +35,7 @@ public DeclinedAlertEvent(String alertMessage) {
 
     @Override
     public String describe() {
-        return format("declined an alert message with message: %s", alertMessage);
+        return format("declined an alert with message: '%s'", alertMessage);
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/events/browser/OpenedUrlEvent.java

@@ -29,8 +29,8 @@
  * @see UrlOpener#defaultEntryPoint(Class)
  * @since 2.0
  */
-@SuppressWarnings("serial")
 @Getter
+@SuppressWarnings("serial")
 public class OpenedUrlEvent extends AbstractEvent {
 
     private final String url;
@@ -41,7 +41,7 @@ public OpenedUrlEvent(String url) {
 
     @Override
     public String describe() {
-        return format("opened url %s", url);
+        return format("opened url: '%s'", url);
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/events/browser/SavedSourceCodeEvent.java

@@ -8,10 +8,10 @@
 import lombok.Getter;
 
 import info.novatec.testit.webtester.browser.operations.PageSourceSaver;
+import info.novatec.testit.webtester.events.AbstractEvent;
 import info.novatec.testit.webtester.events.Event;
 import info.novatec.testit.webtester.events.EventListener;
 import info.novatec.testit.webtester.events.EventSystem;
-import info.novatec.testit.webtester.events.AbstractEvent;
 
 
 /**
@@ -31,8 +31,8 @@
  * @see PageSourceSaver#save(File)
  * @since 2.0
  */
-@SuppressWarnings("serial")
 @Getter
+@SuppressWarnings("serial")
 public class SavedSourceCodeEvent extends AbstractEvent {
 
     private final File pageSource;
@@ -43,7 +43,7 @@ public SavedSourceCodeEvent(File pageSource) {
 
     @Override
     public String describe() {
-        return format("saved page source and saved it as: %s", pageSource);
+        return format("saved page source and stored it as: '%s'", pageSource);
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/events/browser/SetWindowPositionEvent.java

@@ -32,7 +32,7 @@ public SetWindowPositionEvent(int x, int y) {
 
     @Override
     public String describe() {
-        return "set window position: X=" + x + ", Y=" + y;
+        return "set window position: x=" + x + ", y=" + y;
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/events/browser/SetWindowSizeEvent.java

@@ -32,7 +32,7 @@ public SetWindowSizeEvent(int width, int height) {
 
     @Override
     public String describe() {
-        return "set window position: width=" + width + ", height=" + height;
+        return "set window size: width=" + width + ", height=" + height;
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/events/browser/SwitchedToFrameEvent.java

@@ -5,10 +5,10 @@
 import lombok.Getter;
 
 import info.novatec.testit.webtester.browser.operations.FocusSetter;
+import info.novatec.testit.webtester.events.AbstractEvent;
 import info.novatec.testit.webtester.events.Event;
 import info.novatec.testit.webtester.events.EventListener;
 import info.novatec.testit.webtester.events.EventSystem;
-import info.novatec.testit.webtester.events.AbstractEvent;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
 
 
@@ -26,26 +26,30 @@
  * @since 2.0
  */
 @SuppressWarnings("serial")
-@Getter
 public class SwitchedToFrameEvent extends AbstractEvent {
 
+    @Getter
     private final String target;
+    private final String type;
 
     public SwitchedToFrameEvent(String nameOrId) {
         this.target = nameOrId;
+        this.type = "name or id";
     }
 
     public SwitchedToFrameEvent(int index) {
         this.target = String.valueOf(index);
+        this.type = "index";
     }
 
     public SwitchedToFrameEvent(PageFragment frame) {
         this.target = frame.getName().orElse("unknown");
+        this.type = "page fragment";
     }
 
     @Override
     public String describe() {
-        return format("switched to frame using: %s", target);
+        return format("switched to frame using: %s '%s'", type, target);
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/events/browser/SwitchedToWindowEvent.java

@@ -34,7 +34,7 @@ public SwitchedToWindowEvent(String nameOrHandle) {
 
     @Override
     public String describe() {
-        return format("switched to frame using name or handle: %s", nameOrHandle);
+        return format("switched to frame using name or handle: '%s'", nameOrHandle);
     }
 
 }