neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename event and listener methods

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@81 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-05-03 17:33:48 +02:00
parent bcc3f95847
commit 6161c4b1d4
12 changed files with 69 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/jrummikub/util/Event1Test.java
View file

@ -15,15 +15,15 @@ public class Event1Test {
testEvent.add(new IListener1<Integer>() {
@Override
public void fire(Integer n) {
public void handle(Integer n) {
fired += n;
}
});
assertEquals(fired, 0);
testEvent.fire(10);
testEvent.emit(10);
assertEquals(fired, 10);
testEvent.fire(20);
testEvent.emit(20);
assertEquals(fired, 30);
}
@ -35,7 +35,7 @@ public class Event1Test {
testEvent.add(new IListener1<Integer>() {
@Override
public void fire(Integer n) {
public void handle(Integer n) {
fired += n;
}
@ -43,14 +43,14 @@ public class Event1Test {
testEvent.add(new IListener1<Integer>() {
@Override
public void fire(Integer n) {
public void handle(Integer n) {
fired2 -= n;
}
});
assertEquals(fired, 0);
assertEquals(fired2, 0);
testEvent.fire(5);
testEvent.emit(5);
assertEquals(fired, 5);
assertEquals(fired2, -5);
@ -63,7 +63,7 @@ public class Event1Test {
testEvent.add(new IListener1<Integer>() {
@Override
public void fire(Integer n) {
public void handle(Integer n) {
fired += n;
}
@ -71,13 +71,13 @@ public class Event1Test {
IListener1<Integer> rem = new IListener1<Integer>() {
@Override
public void fire(Integer n) {
public void handle(Integer n) {
fail();
}
};
testEvent.add(rem);
testEvent.remove(rem);
testEvent.fire(10);
testEvent.emit(10);
assertEquals(fired, 10);
}
}

18
test/jrummikub/util/Event2Test.java
View file

@ -16,17 +16,17 @@ public class Event2Test {
testEvent.add(new IListener2<Integer, Integer>() {
@Override
public void fire(Integer n, Integer m) {
public void handle(Integer n, Integer m) {
fired += n;
fired2 += m;
}
});
assertEquals(fired, 0);
assertEquals(fired2, 0);
testEvent.fire(10, 5);
testEvent.emit(10, 5);
assertEquals(fired, 10);
assertEquals(fired2, 5);
testEvent.fire(20, 45);
testEvent.emit(20, 45);
assertEquals(fired, 30);
assertEquals(fired2, 50);
}
@ -41,7 +41,7 @@ public class Event2Test {
testEvent.add(new IListener2<Integer, Integer>() {
@Override
public void fire(Integer n, Integer m) {
public void handle(Integer n, Integer m) {
fired += n;
fired2 += m;
}
@ -49,7 +49,7 @@ public class Event2Test {
testEvent.add(new IListener2<Integer, Integer>() {
@Override
public void fire(Integer n, Integer m) {
public void handle(Integer n, Integer m) {
fired3 -= n;
fired4 -= m;
}
@ -58,7 +58,7 @@ public class Event2Test {
assertEquals(fired2, 0);
assertEquals(fired3, 0);
assertEquals(fired4, 0);
testEvent.fire(5, 10);
testEvent.emit(5, 10);
assertEquals(fired, 5);
assertEquals(fired2, 10);
assertEquals(fired3, -5);
@ -73,7 +73,7 @@ public class Event2Test {
testEvent.add(new IListener2<Integer, Integer>() {
@Override
public void fire(Integer n, Integer m) {
public void handle(Integer n, Integer m) {
fired += n;
fired2 += m;
}
@ -81,7 +81,7 @@ public class Event2Test {
IListener2<Integer, Integer> rem = new IListener2<Integer, Integer>() {
@Override
public void fire(Integer n, Integer m) {
public void handle(Integer n, Integer m) {
fail();
}
};
@ -89,7 +89,7 @@ public class Event2Test {
assertEquals(fired2, 0);
testEvent.add(rem);
testEvent.remove(rem);
testEvent.fire(10, 20);
testEvent.emit(10, 20);
assertEquals(fired, 10);
assertEquals(fired2, 20);
}

18
test/jrummikub/util/EventTest.java
View file

@ -13,16 +13,16 @@ public class EventTest {
testEvent.add(new IListener() {
@Override
public void fire() {
public void handle() {
fired = true;
}
});
assertFalse(fired);
testEvent.fire();
testEvent.emit();
assertTrue(fired);
fired = false;
testEvent.fire();
testEvent.emit();
assertTrue(fired);
}
@ -34,7 +34,7 @@ public class EventTest {
testEvent.add(new IListener() {
@Override
public void fire() {
public void handle() {
fired = true;
}
@ -42,14 +42,14 @@ public class EventTest {
testEvent.add(new IListener() {
@Override
public void fire() {
public void handle() {
fired2 = true;
}
});
assertFalse(fired);
assertFalse(fired2);
testEvent.fire();
testEvent.emit();
assertTrue(fired);
assertTrue(fired2);
@ -62,7 +62,7 @@ public class EventTest {
testEvent.add(new IListener() {
@Override
public void fire() {
public void handle() {
fired = true;
}
@ -70,13 +70,13 @@ public class EventTest {
IListener rem = new IListener() {
@Override
public void fire() {
public void handle() {
fail();
}
};
testEvent.add(rem);
testEvent.remove(rem);
testEvent.fire();
testEvent.emit();
assertTrue(fired);
}