Changeset 101 for java/main/src/test/java/com/framsticks

Timestamp:

07/14/13 23:20:04 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• improve tree side notes
• improve GUI layout
• add foldable list of occured events to EventControl?
• improve automatic type conversion in proxy listeners
• implement several Access functionalities as algorithms independent of Access type
• introduce draft base classes for distributed experiments
• automatically register dependant Java classes to FramsClass? registry
• add testing prime experiment and configuration
• simplify and improve task dispatching

CHANGELOG:
Improve task dispatching in RemoteTree?.

GUI no longer hangs on connection problems.

Make all dispatchers joinables.

Refactorize Thread dispatcher.

Remove Task and PeriodicTask?.

Use Java utilities in those situations.

Reworking tasks dispatching.

Fix bug in EventControl? listener dispatching.

Minor improvements.

Add testing configuration for ExternalProcess? in GUI.

More improvement to prime.

Support for USERREADONLY in GUI.

Add that flag to various params in Java classes.

Remove redundant register clauses from several FramsClassAnnotations?.

Automatically gather and register dependant classes.

Add configuration for prime.

Improve Simulator class.

Add prime.xml configuration.

Introduce draft Experiment and Simulator classes.

Add prime experiment tests.

Enclose typical map with listeners into SimpleUniqueList?.

Needfile works in GUI.

Improve needfile handling in Browser.

More improvement with NeedFile?.

Implementing needfile.

Update test.

Rename ChangeEvent? to TestChangeEvent?.

Automatic argument type search in RemoteTree? listeners.

MultiParamLoader? uses AccessProvider?. By default old implementation
enclosed in AccessStash? or Registry.

Minor changes.

Rename SourceInterface? to Source.

Also improve toString of File and ListSource?.

Remove unused SimpleSource? class.

Add clearing in HistoryControl?.

Show entries in table at EventControl?.

Improve EventControl?.

Add listeners registration to EventControl?.

Add foldable table to HistoryControl?.

Add control row to Procedure and Event controls.

Improve layout of controls.

Another minor change to gui layout.

Minor improvement in the SliderControl?.

Minor changes.

Move ReflectionAccess?.Backend to separate file.

It was to cluttered.

Cleanup in ReflectionAccess?.

Move setMin, setMax, setDef to AccessOperations?.

Extract loading operation into AccessOperations?.

Append Framsticks to name of UnsupportedOperationException?.

The java.lang.UnsupportedOperationException? was shadowing this class.

Rename params.Util to params.ParamsUtil?.

Several improvements.

• Merge ValueControlListener? into ControlOwner?.
• Remove several deprecated utility classes.
• Add EventListeners? utility container.

Minor changes.

Implement revert functionality.

Improve local changes management.

Minor improvement.

Remove methods rendered superfluous after SideNoteKey? improvement.

Improve SideNoteKey?.

It is now generic type, so explicit type specification at
call site is no more needed.

Introduce SideNoteKey? interface.

Only Objects implementing that key may be used as side note keys.

Minor improvements.

Use strings instead of ValueControls? in several gui mappings.

Location:

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

Files:

• communication/RequestTest.java (modified) (1 diff)
• core/ListChangeTest.java (modified) (2 diffs)
• core/XmlBasedTest.java (modified) (1 diff)
• gui/ProcedureBrowserTest.java (modified) (3 diffs)
• gui/console/TrackConsoleTest.java (modified) (2 diffs)
• hosting/ServerTest.java (modified) (5 diffs)
• model/ModelPackageTest.java (modified) (2 diffs)
• params/FramsClassBuilderTest.java (modified) (3 diffs)
• params/ParamBuilderTest.java (modified) (1 diff)
• parsers/F0ParserTest.java (modified) (1 diff)
• running/ExternalProcessTest.java (modified) (2 diffs)
• test/PrimeExperimentTest.java (added)

java/main/src/test/java/com/framsticks/communication/RequestTest.java

@@ -28 +28 @@
 
                 assertThat(Request.takeRequestId(true, " 2 simple second")).isEqualTo(Pair.make(2, "simple second"));
