Changeset 105 for java/main/src/test/java/com/framsticks/gui

Timestamp:

09/10/13 21:11:41 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• import refactorization: move Tree, Path, etc.

from core to structure package

• initial serialization implementation
• improve PrimeExperiment? test
• many organizational changes and convenience improvements

CHANGELOG:
Make registry in AbstractTree? final.

Move most classes from core to structure package.

Minor changes.

Switch names of Future and FutureHandler?.

Rename ExceptionResultHandler? to ExceptionHandler?.

Rename ExceptionHandler? to ExceptionDispatcherHandler?.

Fix bug in ParamCandidate? cache.

Add missing synchronization to the BufferedDispatcher?.

Develop @Serialized support.

Rework serialization further.

Add serialization/deserialization interface to ValueParam?.

Move getStorageType and isNumeric from Param down to params hierarchy.

Minor changes.

Improve param type induction.

Add TestSerializedClass? for testing new serialization.

Add info files gor GenePool? and Population.

Add standard.expt exemplary netfile.

Add type name field to PropertiesObject?.

Use PropertiesObject? for PropertiesAccess? instead of ordinary map.

Hide getFramsClass is several more places.

More unification accross FramsClass?, Access and Path.

Add ParamCollection?.

Simplify interface for getting params from FramsClass?, Access
or Path.

Make Access.call() interface variadic.

Add arguments(args) convenience wrapper around new Object[] {args}.

Upgrade to apache.commons.lang version 3.1

Minor improvement with Response constructors.

Develop proper result printing in ClientAtServer?.

Add experimentNetsave to PrimeExperiment?.

Location:

java/main/src/test/java/com/framsticks/gui

Files:

• LocalTreeBrowserTest.java (modified) (2 diffs)
• ProcedureBrowserTest.java (modified) (5 diffs)
• console/TrackConsoleTest.java (modified) (2 diffs)

java/main/src/test/java/com/framsticks/gui/LocalTreeBrowserTest.java

@@ -5 +5 @@
 import org.testng.annotations.Test;
 
-import com.framsticks.core.Tree;
-import com.framsticks.core.LocalTree;
 import com.framsticks.model.Model;
 import com.framsticks.params.types.FloatParam;
 import com.framsticks.parsers.XmlLoader;
+import com.framsticks.structure.LocalTree;
+import com.framsticks.structure.Tree;
 import com.framsticks.util.dispatching.RunAt;
 
-import static com.framsticks.core.TreeOperations.*;
+import static com.framsticks.params.ParamsUtil.getParam;
+import static com.framsticks.structure.TreeOperations.*;
 
 @Test
@@ -45 +46 @@
                         @Override
                         protected void runAt() {
-                                assertThat(bindAccess(tree, "/parts/2").getFramsClass().getParamEntry("m", FloatParam.class).getMax(Double.class)).isEqualTo(999.0);
+                                assertThat(getParam(bindAccess(tree, "/parts/2"), "m", FloatParam.class).getMax(Double.class)).isEqualTo(999.0);
                         }
                 });

java/main/src/test/java/com/framsticks/gui/ProcedureBrowserTest.java

@@ -7 +7 @@
 import org.testng.annotations.Test;
 
-import com.framsticks.core.Path;
-import com.framsticks.core.Tree;
-import com.framsticks.core.LocalTree;
-import com.framsticks.core.ValueChange;
 import com.framsticks.params.Access;
 import com.framsticks.params.EventListener;
-import com.framsticks.params.FramsClass;
 import com.framsticks.params.ReflectionAccess;
 import com.framsticks.params.types.EventParam;
 import com.framsticks.params.types.StringParam;
 import com.framsticks.parsers.XmlLoader;
+import com.framsticks.structure.LocalTree;
+import com.framsticks.structure.Path;
+import com.framsticks.structure.Tree;
+import com.framsticks.structure.messages.ValueChange;
 import com.framsticks.test.TestClass;
