You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ar...@apache.org on 2012/10/13 18:23:27 UTC
svn commit: r1397890 - in
/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer:
BeanA.java BeanB.java EventTest.java PrivateTestEvent.java Superclass.java
Author: arne
Date: Sat Oct 13 16:23:26 2012
New Revision: 1397890
URL: http://svn.apache.org/viewvc?rev=1397890&view=rev
Log:
OWB-711 Added test for private observer methods
Added:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/PrivateTestEvent.java
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/BeanA.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/BeanB.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/EventTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/Superclass.java
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/BeanA.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/BeanA.java?rev=1397890&r1=1397889&r2=1397890&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/BeanA.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/BeanA.java Sat Oct 13 16:23:26 2012
@@ -29,14 +29,12 @@ public class BeanA extends Superclass im
{
private static final long serialVersionUID = 821164664338581947L;
- protected void observeTestEvent(@Observes TestEvent testEvent)
- {
+ private void observeTestEvent(@Observes PrivateTestEvent testEvent) {
testEvent.addInvocation(getBeanName());
}
- @Override
- public String getBeanName()
+ protected void observeTestEvent(@Observes TestEvent testEvent)
{
- return super.getBeanName() + ":[subclass]";
+ testEvent.addInvocation(getBeanName());
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/BeanB.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/BeanB.java?rev=1397890&r1=1397889&r2=1397890&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/BeanB.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/BeanB.java Sat Oct 13 16:23:26 2012
@@ -28,6 +28,10 @@ public class BeanB extends Superclass im
{
private static final long serialVersionUID = 821164664338581947L;
+ private void observeTestEvent(PrivateTestEvent testEvent) {
+ testEvent.addInvocation(getBeanName());
+ }
+
protected void observeTestEvent(TestEvent testEvent)
{
testEvent.addInvocation(getBeanName());
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/EventTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/EventTest.java?rev=1397890&r1=1397889&r2=1397890&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/EventTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/EventTest.java Sat Oct 13 16:23:26 2012
@@ -39,7 +39,7 @@ public class EventTest extends AbstractU
getBeanManager().fireEvent(testEvent);
Assert.assertEquals(1, testEvent.getCalledObservers().size());
- Assert.assertTrue(testEvent.getCalledObservers().iterator().next().endsWith(":[subclass]"));
+ Assert.assertTrue(testEvent.getCalledObservers().iterator().next().equals("BeanA"));
shutDownContainer();
}
@@ -59,4 +59,22 @@ public class EventTest extends AbstractU
shutDownContainer();
}
+
+ @Test
+ public void testObserverOnPrivateMethod() {
+ Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
+ beanClasses.add(Superclass.class);
+ beanClasses.add(BeanA.class);
+ startContainer(beanClasses, null);
+
+ PrivateTestEvent testEvent = new PrivateTestEvent();
+ getBeanManager().fireEvent(testEvent);
+
+ Assert.assertEquals(2, testEvent.getCalledObservers().size());
+ Assert.assertTrue(testEvent.getCalledObservers().contains("BeanA"));
+ Assert.assertTrue(testEvent.getCalledObservers().contains("BeanA[Superclass]"));
+
+ shutDownContainer();
+
+ }
}
Added: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/PrivateTestEvent.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/PrivateTestEvent.java?rev=1397890&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/PrivateTestEvent.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/PrivateTestEvent.java Sat Oct 13 16:23:26 2012
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.webbeans.newtests.events.observer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PrivateTestEvent
+{
+ private List<String> calledObserverNames = new ArrayList<String>();
+
+ public void addInvocation(String observerName)
+ {
+ this.calledObserverNames.add(observerName);
+ }
+
+ public List<String> getCalledObservers()
+ {
+ return calledObserverNames;
+ }
+}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/Superclass.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/Superclass.java?rev=1397890&r1=1397889&r2=1397890&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/Superclass.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/observer/Superclass.java Sat Oct 13 16:23:26 2012
@@ -23,6 +23,10 @@ import javax.enterprise.event.Observes;
public abstract class Superclass
{
+ private void observeTestEvent(@Observes PrivateTestEvent testEvent) {
+ testEvent.addInvocation(getBeanName() + "[" + Superclass.class.getSimpleName() + "]");
+ }
+
protected void observeTestEvent(@Observes TestEvent testEvent)
{
testEvent.addInvocation(getBeanName());