+                assertThat(Request.takeRequestId(true, " -3 simple")).isEqualTo(Pair.make(-3, "simple"));
         }
 

java/main/src/test/java/com/framsticks/core/ListChangeTest.java

@@ -7 +7 @@
 
 import com.framsticks.core.ListChange.Action;
+import com.framsticks.params.AccessOperations;
 import com.framsticks.params.FramsClass;
 import com.framsticks.params.ListSink;
@@ -60 +61 @@
         @Test(dependsOnMethods = "createReflectionAccess")
         public void load() throws Exception {
-                access.select(listChange).load(ListSource.createFrom("type:2", "pos:0", "id:test"));
+                AccessOperations.load(access.select(listChange), ListSource.createFrom("type:2", "pos:0", "id:test"));
 
                 assertThat(listChange.action).isEqualTo(Action.Modify);

java/main/src/test/java/com/framsticks/core/XmlBasedTest.java

@@ -26 +26 @@
         }
 
-        protected abstract String getConfigurationName();
+        protected String getConfigurationName() {
+                return this.getClass().getSimpleName() + ".xml";
+        }
 
 

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

@@ -17 +17 @@
 import com.framsticks.params.types.StringParam;
 import com.framsticks.parsers.XmlLoader;
-import com.framsticks.test.ChangeEvent;
+import com.framsticks.test.TestChangeEvent;
 import com.framsticks.test.TestClass;
 import com.framsticks.util.dispatching.FutureHandler;
@@ -82 +82 @@
                 waitForIdle();
 
