Mercurial > hg > Members > kono > jpf-core
diff src/tests/gov/nasa/jpf/util/event/EventTreeTest.java @ 20:b1790909ebb1
changed EventForest to derive from EventTree, which kills three birds with one
stone - guaranteeing there is a default tree, being able to initialize
a concrete forest with one method (createRoot), and being able to use both
EventTree and EventForest with a ForestCGFactory, i.e. without changes to the
config other than the event tree class name
slight refactoring of EventTree (createTree() -> createRoot()) to make it more
obvious how the result is used
| author | Peter Mehlitz <pcmehlitz@gmail.com> |
|---|---|
| date | Mon, 06 Apr 2015 12:08:03 -0700 |
| parents | 61d41facf527 |
| children |
line wrap: on
line diff
--- a/src/tests/gov/nasa/jpf/util/event/EventTreeTest.java Wed Apr 01 12:14:15 2015 -0700 +++ b/src/tests/gov/nasa/jpf/util/event/EventTreeTest.java Mon Apr 06 12:08:03 2015 -0700 @@ -65,7 +65,7 @@ static class SimpleTree extends EventTree { @Override - public Event createEventTree() { + public Event createRoot() { return sequence( event("a"), @@ -97,7 +97,7 @@ //-------------------------------------------------------------------- public static class CombinationTree extends EventTree { @Override - public Event createEventTree() { + public Event createRoot() { return anyCombination( event("a"), event("b"), @@ -138,7 +138,7 @@ static class SimpleCombinationTree extends EventTree { @Override - public Event createEventTree() { + public Event createRoot() { return anyCombination( event("a"), event("b") @@ -159,7 +159,7 @@ static class EmbeddedCombinationTree extends EventTree { @Override - public Event createEventTree() { + public Event createRoot() { return sequence( event("1"), anyCombination( @@ -182,7 +182,7 @@ //-------------------------------------------------------------------- static class DT extends EventTree { @Override - public Event createEventTree() { + public Event createRoot() { return sequence( event("a"), alternatives( @@ -215,7 +215,7 @@ //-------------------------------------------------------------------- static class PermutationTree extends EventTree { @Override - public Event createEventTree(){ + public Event createRoot(){ return anyPermutation( event("a"), event("b"), @@ -246,7 +246,7 @@ //-------------------------------------------------------------------- static class AddPathTree extends EventTree { @Override - public Event createEventTree(){ + public Event createRoot(){ return sequence( event("a"), event("b"), @@ -273,7 +273,7 @@ //------------------------------------------------------------------- static class MT1 extends EventTree { @Override - public Event createEventTree(){ + public Event createRoot(){ return sequence( event("a"), event("b"), @@ -284,7 +284,7 @@ static class MT2 extends EventTree { @Override - public Event createEventTree(){ + public Event createRoot(){ return sequence( event("1"), event("2"), @@ -295,7 +295,7 @@ static class MT3 extends EventTree { @Override - public Event createEventTree(){ + public Event createRoot(){ return sequence( event("X"), event("Y") @@ -344,7 +344,7 @@ //------------------------------------------------------------------- static class SMT1 extends EventTree { @Override - public Event createEventTree(){ + public Event createRoot(){ return sequence( event("a"), event("b") @@ -354,7 +354,7 @@ static class SMT2 extends EventTree { @Override - public Event createEventTree(){ + public Event createRoot(){ return sequence( event("1"), event("2") @@ -379,7 +379,7 @@ //------------------------------------------------------------------- static class RT1 extends EventTree { @Override - public Event createEventTree(){ + public Event createRoot(){ return sequence( event("a"), event("b") @@ -389,7 +389,7 @@ static class RT2 extends EventTree { @Override - public Event createEventTree(){ + public Event createRoot(){ return sequence( event("1"), event("2")