-import com.framsticks.util.dispatching.FutureHandler;
+import com.framsticks.util.dispatching.Future;
 // import com.framsticks.util.dispatching.Dispatching;
 import com.framsticks.util.dispatching.RunAt;
-import static com.framsticks.core.TreeOperations.*;
+import static com.framsticks.params.ParamsUtil.getParam;
+import static com.framsticks.structure.TreeOperations.*;
 
 @Test
@@ -53 +53 @@
                         @Override
                         protected void runAt() {
-                                assertThat(bindAccess(tree, "/").getFramsClass().getParam("history")).isInstanceOf(StringParam.class);
+                                assertThat(getParam(bindAccess(tree, "/"), "history")).isInstanceOf(StringParam.class);
                         }
                 });
@@ -64 +64 @@
                                 Access access = bindAccess(tree, "/");
                                 assertThat(access).isInstanceOf(ReflectionAccess.class);
-                                FramsClass framsClass = access.getFramsClass();
-                                assertThat(framsClass.getParam(0).getId()).isEqualTo("name");
-                                assertThat(framsClass.getParam(1).getId()).isEqualTo("history");
-                                assertThat(framsClass.getParam(2).getId()).isEqualTo("history_changed");
-                                assertThat(framsClass.getParam(3).getId()).isEqualTo("appendHistory");
-                                assertThat(framsClass.getParam(4).getId()).isEqualTo("resetHistory");
+                                assertThat(getParam(access, 0).getId()).isEqualTo("name");
+                                assertThat(getParam(access, 1).getId()).isEqualTo("history");
+                                assertThat(getParam(access, 2).getId()).isEqualTo("history_changed");
+                                assertThat(getParam(access, 3).getId()).isEqualTo("appendHistory");
+                                assertThat(getParam(access, 4).getId()).isEqualTo("resetHistory");
 
                                 assertThat(access.get("history", String.class)).isEqualTo("initial|");
@@ -96 +95 @@
                                 assertThat(access.get("history", String.class)).isEqualTo("initial|Żółw|");
 
-                                tree.addListener(Path.to(tree, "/"), access.getFramsClass().getParamEntry("history_changed", EventParam.class), listener, ValueChange.class, FutureHandler.doNothing(Void.class, failOnException));
+                                tree.addListener(Path.to(tree, "/"), getParam(access, "history_changed", EventParam.class), listener, ValueChange.class, Future.doNothing(Void.class, failOnException));
                         }
                 });
@@ -109 +108 @@
                                 assertThat(access.get("history", String.class)).isEqualTo("");
 
-                                tree.removeListener(Path.to(tree, "/"), access.getFramsClass().getParamEntry("history_changed", EventParam.class), listener, FutureHandler.doNothing(Void.class, failOnException));
+                                tree.removeListener(Path.to(tree, "/"), getParam(access, "history_changed", EventParam.class), listener, Future.doNothing(Void.class, failOnException));
                         }
                 });

java/main/src/test/java/com/framsticks/gui/console/TrackConsoleTest.java

@@ -3 +3 @@
 import org.testng.annotations.Test;
 
-import com.framsticks.core.Path;
 import com.framsticks.gui.GuiTest;
 import com.framsticks.remote.RemoteTree;
+import com.framsticks.structure.Path;
 import com.framsticks.util.dispatching.Dispatching;
 import com.framsticks.util.dispatching.Dispatching.Waiter;
-import com.framsticks.util.dispatching.FutureHandler;
+import com.framsticks.util.dispatching.Future;
 import com.framsticks.util.dispatching.Joinable;
 import com.framsticks.util.dispatching.JoinableCollection;
 
-import static com.framsticks.core.TreeOperations.*;
+import static com.framsticks.structure.TreeOperations.*;
 
 @Test
@@ -41 +41 @@
                 final Waiter waiter = produceWaiter(1.0);
 
-                tryGet(tree, "/simulator/genepools/groups/0", new FutureHandler<Path>(failOnException) {
+                tryGet(tree, "/simulator/genepools/groups/0", new Future<Path>(failOnException) {
 
                         @Override