-                final EventListener<ChangeEvent> listener = new EventListener<ChangeEvent>() {
+                final EventListener<TestChangeEvent> listener = new EventListener<TestChangeEvent>() {
 
                         @Override
-                        public void action(ChangeEvent argument) {
+                        public void action(TestChangeEvent argument) {
                                 assertThat(argument.history).isEqualTo("");
                         }
@@ -96 +96 @@
                                 assertThat(access.get("history", String.class)).isEqualTo("initial|Żółw|");
 
-                                tree.addListener(Path.to(tree, "/"), access.getFramsClass().getParamEntry("history_changed", EventParam.class), listener, ChangeEvent.class, FutureHandler.doNothing(Void.class, failOnException));
+                                tree.addListener(Path.to(tree, "/"), access.getFramsClass().getParamEntry("history_changed", EventParam.class), listener, TestChangeEvent.class, FutureHandler.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.communication.Address;
-import com.framsticks.communication.ClientSideManagedConnection;
-import com.framsticks.communication.Connection;
 import com.framsticks.core.Path;
 import com.framsticks.gui.GuiTest;
@@ -28 +25 @@
                 tree = new RemoteTree();
 
-                tree.setConnection(Connection.to(new ClientSideManagedConnection(), new Address("localhost:9009")));
+                tree.setAddress("localhost:9009");
 
                 console = new TrackConsole().setConnection(tree.getConnection());

java/main/src/test/java/com/framsticks/hosting/ServerTest.java

@@ -15 +15 @@
 import com.framsticks.remote.RemoteTree;
 
-import com.framsticks.test.ChangeEvent;
+import com.framsticks.test.TestChangeEvent;
 import com.framsticks.test.TestClass;
 import com.framsticks.core.Tree;
@@ -45 +45 @@
         protected LocalTree hosted;
         protected TestClass hostedObject;
-        protected EventListener<ChangeEvent> listener;
+        protected EventListener<TestChangeEvent> listener;
         protected EventListener<ListChange> childListener;
 
@@ -52 +52 @@
 
 
-        @Override
-        protected String getConfigurationName() {
-                return "ServerTest.xml";
-        }
 
         @Test
@@ -127 +123 @@
         public void registerListener() {
                 final Waiter waiter = produceWaiter(1.0);
-                listener = new EventListener<ChangeEvent>() {
-
-                        @Override
-                        public void action(ChangeEvent argument) {
+                listener = new EventListener<TestChangeEvent>() {
+
+                        @Override
+                        public void action(TestChangeEvent argument) {
                                 listenerArguments.add(argument.history);
                         }
@@ -142 +138 @@
                 });
 
-                addListener(remotePath, remoteTestFramsClass.getParamEntry("history_changed", EventParam.class), listener, ChangeEvent.class, produceWaiter(1.0).passInFuture(Void.class));
+                addListener(remotePath, remoteTestFramsClass.getParamEntry("history_changed", EventParam.class), listener, TestChangeEvent.class, produceWaiter(1.0).passInFuture(Void.class));
         }
 

java/main/src/test/java/com/framsticks/model/ModelPackageTest.java

@@ -8 +8 @@
 import com.framsticks.params.FramsClass;
 import com.framsticks.params.ReflectionAccess;
-import com.framsticks.params.SourceInterface;
+import com.framsticks.params.Source;
 import com.framsticks.params.ValueParam;
 import com.framsticks.parsers.FileSource;
@@ -25 +25 @@
                 assertThat(stream).describedAs("stream " + filename).isNotNull();
 
-                SourceInterface source = new FileSource(stream, filename);
+                Source source = new FileSource(stream, filename);
 
                 assertThat(source.isClosed()).isFalse();

java/main/src/test/java/com/framsticks/params/FramsClassBuilderTest.java

@@ -10 +10 @@
 import com.framsticks.params.types.StringParam;
 import com.framsticks.parsers.Savers;
-import com.framsticks.test.ChangeEvent;
+import com.framsticks.test.TestChangeEvent;
 import com.framsticks.test.TestClass;
 import com.framsticks.test.TestConfiguration;
@@ -69 +69 @@
                                         "id:history_changed",
                                         "name:HistoryListener",
-                                        "type:e ChangeEvent",
+                                        "type:e TestChangeEvent",
                                         "",
                                         "prop:",
@@ -128 +128 @@
                 final Holder<String> called = new Holder<>();
 
-                final EventListener<ChangeEvent> listener = new EventListener<ChangeEvent>() {
+                final EventListener<TestChangeEvent> listener = new EventListener<TestChangeEvent>() {
 
                         @Override
-                        public void action(ChangeEvent argument) {
+                        public void action(TestChangeEvent argument) {
                                 called.set(argument.history);
                         }

java/main/src/test/java/com/framsticks/params/ParamBuilderTest.java

@@ -30 +30 @@
         public void loadParam() throws Exception {
                 access = new ReflectionAccess(ParamBuilder.class, builderFramsClass);
-                SourceInterface source = ListSource.createFrom("prop:", "id:v", "name:variable", "type:f", "help:just a testing variable", "");
+                Source source = ListSource.createFrom("prop:", "id:v", "name:variable", "type:f", "help:just a testing variable", "");
 
                 MultiParamLoader loader = new MultiParamLoader();

java/main/src/test/java/com/framsticks/parsers/F0ParserTest.java

@@ -73 +73 @@
         @Test(dependsOnMethods = {"readF0"})
         public void stripAccess() {
-                components = Util.stripAccess(accesses, ModelComponent.class);
+                components = ParamsUtil.stripAccess(accesses, ModelComponent.class);
 
                 assertThat(components.get(1)).isInstanceOf(Part.class);

java/main/src/test/java/com/framsticks/running/ExternalProcessTest.java

@@ -9 +9 @@
 import org.testng.annotations.Test;
 
+import com.framsticks.core.ValueChange;
+import com.framsticks.params.EventListener;
 import com.framsticks.test.TestConfiguration;
 import com.framsticks.util.dispatching.Monitor;
@@ -25 +27 @@
                 final List<String> output = new LinkedList<>();
 
-                process.addListener(new OutputListener() {
+                process.addOutputListener(new EventListener<ValueChange>() {
                         @Override
-                        public void onLineRead(String line) {
-                                output.add(line);
+                        public void action(ValueChange change) {
+                                output.add(change.value.toString());
                         }
                 });