[seam-commits] Seam SVN: r12398 - in modules/faces/trunk: impl/src/main/java/org/jboss/seam/faces/event and 1 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon Apr 5 17:45:25 EDT 2010
Author: nickarls
Date: 2010-04-05 17:45:25 -0400 (Mon, 05 Apr 2010)
New Revision: 12398
Removed:
modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier/AnyPhase.java
Modified:
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventObserver.java
Log:
Drop @AnyPhase, some more tests
Deleted: modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier/AnyPhase.java
===================================================================
--- modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier/AnyPhase.java 2010-04-05 21:35:24 UTC (rev 12397)
+++ modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier/AnyPhase.java 2010-04-05 21:45:25 UTC (rev 12398)
@@ -1,23 +0,0 @@
-package org.jboss.seam.faces.event.qualifier;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Qualifies observer method parameters to select events that occur in a any
- * phase in the JSF lifecycle
- *
- * @author <a href="mailto:lincolnbaxter at gmail.com>Lincoln Baxter, III</a>
- */
- at Qualifier
- at Target( { FIELD, PARAMETER })
- at Retention(RUNTIME)
-public @interface AnyPhase
-{
-}
\ No newline at end of file
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java 2010-04-05 21:35:24 UTC (rev 12397)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java 2010-04-05 21:45:25 UTC (rev 12398)
@@ -12,7 +12,6 @@
import org.jboss.seam.faces.cdi.BeanManagerAware;
import org.jboss.seam.faces.event.qualifier.After;
-import org.jboss.seam.faces.event.qualifier.AnyPhase;
import org.jboss.seam.faces.event.qualifier.ApplyRequestValues;
import org.jboss.seam.faces.event.qualifier.Before;
import org.jboss.seam.faces.event.qualifier.InvokeApplication;
@@ -96,7 +95,6 @@
Annotation[] qualifiers = new Annotation[] { whenQualifier, phaseQualifier };
log.debug("Fired event #0 with qualifiers #1", event, qualifiers);
getBeanManager().fireEvent(event, qualifiers);
- getBeanManager().fireEvent(event, new Annotation[] { whenQualifier, ANY_PHASE });
}
public void afterPhase(final PhaseEvent e)
@@ -127,11 +125,6 @@
private static final long serialVersionUID = 5121252401235504952L;
};
- private static final AnnotationLiteral<AnyPhase> ANY_PHASE = new AnnotationLiteral<AnyPhase>()
- {
- private static final long serialVersionUID = 6334015723435615561L;
- };
-
private static final AnnotationLiteral<RestoreView> RESTORE_VIEW = new AnnotationLiteral<RestoreView>()
{
private static final long serialVersionUID = 8812020629644833820L;
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java 2010-04-05 21:35:24 UTC (rev 12397)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java 2010-04-05 21:45:25 UTC (rev 12398)
@@ -1,18 +1,5 @@
package org.jboss.seam.faces.event;
-import static org.jboss.seam.faces.event.PhaseEventObserver.Observation.AFTER_APPLY_VALUES;
-import static org.jboss.seam.faces.event.PhaseEventObserver.Observation.AFTER_INVOKE_APPLICATION;
-import static org.jboss.seam.faces.event.PhaseEventObserver.Observation.AFTER_PROCESS_VALIDATION;
-import static org.jboss.seam.faces.event.PhaseEventObserver.Observation.AFTER_RENDER_RESPONSE;
-import static org.jboss.seam.faces.event.PhaseEventObserver.Observation.AFTER_RESTORE_VIEW;
-import static org.jboss.seam.faces.event.PhaseEventObserver.Observation.AFTER_UPDATE_MODEL_VALUES;
-import static org.jboss.seam.faces.event.PhaseEventObserver.Observation.BEFORE_APPLY_VALUES;
-import static org.jboss.seam.faces.event.PhaseEventObserver.Observation.BEFORE_INVOKE_APPLICATION;
-import static org.jboss.seam.faces.event.PhaseEventObserver.Observation.BEFORE_PROCESS_VALIDATION;
-import static org.jboss.seam.faces.event.PhaseEventObserver.Observation.BEFORE_RENDER_RESPONSE;
-import static org.jboss.seam.faces.event.PhaseEventObserver.Observation.BEFORE_RESTORE_VIEW;
-import static org.jboss.seam.faces.event.PhaseEventObserver.Observation.BEFORE_UPDATE_MODEL_VALUES;
-
import java.util.ArrayList;
import java.util.List;
@@ -64,12 +51,10 @@
private final MockFacesContext facesContext = new MockFacesContext();
private final MockLifecycle lifecycle = new MockLifecycle();
- @Test
- public void testBeforeAnyPhaseObserver()
+ private void fireAllPhases()
{
- observer.reset();
fireAllBeforePhases();
- observer.assertAllBeforePhasesObserved();
+ fireAllAfterPhases();
}
private void fireAllBeforePhases()
@@ -90,14 +75,6 @@
phaseEventBridge.beforePhase(new PhaseEvent(facesContext, phaseId, lifecycle));
}
- @Test
- public void testAfterAnyPhaseObserver()
- {
- observer.reset();
- fireAllAfterPhases();
- observer.assertAllAfterPhasesObserved();
- }
-
private void fireAllAfterPhases()
{
fireAfterPhases(ALL_PHASES);
@@ -120,96 +97,168 @@
public void testBeforeRenderResponseObserver()
{
observer.reset();
- fireBeforePhase(PhaseId.RENDER_RESPONSE);
- observer.assertSingleObservation(BEFORE_RENDER_RESPONSE);
+ fireAllPhases();
+ observer.assertObservations("1", PhaseId.RENDER_RESPONSE);
}
@Test
public void testAfterRenderResponseObserver()
{
observer.reset();
- fireAfterPhase(PhaseId.RENDER_RESPONSE);
- observer.assertSingleObservation(AFTER_RENDER_RESPONSE);
+ fireAllPhases();
+ observer.assertObservations("2", PhaseId.RENDER_RESPONSE);
}
@Test
public void testBeforeApplyRequestValuesObserver()
{
observer.reset();
- fireBeforePhase(PhaseId.APPLY_REQUEST_VALUES);
- observer.assertSingleObservation(BEFORE_APPLY_VALUES);
+ fireAllPhases();
+ observer.assertObservations("3", PhaseId.APPLY_REQUEST_VALUES);
}
@Test
public void testAfterApplyRequestValuesObserver()
{
observer.reset();
- fireAfterPhase(PhaseId.APPLY_REQUEST_VALUES);
- observer.assertSingleObservation(AFTER_APPLY_VALUES);
+ fireAllPhases();
+ observer.assertObservations("4", PhaseId.APPLY_REQUEST_VALUES);
}
@Test
public void testBeforeInvokeApplicationObserver()
{
observer.reset();
- fireBeforePhase(PhaseId.INVOKE_APPLICATION);
- observer.assertSingleObservation(BEFORE_INVOKE_APPLICATION);
+ fireAllPhases();
+ observer.assertObservations("5", PhaseId.INVOKE_APPLICATION);
}
@Test
public void testAfterInvokeApplicationObserver()
{
observer.reset();
- fireAfterPhase(PhaseId.INVOKE_APPLICATION);
- observer.assertSingleObservation(AFTER_INVOKE_APPLICATION);
+ fireAllPhases();
+ observer.assertObservations("6", PhaseId.INVOKE_APPLICATION);
}
@Test
public void testBeforeProcessValidationsObserver()
{
observer.reset();
- fireBeforePhase(PhaseId.PROCESS_VALIDATIONS);
- observer.assertSingleObservation(BEFORE_PROCESS_VALIDATION);
+ fireAllPhases();
+ observer.assertObservations("7", PhaseId.PROCESS_VALIDATIONS);
}
@Test
public void testAfterProcessValidationsObserver()
{
observer.reset();
- fireAfterPhase(PhaseId.PROCESS_VALIDATIONS);
- observer.assertSingleObservation(AFTER_PROCESS_VALIDATION);
+ fireAllPhases();
+ observer.assertObservations("8", PhaseId.PROCESS_VALIDATIONS);
}
@Test
public void testBeforeRestoreViewObserver()
{
observer.reset();
- fireBeforePhase(PhaseId.RESTORE_VIEW);
- observer.assertSingleObservation(BEFORE_RESTORE_VIEW);
+ fireAllPhases();
+ observer.assertObservations("9", PhaseId.RESTORE_VIEW);
}
@Test
public void testAfterRestoreViewObserver()
{
observer.reset();
- fireAfterPhase(PhaseId.RESTORE_VIEW);
- observer.assertSingleObservation(AFTER_RESTORE_VIEW);
+ fireAllPhases();
+ observer.assertObservations("10", PhaseId.RESTORE_VIEW);
}
@Test
public void testBeforeUpdateModelValuesObserver()
{
observer.reset();
- fireBeforePhase(PhaseId.UPDATE_MODEL_VALUES);
- observer.assertSingleObservation(BEFORE_UPDATE_MODEL_VALUES);
+ fireAllPhases();
+ observer.assertObservations("11", PhaseId.UPDATE_MODEL_VALUES);
}
@Test
public void testAfterUpdateModelValuesObserver()
{
observer.reset();
- fireAfterPhase(PhaseId.UPDATE_MODEL_VALUES);
- observer.assertSingleObservation(AFTER_UPDATE_MODEL_VALUES);
+ fireAllPhases();
+ observer.assertObservations("11", PhaseId.UPDATE_MODEL_VALUES);
}
+ @Test
+ public void testAllRenderResponseObserver()
+ {
+ observer.reset();
+ fireAllPhases();
+ observer.assertObservations("13", PhaseId.RENDER_RESPONSE, PhaseId.RENDER_RESPONSE);
+ }
+
+ @Test
+ public void testAllApplyRequestValuesObserver()
+ {
+ observer.reset();
+ fireAllPhases();
+ observer.assertObservations("14", PhaseId.APPLY_REQUEST_VALUES, PhaseId.APPLY_REQUEST_VALUES);
+ }
+
+ @Test
+ public void testAllInvokeApplicationObserver()
+ {
+ observer.reset();
+ fireAllPhases();
+ observer.assertObservations("15", PhaseId.INVOKE_APPLICATION, PhaseId.INVOKE_APPLICATION);
+ }
+
+ @Test
+ public void testAllProcessValidationsObserver()
+ {
+ observer.reset();
+ fireAllPhases();
+ observer.assertObservations("16", PhaseId.PROCESS_VALIDATIONS, PhaseId.PROCESS_VALIDATIONS);
+ }
+
+ @Test
+ public void testAllRestoreViewObserver()
+ {
+ observer.reset();
+ fireAllPhases();
+ observer.assertObservations("17", PhaseId.RESTORE_VIEW, PhaseId.RESTORE_VIEW);
+ }
+
+ @Test
+ public void testAllUpdateModelValuesObserver()
+ {
+ observer.reset();
+ fireAllPhases();
+ observer.assertObservations("18", PhaseId.UPDATE_MODEL_VALUES, PhaseId.UPDATE_MODEL_VALUES);
+ }
+
+ @Test
+ public void testAllBeforeEventsObserver()
+ {
+ observer.reset();
+ fireAllPhases();
+ observer.assertObservations("19", PhaseId.APPLY_REQUEST_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE, PhaseId.RESTORE_VIEW, PhaseId.UPDATE_MODEL_VALUES);
+ }
+
+ @Test
+ public void testAllAfterEventsObserver()
+ {
+ observer.reset();
+ fireAllPhases();
+ observer.assertObservations("20", PhaseId.APPLY_REQUEST_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE, PhaseId.RESTORE_VIEW, PhaseId.UPDATE_MODEL_VALUES);
+ }
+
+ @Test
+ public void testAllEventsObserver()
+ {
+ observer.reset();
+ fireAllPhases();
+ observer.assertObservations("21", PhaseId.APPLY_REQUEST_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE, PhaseId.RESTORE_VIEW, PhaseId.UPDATE_MODEL_VALUES, PhaseId.APPLY_REQUEST_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE, PhaseId.RESTORE_VIEW, PhaseId.UPDATE_MODEL_VALUES);
+ }
+
}
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventObserver.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventObserver.java 2010-04-05 21:35:24 UTC (rev 12397)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventObserver.java 2010-04-05 21:45:25 UTC (rev 12398)
@@ -1,14 +1,17 @@
package org.jboss.seam.faces.event;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
import org.jboss.seam.faces.event.qualifier.After;
-import org.jboss.seam.faces.event.qualifier.AnyPhase;
import org.jboss.seam.faces.event.qualifier.ApplyRequestValues;
import org.jboss.seam.faces.event.qualifier.Before;
import org.jboss.seam.faces.event.qualifier.InvokeApplication;
@@ -20,169 +23,135 @@
@ApplicationScoped
public class PhaseEventObserver
{
- public static enum Observation
- {
- BEFORE_RENDER_RESPONSE, AFTER_RENDER_RESPONSE, BEFORE_APPLY_VALUES, AFTER_APPLY_VALUES, BEFORE_INVOKE_APPLICATION, AFTER_INVOKE_APPLICATION, BEFORE_PROCESS_VALIDATION, BEFORE_RESTORE_VIEW, AFTER_RESTORE_VIEW, AFTER_UPDATE_MODEL_VALUES, AFTER_PROCESS_VALIDATION, BEFORE_UPDATE_MODEL_VALUES
- }
+ private Map<String, List<PhaseId>> observations = new HashMap<String, List<PhaseId>>();
- private static final List<Observation> ALL_BEFORE_OBSERVATIONS = new ArrayList<Observation>()
+ private void recordObservation(String id, PhaseId observation)
{
- private static final long serialVersionUID = 1L;
+ List<PhaseId> observed = observations.get(id);
+ if (observed == null)
{
- add(Observation.BEFORE_APPLY_VALUES);
- add(Observation.BEFORE_INVOKE_APPLICATION);
- add(Observation.BEFORE_PROCESS_VALIDATION);
- add(Observation.BEFORE_RENDER_RESPONSE);
- add(Observation.BEFORE_RESTORE_VIEW);
- add(Observation.BEFORE_UPDATE_MODEL_VALUES);
+ observed = new ArrayList<PhaseId>();
+ observations.put(id, observed);
}
- };
+ observed.add(observation);
+ }
- private static final List<Observation> ALL_AFTER_OBSERVATIONS = new ArrayList<Observation>()
- {
- private static final long serialVersionUID = 1L;
- {
- add(Observation.AFTER_APPLY_VALUES);
- add(Observation.AFTER_INVOKE_APPLICATION);
- add(Observation.AFTER_PROCESS_VALIDATION);
- add(Observation.AFTER_RENDER_RESPONSE);
- add(Observation.AFTER_RESTORE_VIEW);
- add(Observation.AFTER_UPDATE_MODEL_VALUES);
- }
- };
-
- private List<Observation> observations = new ArrayList<Observation>();
- private List<Observation> beforeAnyObservations = new ArrayList<Observation>();
- private List<Observation> afterAnyObservations = new ArrayList<Observation>();
-
public void reset()
{
observations.clear();
- beforeAnyObservations.clear();
- afterAnyObservations.clear();
}
- public void assertSingleObservation(Observation observation)
+ public void assertObservations(String id, PhaseId... observations)
{
- assert observations.size() == 1;
- assert observation.equals(observations.iterator().next());
+ List<PhaseId> observed = this.observations.get(id);
+ assert observed != null && observed.size() == observations.length;
+ assert observed.containsAll(Arrays.asList(observations));
}
- private void recordObservation(Observation observation)
+ public void observeBeforeRenderResponse(@Observes @Before @RenderResponse final PhaseEvent e)
{
- observations.add(observation);
+ recordObservation("1", e.getPhaseId());
}
- public void observeBeforeAnyPhase(@Observes @Before @AnyPhase final PhaseEvent e)
+ public void observeAfterRenderResponse(@Observes @After @RenderResponse final PhaseEvent e)
{
- recordBeforeAnyObservations();
+ recordObservation("2", e.getPhaseId());
}
- private void recordBeforeAnyObservations()
+ public void observeBeforeApplyRequestValues(@Observes @Before @ApplyRequestValues final PhaseEvent e)
{
- recordBeforeAnyObservation(Observation.BEFORE_APPLY_VALUES);
- recordBeforeAnyObservation(Observation.BEFORE_INVOKE_APPLICATION);
- recordBeforeAnyObservation(Observation.BEFORE_PROCESS_VALIDATION);
- recordBeforeAnyObservation(Observation.BEFORE_RENDER_RESPONSE);
- recordBeforeAnyObservation(Observation.BEFORE_RESTORE_VIEW);
- recordBeforeAnyObservation(Observation.BEFORE_UPDATE_MODEL_VALUES);
+ recordObservation("3", e.getPhaseId());
}
- private void recordBeforeAnyObservation(Observation observation)
+ public void observeAfterApplyRequestValues(@Observes @After @ApplyRequestValues final PhaseEvent e)
{
- beforeAnyObservations.add(observation);
+ recordObservation("4", e.getPhaseId());
}
- public void observeAfterAnyPhase(@Observes @After @AnyPhase final PhaseEvent e)
+ public void observeBeforeInvokeApplication(@Observes @Before @InvokeApplication final PhaseEvent e)
{
- recordAfterAnyObservations();
+ recordObservation("5", e.getPhaseId());
}
- private void recordAfterAnyObservations()
+ public void observeAfterInvokeApplication(@Observes @After @InvokeApplication final PhaseEvent e)
{
- recordAfterAnyObservation(Observation.AFTER_APPLY_VALUES);
- recordAfterAnyObservation(Observation.AFTER_INVOKE_APPLICATION);
- recordAfterAnyObservation(Observation.AFTER_PROCESS_VALIDATION);
- recordAfterAnyObservation(Observation.AFTER_RENDER_RESPONSE);
- recordAfterAnyObservation(Observation.AFTER_RESTORE_VIEW);
- recordAfterAnyObservation(Observation.AFTER_UPDATE_MODEL_VALUES);
+ recordObservation("6", e.getPhaseId());
}
- private void recordAfterAnyObservation(Observation observation)
+ public void observeBeforeProcessValidations(@Observes @Before @ProcessValidations final PhaseEvent e)
{
- afterAnyObservations.add(observation);
+ recordObservation("7", e.getPhaseId());
}
- public void observeBeforeRenderResponse(@Observes @Before @RenderResponse final PhaseEvent e)
+ public void observeAfterProcessValidations(@Observes @After @ProcessValidations final PhaseEvent e)
{
- recordObservation(Observation.BEFORE_RENDER_RESPONSE);
+ recordObservation("8", e.getPhaseId());
}
- public void observeAfterRenderResponse(@Observes @After @RenderResponse final PhaseEvent e)
+ public void observeBeforeRestoreView(@Observes @Before @RestoreView final PhaseEvent e)
{
- recordObservation(Observation.AFTER_RENDER_RESPONSE);
+ recordObservation("9", e.getPhaseId());
}
- public void observeBeforeApplyRequestValues(@Observes @Before @ApplyRequestValues final PhaseEvent e)
+ public void observeAfterRestoreView(@Observes @After @RestoreView final PhaseEvent e)
{
- recordObservation(Observation.BEFORE_APPLY_VALUES);
+ recordObservation("10", e.getPhaseId());
}
- public void observeAfterApplyRequestValues(@Observes @After @ApplyRequestValues final PhaseEvent e)
+ public void observeBeforeUpdateModelValues(@Observes @Before @UpdateModelValues final PhaseEvent e)
{
- recordObservation(Observation.AFTER_APPLY_VALUES);
+ recordObservation("11", e.getPhaseId());
}
- public void observeBeforeInvokeApplication(@Observes @Before @InvokeApplication final PhaseEvent e)
+ public void observeAfterUpdateModelValues(@Observes @After @UpdateModelValues final PhaseEvent e)
{
- recordObservation(Observation.BEFORE_INVOKE_APPLICATION);
+ recordObservation("12", e.getPhaseId());
}
- public void observeAfterInvokeApplication(@Observes @After @InvokeApplication final PhaseEvent e)
+ public void observeAllRenderResponse(@Observes @RenderResponse final PhaseEvent e)
{
- recordObservation(Observation.AFTER_INVOKE_APPLICATION);
+ recordObservation("13", e.getPhaseId());
}
- public void observeBeforeProcessValidations(@Observes @Before @ProcessValidations final PhaseEvent e)
+ public void observeAllApplyRequestValues(@Observes @ApplyRequestValues final PhaseEvent e)
{
- recordObservation(Observation.BEFORE_PROCESS_VALIDATION);
+ recordObservation("14", e.getPhaseId());
}
- public void observeAfterProcessValidations(@Observes @After @ProcessValidations final PhaseEvent e)
+ public void observeAllInvokeApplication(@Observes @InvokeApplication final PhaseEvent e)
{
- recordObservation(Observation.AFTER_PROCESS_VALIDATION);
+ recordObservation("15", e.getPhaseId());
}
- public void observeBeforeRestoreView(@Observes @Before @RestoreView final PhaseEvent e)
+ public void observeAllProcessValidations(@Observes @ProcessValidations final PhaseEvent e)
{
- recordObservation(Observation.BEFORE_RESTORE_VIEW);
+ recordObservation("16", e.getPhaseId());
}
- public void observeAfterRestoreView(@Observes @After @RestoreView final PhaseEvent e)
+ public void observeAllRestoreView(@Observes @RestoreView final PhaseEvent e)
{
- recordObservation(Observation.AFTER_RESTORE_VIEW);
+ recordObservation("17", e.getPhaseId());
}
- public void observeBeforeUpdateModelValues(@Observes @Before @UpdateModelValues final PhaseEvent e)
+ public void observeAllUpdateModelValues(@Observes @UpdateModelValues final PhaseEvent e)
{
- recordObservation(Observation.BEFORE_UPDATE_MODEL_VALUES);
+ recordObservation("18", e.getPhaseId());
}
- public void observeAfterUpdateModelValues(@Observes @After @UpdateModelValues final PhaseEvent e)
+ public void observeAllBeforeEvents(@Observes @Before final PhaseEvent e)
{
- recordObservation(Observation.AFTER_UPDATE_MODEL_VALUES);
+ recordObservation("19", e.getPhaseId());
}
-
- public void assertAllAfterPhasesObserved()
+
+ public void observeAllAfterEvents(@Observes @Before final PhaseEvent e)
{
-// assert afterAnyObservations.size() == ALL_AFTER_OBSERVATIONS.size();
- assert afterAnyObservations.containsAll(ALL_AFTER_OBSERVATIONS);
+ recordObservation("20", e.getPhaseId());
}
-
- public void assertAllBeforePhasesObserved()
+
+ public void observeAllEvents(@Observes final PhaseEvent e)
{
-// assert beforeAnyObservations.size() == ALL_BEFORE_OBSERVATIONS.size();
- assert beforeAnyObservations.containsAll(ALL_BEFORE_OBSERVATIONS);
+ recordObservation("21", e.getPhaseId());
}
+
}
More information about the seam-commits
mailing list