diff 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
line wrap: on
line diff
--- a/src/tests/gov/nasa/jpf/test/mc/data/EventGeneratorTest.java	Wed Apr 01 12:14:15 2015 -0700
+++ b/src/tests/gov/nasa/jpf/test/mc/data/EventGeneratorTest.java	Mon Apr 06 12:08:03 2015 -0700
@@ -46,7 +46,7 @@
     }
     
     @Override
-    public Event createEventTree() {
+    public Event createRoot() {
       return 
         sequence(
           event("a"),
@@ -103,7 +103,7 @@
     }
     
     @Override
-    public Event createEventTree() {
+    public Event createRoot() {
        Event[] options = { event("A"), event("B"), event("C") };
 
        return anyCombination(options);
@@ -130,7 +130,7 @@
     }
     
     @Override
-    public Event createEventTree(){
+    public Event createRoot(){
       return
               sequence(
                 event("a"),