X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcore%2FEnvironment.java;h=c202d1ab23d317e83701bd8ba71d90e555466810;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=4b791d0570768f9b192e8da21131613d6ea9a42e;hpb=da48a523c81e59fe0eac34e43d12937396161f25;p=utils diff --git a/system/general/src/test/java/org/wamblee/system/core/Environment.java b/system/general/src/test/java/org/wamblee/system/core/Environment.java index 4b791d05..c202d1ab 100644 --- a/system/general/src/test/java/org/wamblee/system/core/Environment.java +++ b/system/general/src/test/java/org/wamblee/system/core/Environment.java @@ -33,9 +33,9 @@ public class Environment extends AbstractComponent { private static int COUNT = 0; - private EventTracker _tracker; - private double _random; - private int _integer; + private EventTracker tracker; + private double random; + private int integer; public Environment() { this("environment"); @@ -47,19 +47,19 @@ public class Environment extends AbstractComponent { public Environment(String aName, String aPrefix) { super(aName, provided(aPrefix), new RequiredInterface[0]); - _random = Math.random(); - _integer = COUNT++; + random = Math.random(); + integer = COUNT++; } public Environment(EventTracker aTracker) { this(); - _tracker = aTracker; + tracker = aTracker; } public Integer getInteger() { - return _integer; + return integer; } public String getString() { @@ -71,22 +71,22 @@ public class Environment extends AbstractComponent { addInterface(getProvidedInterfaces().get(0), getString(), aScope); addInterface(getProvidedInterfaces().get(1), getInteger(), aScope); track("start." + getName()); - return _random; + return random; } @Override protected void doStop(Object aRuntime) { track("stop." + getName()); - if (_random != (Double) aRuntime) { + if (random != (Double) aRuntime) { throw new IllegalArgumentException("Wrong runtime: expected " - + _random + " but got " + aRuntime); + + random + " but got " + aRuntime); } } private void track(String aString) { - if (_tracker == null) { + if (tracker == null) { return; } - _tracker.eventOccurred(aString); + tracker.eventOccurred(aString); } }