Alon Bar-Lev has uploaded a new change for review. Change subject: tools: tests: FirstMatchSimpleFilter ignore ordering ......................................................................
tools: tests: FirstMatchSimpleFilter ignore ordering ignore ordering of output events as it may be at any order as long as correct events are sent. simplify tests while doing so. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1171160 Change-Id: I935b68fa497cd793a503aff7f84be03e80603e94 Signed-off-by: Alon Bar-Lev <alo...@redhat.com> --- M backend/manager/tools/src/test/java/org/ovirt/engine/core/notifier/filter/FirstMatchSimpleFilterTest.java 1 file changed, 20 insertions(+), 71 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/35905/1 diff --git a/backend/manager/tools/src/test/java/org/ovirt/engine/core/notifier/filter/FirstMatchSimpleFilterTest.java b/backend/manager/tools/src/test/java/org/ovirt/engine/core/notifier/filter/FirstMatchSimpleFilterTest.java index 62e200a..272576a 100644 --- a/backend/manager/tools/src/test/java/org/ovirt/engine/core/notifier/filter/FirstMatchSimpleFilterTest.java +++ b/backend/manager/tools/src/test/java/org/ovirt/engine/core/notifier/filter/FirstMatchSimpleFilterTest.java @@ -41,9 +41,7 @@ private String t; - private List<AuditLogEvent> events = new ArrayList<>(); - - private List<String> names = new ArrayList<>(); + private List<String> events = new ArrayList<>(); public T(String t) { this.t = t; @@ -51,16 +49,11 @@ @Override public void dispatchEvent(AuditLogEvent event, String address) { - events.add(event); - names.add(address); + events.add(event.getName() + "-->" + address); } - public List<AuditLogEvent> getEvents() { + public List<String> getEvents() { return events; - } - - public List<String> getNames() { - return names; } @Override @@ -116,7 +109,6 @@ filter.processEvent(new E("message0")); filter.processEvent(new E("message1")); Assert.assertTrue(snmp.getEvents().isEmpty()); - Assert.assertTrue(snmp.getNames().isEmpty()); } @Test @@ -128,10 +120,7 @@ ); filter.processEvent(new E("message0")); filter.processEvent(new E("message1")); - AuditLogEvent event = smtp.getEvents().get(0); - String address = smtp.getNames().get(0); - Assert.assertTrue(event.getName().equals("message0")); - Assert.assertTrue(address.equals("dbte...@redhat.com")); + Assert.assertTrue(smtp.getEvents().contains("message0-->dbte...@redhat.com")); } @Test @@ -143,10 +132,7 @@ ); filter.processEvent(new E("message0")); filter.processEvent(new E("message1")); - AuditLogEvent event = smtp.getEvents().get(0); - String address = smtp.getNames().get(0); - Assert.assertTrue(event.getName().equals("message0")); - Assert.assertTrue(address.equals("dbte...@redhat.com")); + Assert.assertTrue(smtp.getEvents().contains("message0-->dbte...@redhat.com")); } @Test @@ -157,10 +143,7 @@ "exclude:*") ); filter.processEvent(new E("VDC_STOP")); - AuditLogEvent event = snmp.getEvents().get(0); - String address = snmp.getNames().get(0); - Assert.assertTrue(event.getName().equals("VDC_STOP")); - Assert.assertTrue(address.equals("")); + Assert.assertTrue(snmp.getEvents().contains("VDC_STOP-->")); } @Test @@ -179,14 +162,8 @@ filter.processEvent(new E("message1")); filter.processEvent(new E("message2")); filter.processEvent(new E("message3")); - AuditLogEvent event = smtp.getEvents().get(0); - String name = smtp.getNames().get(0); - Assert.assertEquals("message1", event.getName()); - Assert.assertEquals(expected, name); - event = smtp.getEvents().get(1); - name = smtp.getNames().get(1); - Assert.assertEquals("message2", event.getName()); - Assert.assertEquals(expected, name); + Assert.assertTrue(smtp.getEvents().contains("message1-->" + expected)); + Assert.assertTrue(smtp.getEvents().contains("message2-->" + expected)); Assert.assertEquals(2, smtp.getEvents().size()); } @@ -205,14 +182,8 @@ "include:*" )); filter.processEvent(new E("message1")); - AuditLogEvent event = snmp.getEvents().get(0); - String name = snmp.getNames().get(0); - Assert.assertEquals("message1", event.getName()); - Assert.assertEquals("pupu", name); - event = smtp.getEvents().get(0); - name = smtp.getNames().get(0); - Assert.assertEquals("message1", event.getName()); - Assert.assertEquals("pupu", name); + Assert.assertTrue(snmp.getEvents().contains("message1-->pupu")); + Assert.assertTrue(smtp.getEvents().contains("message1-->pupu")); } @Test @@ -241,39 +212,17 @@ filter.processEvent(new E("message1")); filter.processEvent(new E("message2")); - AuditLogEvent event = snmp.getEvents().get(0); - String name = snmp.getNames().get(0); - Assert.assertEquals("message0", event.getName()); - Assert.assertEquals("profile1", name); - event = snmp.getEvents().get(1); - name = snmp.getNames().get(1); - Assert.assertEquals("message0", event.getName()); - Assert.assertEquals("profile2", name); - event = snmp.getEvents().get(2); - name = snmp.getNames().get(2); - Assert.assertEquals("message1", event.getName()); - Assert.assertEquals("profile2", name); - event = snmp.getEvents().get(3); - name = snmp.getNames().get(3); - Assert.assertEquals("message2", event.getName()); - Assert.assertEquals("profile2", name); + Assert.assertTrue(snmp.getEvents().contains("message0-->profile1")); + Assert.assertTrue(snmp.getEvents().contains("message0-->profile2")); + Assert.assertTrue(snmp.getEvents().contains("message1-->profile2")); + Assert.assertTrue(snmp.getEvents().contains("message2-->profile2")); + Assert.assertEquals(4, snmp.getEvents().size()); - event = smtp.getEvents().get(0); - name = smtp.getNames().get(0); - Assert.assertEquals("message1", event.getName()); - Assert.assertEquals("alo...@gentoo.org", name); - event = smtp.getEvents().get(1); - name = smtp.getNames().get(1); - Assert.assertEquals("message1", event.getName()); - Assert.assertEquals("alo...@redhat.com", name); - event = smtp.getEvents().get(2); - name = smtp.getNames().get(2); - Assert.assertEquals("message2", event.getName()); - Assert.assertEquals("alon.bar...@gmail.com", name); - event = smtp.getEvents().get(3); - name = smtp.getNames().get(3); - Assert.assertEquals("message2", event.getName()); - Assert.assertEquals("alo...@redhat.com", name); + Assert.assertTrue(smtp.getEvents().contains("message1-->alo...@gentoo.org")); + Assert.assertTrue(smtp.getEvents().contains("message1-->alo...@redhat.com")); + Assert.assertTrue(smtp.getEvents().contains("message2-->alon.bar...@gmail.com")); + Assert.assertTrue(smtp.getEvents().contains("message2-->alo...@redhat.com")); + Assert.assertEquals(4, smtp.getEvents().size()); } @Test() -- To view, visit http://gerrit.ovirt.org/35905 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I935b68fa497cd793a503aff7f84be03e80603e94 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
