comparison src/tests/gov/nasa/jpf/test/mc/data/EventGeneratorTest.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 b920e6b1be83
children
comparison
equal deleted inserted replaced
19:9fea3d8da9aa 20:b1790909ebb1
44 "axxb" 44 "axxb"
45 }; 45 };
46 } 46 }
47 47
48 @Override 48 @Override
49 public Event createEventTree() { 49 public Event createRoot() {
50 return 50 return
51 sequence( 51 sequence(
52 event("a"), 52 event("a"),
53 alternatives( 53 alternatives(
54 event("1"), 54 event("1"),
101 printTree(); 101 printTree();
102 printPaths(); 102 printPaths();
103 } 103 }
104 104
105 @Override 105 @Override
106 public Event createEventTree() { 106 public Event createRoot() {
107 Event[] options = { event("A"), event("B"), event("C") }; 107 Event[] options = { event("A"), event("B"), event("C") };
108 108
109 return anyCombination(options); 109 return anyCombination(options);
110 } 110 }
111 } 111 }
128 public ExpandTree (){ 128 public ExpandTree (){
129 printTree(); 129 printTree();
130 } 130 }
131 131
132 @Override 132 @Override
133 public Event createEventTree(){ 133 public Event createRoot(){
134 return 134 return
135 sequence( 135 sequence(
136 event("a"), 136 event("a"),
137 event("*"), 137 event("*"),
138 event("<opt>"), 138 event("<opt>"),