Kaydet (Commit) 2a583603 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Make test code more robust

Change-Id: If3b58c02b289224938b1dfd8074f9802ea6d2474
üst a6f5770b
...@@ -77,7 +77,9 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest { ...@@ -77,7 +77,9 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
if (nev instanceof com.sun.star.accessibility.XAccessible) { if (nev instanceof com.sun.star.accessibility.XAccessible) {
System.out.println("New: "+((XAccessible)nev).getAccessibleContext().getAccessibleName()); System.out.println("New: "+((XAccessible)nev).getAccessibleContext().getAccessibleName());
} }
notifiedEvent = ev; synchronized (this) {
notifiedEvent = ev;
}
} }
public void disposing(EventObject ev) {} public void disposing(EventObject ev) {}
...@@ -118,7 +120,11 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest { ...@@ -118,7 +120,11 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
boolean works = true; boolean works = true;
if (list.notifiedEvent == null) { AccessibleEventObject ne;
synchronized (list) {
ne = list.notifiedEvent;
}
if (ne == null) {
if (!isTransient) { if (!isTransient) {
log.println("listener wasn't called"); log.println("listener wasn't called");
works = false; works = false;
...@@ -151,17 +157,23 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest { ...@@ -151,17 +157,23 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
public void _removeEventListener() throws Exception { public void _removeEventListener() throws Exception {
requiredMethod("addEventListener()"); requiredMethod("addEventListener()");
list.notifiedEvent = null;
log.println("remove listener"); log.println("remove listener");
oObj.removeAccessibleEventListener(list); oObj.removeAccessibleEventListener(list);
synchronized (list) {
list.notifiedEvent = null;
}
log.println("fire event"); log.println("fire event");
prod.fireEvent() ; prod.fireEvent() ;
waitForEventIdle(); waitForEventIdle();
if (list.notifiedEvent == null) { AccessibleEventObject ne;
synchronized (list) {
ne = list.notifiedEvent;
}
if (ne == null) {
log.println("listener wasn't called -- OK"); log.println("listener wasn't called -- OK");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment