Menu
▾
▴
openlcb-svn-commits
|
From: <jac...@us...> - 2013-10-18 20:56:12
|
Revision: 3320
http://sourceforge.net/p/openlcb/svn/3320
Author: jacobsen
Date: 2013-10-18 20:56:10 +0000 (Fri, 18 Oct 2013)
Log Message:
-----------
with address space fix
Modified Paths:
--------------
trunk/prototypes/java/openlcb-demo.jar
trunk/prototypes/java/openlcb.jar
Modified: trunk/prototypes/java/openlcb-demo.jar
===================================================================
(Binary files differ)
Modified: trunk/prototypes/java/openlcb.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jac...@us...> - 2013-12-01 23:57:36
|
Revision: 3374
http://sourceforge.net/p/openlcb/svn/3374
Author: jacobsen
Date: 2013-12-01 23:57:33 +0000 (Sun, 01 Dec 2013)
Log Message:
-----------
AliasMap drops entry on AMR
Modified Paths:
--------------
trunk/prototypes/java/src/org/openlcb/can/AliasMap.java
trunk/prototypes/java/test/org/openlcb/can/AliasMapTest.java
Modified: trunk/prototypes/java/src/org/openlcb/can/AliasMap.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/can/AliasMap.java 2013-12-01 23:57:15 UTC (rev 3373)
+++ trunk/prototypes/java/src/org/openlcb/can/AliasMap.java 2013-12-01 23:57:33 UTC (rev 3374)
@@ -23,6 +23,9 @@
Integer alias = Integer.valueOf(f.getSourceAlias());
NodeID nid = f.getNodeID();
insert(alias, nid);
+ } else if (f.isAliasMapReset()) {
+ Integer alias = Integer.valueOf(f.getSourceAlias());
+ remove(alias);
}
}
@@ -31,6 +34,13 @@
iMap.put(nid, alias);
}
+ public void remove(int alias) {
+ NodeID nid = getNodeID(alias);
+ if (nid == null) return;
+ nMap.remove(alias);
+ iMap.remove(nid);
+ }
+
public NodeID getNodeID(int alias) {
NodeID retVal = nMap.get(Integer.valueOf(alias));
if (retVal != null) return retVal;
Modified: trunk/prototypes/java/test/org/openlcb/can/AliasMapTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/can/AliasMapTest.java 2013-12-01 23:57:15 UTC (rev 3373)
+++ trunk/prototypes/java/test/org/openlcb/can/AliasMapTest.java 2013-12-01 23:57:33 UTC (rev 3374)
@@ -17,7 +17,6 @@
AliasMap map = new AliasMap();
Assert.assertEquals("get Alias", -1, map.getAlias(new NodeID(new byte[]{0,1,2,3,4,5})));
-
Assert.assertEquals("get NodeID", new NodeID(), map.getNodeID(0));
}
@@ -28,6 +27,7 @@
f.setInitializationComplete(0x123, new NodeID(new byte[]{0,1,2,3,4,5}));
map.processFrame(f);
Assert.assertEquals("check NodeID", new NodeID(new byte[]{0,1,2,3,4,5}), map.getNodeID(0x123));
+ Assert.assertEquals("check alias", 0x123, map.getAlias(new NodeID(new byte[]{0,1,2,3,4,5})));
}
public void testAfterInsert() {
@@ -35,8 +35,23 @@
map.insert(0x123, new NodeID(new byte[]{0,1,2,3,4,5}));
Assert.assertEquals("check NodeID", new NodeID(new byte[]{0,1,2,3,4,5}), map.getNodeID(0x123));
+ Assert.assertEquals("check alias", 0x123, map.getAlias(new NodeID(new byte[]{0,1,2,3,4,5})));
}
+ public void testAfterAMR() {
+ AliasMap map = new AliasMap();
+
+ map.insert(0x123, new NodeID(new byte[]{0,1,2,3,4,5}));
+
+ // remove with AMR
+ OpenLcbCanFrame f = new OpenLcbCanFrame(0x123);
+ f.setAMR(0x123, new NodeID(new byte[]{0,1,2,3,4,5}));
+ map.processFrame(f);
+
+ Assert.assertEquals("get Alias", -1, map.getAlias(new NodeID(new byte[]{0,1,2,3,4,5})));
+ Assert.assertEquals("get NodeID", new NodeID(), map.getNodeID(0));
+ }
+
// from here down is testing infrastructure
public AliasMapTest(String s) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jac...@us...> - 2014-07-13 03:46:39
|
Revision: 3580
http://sourceforge.net/p/openlcb/svn/3580
Author: jacobsen
Date: 2014-07-13 03:46:36 +0000 (Sun, 13 Jul 2014)
Log Message:
-----------
from current code
Modified Paths:
--------------
trunk/prototypes/java/openlcb-demo.jar
trunk/prototypes/java/openlcb.jar
Modified: trunk/prototypes/java/openlcb-demo.jar
===================================================================
(Binary files differ)
Modified: trunk/prototypes/java/openlcb.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jac...@us...> - 2014-07-23 09:57:11
|
Revision: 3595
http://sourceforge.net/p/openlcb/svn/3595
Author: jacobsen
Date: 2014-07-23 09:57:09 +0000 (Wed, 23 Jul 2014)
Log Message:
-----------
consistent w latest code
Modified Paths:
--------------
trunk/prototypes/java/openlcb-demo.jar
trunk/prototypes/java/openlcb.jar
Modified: trunk/prototypes/java/openlcb-demo.jar
===================================================================
(Binary files differ)
Modified: trunk/prototypes/java/openlcb.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jac...@us...> - 2015-06-20 15:15:20
|
Revision: 3886
http://sourceforge.net/p/openlcb/svn/3886
Author: jacobsen
Date: 2015-06-20 15:15:17 +0000 (Sat, 20 Jun 2015)
Log Message:
-----------
JDOM 2
Modified Paths:
--------------
trunk/prototypes/java/lib/README
trunk/prototypes/java/manifest
trunk/prototypes/java/nbproject/ide-file-targets.xml
trunk/prototypes/java/nbproject/project.xml
trunk/prototypes/java/runtest.bat
trunk/prototypes/java/runtest.csh
trunk/prototypes/java/src/org/openlcb/cdi/jdom/JdomCdiReader.java
trunk/prototypes/java/src/org/openlcb/cdi/jdom/JdomCdiRep.java
trunk/prototypes/java/test/org/openlcb/cdi/jdom/JdomCdiRepTest.java
trunk/prototypes/java/test/org/openlcb/cdi/jdom/SampleFactory.java
trunk/prototypes/java/test/org/openlcb/cdi/swing/CdiPanelTest.java
trunk/prototypes/java/test/tools/jmri/DecoderDefnToCdi.java
Added Paths:
-----------
trunk/prototypes/java/lib/jdom-2.0.5.jar
Removed Paths:
-------------
trunk/prototypes/java/lib/jdom.jar
Modified: trunk/prototypes/java/lib/README
===================================================================
--- trunk/prototypes/java/lib/README 2015-06-20 15:13:56 UTC (rev 3885)
+++ trunk/prototypes/java/lib/README 2015-06-20 15:15:17 UTC (rev 3886)
@@ -7,9 +7,11 @@
jdom.jar
version 1.1
+jdom-2.0.5.jar
Used for testing only, not in main jar
from <jdom.org>
-
+
+
junit.jar
version 3.8.2
Used for testing only, not at runtime
Added: trunk/prototypes/java/lib/jdom-2.0.5.jar
===================================================================
(Binary files differ)
Index: trunk/prototypes/java/lib/jdom-2.0.5.jar
===================================================================
--- trunk/prototypes/java/lib/jdom-2.0.5.jar 2015-06-20 15:13:56 UTC (rev 3885)
+++ trunk/prototypes/java/lib/jdom-2.0.5.jar 2015-06-20 15:15:17 UTC (rev 3886)
Property changes on: trunk/prototypes/java/lib/jdom-2.0.5.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/prototypes/java/lib/jdom.jar
===================================================================
(Binary files differ)
Modified: trunk/prototypes/java/manifest
===================================================================
--- trunk/prototypes/java/manifest 2015-06-20 15:13:56 UTC (rev 3885)
+++ trunk/prototypes/java/manifest 2015-06-20 15:15:17 UTC (rev 3886)
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Main-Class: scenarios.ScenarioRunner
-Class-Path: lib/junit.jar lib/jdom.jar lib/jlfgr-1_0.jar
+Class-Path: lib/junit.jar lib/jdom-2.0.5.jar lib/jdom.jar lib/jlfgr-1_0.jar
Name: org.openlcb
Specification-Title: OpenLCB
Modified: trunk/prototypes/java/nbproject/ide-file-targets.xml
===================================================================
--- trunk/prototypes/java/nbproject/ide-file-targets.xml 2015-06-20 15:13:56 UTC (rev 3885)
+++ trunk/prototypes/java/nbproject/ide-file-targets.xml 2015-06-20 15:15:17 UTC (rev 3886)
@@ -20,7 +20,7 @@
</ant>
<java classname="${run.class}" failonerror="true" fork="true">
<classpath>
- <pathelement path="lib/junit.jar:lib/jdom.jar:lib/jlfgr-1_0.jar:lib/annotations.jar:lib/jsr305.jar:src"/>
+ <pathelement path="lib/junit.jar:lib/jdom-2.0.5.jar:lib/jdom.jar:lib/jlfgr-1_0.jar:lib/annotations.jar:lib/jsr305.jar:src"/>
<pathelement location="classes"/>
</classpath>
</java>
@@ -35,7 +35,7 @@
</ant>
<java classname="${run.class}" failonerror="true" fork="true">
<classpath>
- <pathelement path="lib/jdom.jar:lib/jlfgr-1_0.jar:lib/annotations.jar:lib/jsr305.jar"/>
+ <pathelement path="lib/jdom-2.0.5.jar:lib/jdom.jar:lib/jlfgr-1_0.jar:lib/annotations.jar:lib/jsr305.jar"/>
<pathelement location="classes"/>
</classpath>
</java>
Modified: trunk/prototypes/java/nbproject/project.xml
===================================================================
--- trunk/prototypes/java/nbproject/project.xml 2015-06-20 15:13:56 UTC (rev 3885)
+++ trunk/prototypes/java/nbproject/project.xml 2015-06-20 15:15:17 UTC (rev 3886)
@@ -139,7 +139,7 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
<compilation-unit>
<package-root>src</package-root>
- <classpath mode="compile">lib/jdom.jar:lib/jlfgr-1_0.jar:lib/annotations.jar:lib/jsr305.jar</classpath>
+ <classpath mode="compile">lib/jdom-2.0.5.jar:lib/jdom.jar:lib/jlfgr-1_0.jar:lib/annotations.jar:lib/jsr305.jar</classpath>
<built-to>classes</built-to>
<javadoc-built-to>doc</javadoc-built-to>
<source-level>1.6</source-level>
@@ -147,7 +147,7 @@
<compilation-unit>
<package-root>test</package-root>
<unit-tests/>
- <classpath mode="compile">lib/junit.jar:lib/jdom.jar:lib/jlfgr-1_0.jar:lib/annotations.jar:lib/jsr305.jar:src</classpath>
+ <classpath mode="compile">lib/junit.jar:lib/jdom-2.0.5.jar:lib/jdom.jar:lib/jlfgr-1_0.jar:lib/annotations.jar:lib/jsr305.jar:src</classpath>
<built-to>classes</built-to>
<source-level>1.6</source-level>
</compilation-unit>
Modified: trunk/prototypes/java/runtest.bat
===================================================================
--- trunk/prototypes/java/runtest.bat 2015-06-20 15:13:56 UTC (rev 3885)
+++ trunk/prototypes/java/runtest.bat 2015-06-20 15:15:17 UTC (rev 3886)
@@ -1 +1 @@
-java -noverify -Dsun.java2d.noddraw -Djava.library.path=.:lib/ -cp .;classes;lib/junit.jar;lib/jdom.jar;lib/jlfgr-1_0.jar $1 $2 $3
+java -noverify -Dsun.java2d.noddraw -Djava.library.path=.:lib/ -cp .;classes;lib/junit.jar;lib/jdom-2.0.5.jar;lib/jdom.jar;lib/jlfgr-1_0.jar $1 $2 $3
Modified: trunk/prototypes/java/runtest.csh
===================================================================
--- trunk/prototypes/java/runtest.csh 2015-06-20 15:13:56 UTC (rev 3885)
+++ trunk/prototypes/java/runtest.csh 2015-06-20 15:15:17 UTC (rev 3886)
@@ -12,5 +12,5 @@
-Dapple.laf.useScreenMenuBar=true \
-Dlog4j.ignoreTCL=true \
-Djava.library.path=.:lib/ \
- -cp .:classes:lib/junit.jar:lib/xercesImpl.jar:lib/jdom.jar:lib/jlfgr-1_0.jar \
+ -cp .:classes:lib/junit.jar:lib/xercesImpl.jar:lib/jdom-2.0.5.jar:lib/jdom.jar:lib/jlfgr-1_0.jar \
$1 $2 $3
Modified: trunk/prototypes/java/src/org/openlcb/cdi/jdom/JdomCdiReader.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/cdi/jdom/JdomCdiReader.java 2015-06-20 15:13:56 UTC (rev 3885)
+++ trunk/prototypes/java/src/org/openlcb/cdi/jdom/JdomCdiReader.java 2015-06-20 15:15:17 UTC (rev 3886)
@@ -3,8 +3,8 @@
import org.openlcb.cdi.*;
import java.io.*;
-import org.jdom.*;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.*;
+import org.jdom2.input.SAXBuilder;
/**
* JDOM-based OpenLCB loader
Modified: trunk/prototypes/java/src/org/openlcb/cdi/jdom/JdomCdiRep.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/cdi/jdom/JdomCdiRep.java 2015-06-20 15:13:56 UTC (rev 3885)
+++ trunk/prototypes/java/src/org/openlcb/cdi/jdom/JdomCdiRep.java 2015-06-20 15:15:17 UTC (rev 3886)
@@ -1,7 +1,7 @@
package org.openlcb.cdi.jdom;
-import org.jdom.Attribute;
-import org.jdom.Element;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
import org.openlcb.cdi.CdiRep;
/**
@@ -118,7 +118,7 @@
try {
if (a == null) return 0;
else return a.getIntValue();
- } catch (org.jdom.DataConversionException e1) { return 0; }
+ } catch (org.jdom2.DataConversionException e1) { return 0; }
}
@Override
@@ -127,7 +127,7 @@
try {
if (a == null) return 0;
else return a.getIntValue();
- } catch (org.jdom.DataConversionException e1) { return 0; }
+ } catch (org.jdom2.DataConversionException e1) { return 0; }
}
}
@@ -212,7 +212,7 @@
try {
if (a == null) return 0;
else return a.getIntValue();
- } catch (org.jdom.DataConversionException e) { return 0; }
+ } catch (org.jdom2.DataConversionException e) { return 0; }
}
}
@@ -225,7 +225,7 @@
try {
if (a == null) return 0;
else return a.getIntValue();
- } catch (org.jdom.DataConversionException e1) { return 0; }
+ } catch (org.jdom2.DataConversionException e1) { return 0; }
}
@Override
@@ -234,7 +234,7 @@
try {
if (a == null) return 0;
else return a.getIntValue();
- } catch (org.jdom.DataConversionException e1) { return 0; }
+ } catch (org.jdom2.DataConversionException e1) { return 0; }
}
@Override
@@ -264,7 +264,7 @@
try {
if (a == null) return 1;
else return a.getIntValue();
- } catch (org.jdom.DataConversionException e1) { return 0; }
+ } catch (org.jdom2.DataConversionException e1) { return 0; }
}
}
@@ -280,7 +280,7 @@
try {
if (a == null) return 1;
else return a.getIntValue();
- } catch (org.jdom.DataConversionException e1) { return 0; }
+ } catch (org.jdom2.DataConversionException e1) { return 0; }
}
}
@@ -294,7 +294,7 @@
try {
if (a == null) return 1;
else return a.getIntValue();
- } catch (org.jdom.DataConversionException e1) { return 0; }
+ } catch (org.jdom2.DataConversionException e1) { return 0; }
}
}
Modified: trunk/prototypes/java/test/org/openlcb/cdi/jdom/JdomCdiRepTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/cdi/jdom/JdomCdiRepTest.java 2015-06-20 15:13:56 UTC (rev 3885)
+++ trunk/prototypes/java/test/org/openlcb/cdi/jdom/JdomCdiRepTest.java 2015-06-20 15:15:17 UTC (rev 3886)
@@ -5,7 +5,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.jdom.*;
+import org.jdom2.*;
import org.openlcb.cdi.CdiRep;
Modified: trunk/prototypes/java/test/org/openlcb/cdi/jdom/SampleFactory.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/cdi/jdom/SampleFactory.java 2015-06-20 15:13:56 UTC (rev 3885)
+++ trunk/prototypes/java/test/org/openlcb/cdi/jdom/SampleFactory.java 2015-06-20 15:15:17 UTC (rev 3886)
@@ -1,6 +1,6 @@
package org.openlcb.cdi.jdom;
-import org.jdom.*;
+import org.jdom2.*;
import org.openlcb.cdi.CdiRep;
@@ -134,9 +134,9 @@
Document doc = new Document(root);
try {
- org.jdom.output.XMLOutputter fmt = new org.jdom.output.XMLOutputter();
+ org.jdom2.output.XMLOutputter fmt = new org.jdom2.output.XMLOutputter();
- fmt.setFormat(org.jdom.output.Format.getPrettyFormat());
+ fmt.setFormat(org.jdom2.output.Format.getPrettyFormat());
fmt.output(doc, System.out);
} catch (Exception e) {
Modified: trunk/prototypes/java/test/org/openlcb/cdi/swing/CdiPanelTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/cdi/swing/CdiPanelTest.java 2015-06-20 15:13:56 UTC (rev 3885)
+++ trunk/prototypes/java/test/org/openlcb/cdi/swing/CdiPanelTest.java 2015-06-20 15:15:17 UTC (rev 3886)
@@ -13,8 +13,8 @@
import java.net.URL;
import javax.swing.*;
-import org.jdom.*;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.*;
+import org.jdom2.input.SAXBuilder;
/**
* @author Bob Jacobsen Copyright 2012
Modified: trunk/prototypes/java/test/tools/jmri/DecoderDefnToCdi.java
===================================================================
--- trunk/prototypes/java/test/tools/jmri/DecoderDefnToCdi.java 2015-06-20 15:13:56 UTC (rev 3885)
+++ trunk/prototypes/java/test/tools/jmri/DecoderDefnToCdi.java 2015-06-20 15:15:17 UTC (rev 3886)
@@ -8,10 +8,10 @@
import java.util.Iterator;
import javax.swing.*;
-import org.jdom.*;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.*;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
/**
* Small stand-alone utility to read a JMRI
@@ -32,7 +32,7 @@
// add schema definitions
root.setAttribute("noNamespaceSchemaLocation", // NOI18N
"http://openlcb.org/trunk/specs/schema/cdi.xsd", // NOI18N
- org.jdom.Namespace.getNamespace("xsi", // NOI18N
+ org.jdom2.Namespace.getNamespace("xsi", // NOI18N
"http://www.w3.org/2001/XMLSchema-instance")); // NOI18N
doc = new Document(root);
@@ -48,7 +48,7 @@
doc.addContent(0,p);
}
- public void convert(Element inRoot) throws org.jdom.DataConversionException {
+ public void convert(Element inRoot) throws org.jdom2.DataConversionException {
addHeader(inRoot);
addAcdiElement();
addCommonCDI();
@@ -166,7 +166,7 @@
}
public void addVariables(Element inRoot)
- throws org.jdom.DataConversionException {
+ throws org.jdom2.DataConversionException {
Element vs = inRoot.getChild("decoder").getChild("variables");
Element segment = new Element("segment");
@@ -237,7 +237,7 @@
}
public Element handleEnumVal(Element type, long cv, String name, String comment, String mask)
- throws org.jdom.DataConversionException {
+ throws org.jdom2.DataConversionException {
Element r;
if (mask != null && !mask.equals("")) {
r = new Element("bit");
@@ -335,7 +335,7 @@
}
// Main entry point
- static public void main(String[] args) throws org.jdom.DataConversionException {
+ static public void main(String[] args) throws org.jdom2.DataConversionException {
if (args.length == 0) {
System.err.println("Usage: ./runtest.csh tools.jmri.DecoderDefnToCdi /Users/jake/JMRI/projects/HEAD/xml/decoders/SoundTraxx_Tsu_Steam.xml > SoundTraxx_Tsu_Steam.cdi.xml");
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jac...@us...> - 2015-06-20 15:16:50
|
Revision: 3888
http://sourceforge.net/p/openlcb/svn/3888
Author: jacobsen
Date: 2015-06-20 15:16:48 +0000 (Sat, 20 Jun 2015)
Log Message:
-----------
fix problem with decoding config mem read replies with error codes
Modified Paths:
--------------
trunk/prototypes/java/src/org/openlcb/implementations/MemoryConfigurationService.java
trunk/prototypes/java/test/org/openlcb/implementations/MemoryConfigurationServiceTest.java
Modified: trunk/prototypes/java/src/org/openlcb/implementations/MemoryConfigurationService.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/MemoryConfigurationService.java 2015-06-20 15:16:06 UTC (rev 3887)
+++ trunk/prototypes/java/src/org/openlcb/implementations/MemoryConfigurationService.java 2015-06-20 15:16:48 UTC (rev 3888)
@@ -36,8 +36,15 @@
if (readMemo != null) {
// figure out address space uses byte?
boolean spaceByte = ((data[1] & 0x03) == 0);
- byte[] content = new byte[data.length-6+(spaceByte ? -1 : 0)];
- for (int i = 0; i<content.length; i++) content[i] = (byte)data[i+6+(spaceByte?1:0)];
+ byte[] content;
+ if ((data[1]&0x08) == 0) {
+ // normal read reply
+ content = new byte[data.length-6+(spaceByte ? -1 : 0)];
+ for (int i = 0; i<content.length; i++) content[i] = (byte)data[i+6+(spaceByte?1:0)];
+ } else {
+ // error read reply, return zero length
+ content = new byte[0];
+ }
McsReadMemo memo = readMemo;
readMemo = null;
memo.handleReadData(dest, memo.space, memo.address, content);
Modified: trunk/prototypes/java/test/org/openlcb/implementations/MemoryConfigurationServiceTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/MemoryConfigurationServiceTest.java 2015-06-20 15:16:06 UTC (rev 3887)
+++ trunk/prototypes/java/test/org/openlcb/implementations/MemoryConfigurationServiceTest.java 2015-06-20 15:16:48 UTC (rev 3888)
@@ -212,6 +212,72 @@
}
+ public void testSimpleReadFails() {
+ int space = 0xFD;
+ long address = 0x12345678;
+ int length = 4;
+ MemoryConfigurationService.McsReadMemo memo =
+ new MemoryConfigurationService.McsReadMemo(farID, space, address, length) {
+ @Override
+ public void handleWriteReply(int code) {
+ flag = true;
+ }
+ @Override
+ public void handleReadData(NodeID dest, int readSpace, long readAddress, byte[] readData) {
+ flag = true;
+ Assert.assertEquals("space", space, readSpace);
+ Assert.assertEquals("address", address, readAddress);
+
+ // data length is zero because of error
+ Assert.assertEquals("data length", 0, readData.length);
+ }
+ };
+
+ // test executes the callbacks instantly; real connections might not
+ Assert.assertTrue(!flag);
+ service.request(memo);
+ Assert.assertTrue(!flag);
+
+ // should have sent datagram
+ Assert.assertEquals(1,messagesReceived.size());
+ Assert.assertTrue(messagesReceived.get(0) instanceof DatagramMessage);
+
+ // check format of datagram read
+ int[] content = ((DatagramMessage)messagesReceived.get(0)).getData();
+ Assert.assertTrue(content.length >= 6);
+ Assert.assertEquals("datagram type", 0x20, content[0]);
+ Assert.assertEquals("read command", 0x40, (content[1]&0xFC));
+
+ Assert.assertEquals("address", address, ((long)content[2]<<24)+((long)content[3]<<16)+((long)content[4]<<8)+(long)content[5] );
+
+ if (space >= 0xFD) {
+ Assert.assertEquals("space bits", space&0x3, content[1]&0x3);
+ Assert.assertEquals("data length", length, content[6]);
+ } else {
+ Assert.assertEquals("space byte", space, content[6]);
+ Assert.assertEquals("data length", length, content[7]);
+ }
+
+ // datagram reply comes back
+ Message m = new DatagramAcknowledgedMessage(farID, hereID);
+
+ Assert.assertTrue(!flag);
+ datagramService.put(m, null);
+ Assert.assertTrue(flag);
+
+ // now return data
+ flag = false;
+ content[1] = content[1]|0x04|0x08; //change command to error response
+ content[content.length-1] = 0xAA; // 1st data byte which is error
+
+ m = new DatagramMessage(farID, hereID, content);
+
+ Assert.assertTrue(!flag);
+ datagramService.put(m, null);
+ Assert.assertTrue(flag);
+
+ }
+
public void testSimpleReadFromSpace1() {
int space = 0x01;
long address = 0x12345678;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jac...@us...> - 2015-06-20 15:19:16
|
Revision: 3889
http://sourceforge.net/p/openlcb/svn/3889
Author: jacobsen
Date: 2015-06-20 15:19:13 +0000 (Sat, 20 Jun 2015)
Log Message:
-----------
jar files as of today, made with Java 1.8
Modified Paths:
--------------
trunk/prototypes/java/openlcb-demo.jar
trunk/prototypes/java/openlcb.jar
Modified: trunk/prototypes/java/openlcb-demo.jar
===================================================================
(Binary files differ)
Modified: trunk/prototypes/java/openlcb.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jac...@us...> - 2015-06-20 15:20:29
|
Revision: 3890
http://sourceforge.net/p/openlcb/svn/3890
Author: jacobsen
Date: 2015-06-20 15:20:27 +0000 (Sat, 20 Jun 2015)
Log Message:
-----------
0.6.4 consistent set with Java 1.8
Modified Paths:
--------------
trunk/prototypes/java/manifest
trunk/prototypes/java/openlcb-demo.jar
trunk/prototypes/java/openlcb.jar
Modified: trunk/prototypes/java/manifest
===================================================================
--- trunk/prototypes/java/manifest 2015-06-20 15:19:13 UTC (rev 3889)
+++ trunk/prototypes/java/manifest 2015-06-20 15:20:27 UTC (rev 3890)
@@ -4,9 +4,9 @@
Name: org.openlcb
Specification-Title: OpenLCB
-Specification-Version: 0.6.1
+Specification-Version: 0.6.4
Specification-Vendor: OpenLCB group
Package-Title: openlcb
-Package-Version: 0.6.3
+Package-Version: 0.6.4
Package-Vendor: OpenLCB group
Modified: trunk/prototypes/java/openlcb-demo.jar
===================================================================
(Binary files differ)
Modified: trunk/prototypes/java/openlcb.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jac...@us...> - 2015-07-12 17:12:57
|
Revision: 3892
http://sourceforge.net/p/openlcb/svn/3892
Author: jacobsen
Date: 2015-07-12 17:12:55 +0000 (Sun, 12 Jul 2015)
Log Message:
-----------
as of today
Modified Paths:
--------------
trunk/prototypes/java/openlcb-demo.jar
trunk/prototypes/java/openlcb.jar
Modified: trunk/prototypes/java/openlcb-demo.jar
===================================================================
(Binary files differ)
Modified: trunk/prototypes/java/openlcb.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jac...@us...> - 2015-08-16 01:46:36
|
Revision: 3907
http://sourceforge.net/p/openlcb/svn/3907
Author: jacobsen
Date: 2015-08-16 01:46:35 +0000 (Sun, 16 Aug 2015)
Log Message:
-----------
support generating UML-illustrated JavaDoc
Modified Paths:
--------------
trunk/prototypes/java/build.xml
Added Paths:
-----------
trunk/prototypes/java/lib/UmlGraph-5.7.jar
Modified: trunk/prototypes/java/build.xml
===================================================================
--- trunk/prototypes/java/build.xml 2015-08-09 03:43:41 UTC (rev 3906)
+++ trunk/prototypes/java/build.xml 2015-08-16 01:46:35 UTC (rev 3907)
@@ -142,6 +142,66 @@
</javadoc>
</target>
+ <!-- The structure of the following should closely follow the -->
+ <!-- main 'javadoc' target directly above. The only difference -->
+ <!-- is the doclet clause referencing the UML generator, the -->
+ <!-- use of the public option in the main task definition, and -->
+ <!-- the execution of "dot" at the bottom. -->
+ <!-- Requires Graphviz from http://www.graphviz.org -->
+ <target name="javadoc-uml" depends="init" description="create JavaDocs with UML">
+ <javadoc packagenames="org.*"
+ maxmemory="512m"
+ sourcepath="${source}"
+ overview="${source}/overview.html"
+ destdir="${doctarget}"
+ additionalparam="-breakiterator"
+ author="true"
+ version="false"
+ package="yes"
+ use="true"
+ windowtitle="OpenLCB API">
+ <arg value="-Xdoclint:all,-missing,-accessibility,-html,-syntax"/> <!-- dropping some 1.8 warnings -->
+ <doclet name="org.umlgraph.doclet.UmlGraphDoc"
+ path="lib/UmlGraph-5.7.jar">
+ <param name="-attributes"/>
+ <param name="-operations"/>
+ <param name="-qualify"/>
+ <param name="-types"/>
+ <!-- <param name="-visibility"/> not used, as only showing public visibility -->
+ <param name="-collapsible"/> <!-- hide images at first on web pages -->
+ <param name="-inferdepvis" value="public"/> <!-- only show public -->
+ </doclet>
+
+ <classpath refid="project.class.path"/>
+ <doctitle><![CDATA[<h1>OpenLCB API</h1>]]></doctitle>
+ <bottom><![CDATA[<a href="http://openlcb.org/Copyright.html">Information on copyright, trademarks and licenses is linked here.</a>
+ <br>Site hosted by:
+ <a href="http://sourceforge.net/projects/jmri">
+ <img src="http://sflogo.sourceforge.net/sflogo.php?group_id=26788&type=12" width="120" height="30" border="0" alt="Get JMRI Model Railroad Interface at SourceForge.net. Fast, secure and Free Open Source software downloads"/></a>
+ ]]>
+ </bottom>
+ <link href="http://docs.oracle.com/javase/8/docs/api/"/>
+ <link href="http://download.oracle.com/javase/8/docs/api/"/>
+ <link href="http://java.sun.com/products/javacomm/reference/api/"/>
+ <link href="http://www.jdom.org/docs/apidocs/"/>
+ <link href="http://javacsv.sourceforge.net/"/> <!-- A -->
+ <link href="http://fasterxml.github.io/jackson-databind/javadoc/2.0.6"/>
+ <link href="http://logging.apache.org/log4j/1.2/apidocs/"/>
+<!-- <link href="http://java.sun.com/javase/technologies/desktop/java3d/forDevelopers/j3dapi/"/> failes, so bypassed -->
+ <link href="https://jogamp.org/deployment/jogamp-next/javadoc/joal/javadoc/"/>
+ <link href="https://commons.apache.org/proper/commons-lang/javadocs/api-release"/>
+
+ </javadoc>
+ <apply executable="dot" dest="${doctarget}" parallel="false">
+ <arg value="-Tpng"/>
+ <arg value="-o"/>
+ <targetfile/>
+ <srcfile/>
+ <fileset dir="${doctarget}" includes="*.dot"/>
+ <mapper type="glob" from="*.dot" to="*.png"/>
+ </apply>
+ </target>
+
<target name="javadocall" depends="init" description="create JavaDoc for all code including tests">
<javadoc packagenames="org.*, tools.*, simulations.*, scenarios.*"
maxmemory="512m"
Added: trunk/prototypes/java/lib/UmlGraph-5.7.jar
===================================================================
(Binary files differ)
Index: trunk/prototypes/java/lib/UmlGraph-5.7.jar
===================================================================
--- trunk/prototypes/java/lib/UmlGraph-5.7.jar 2015-08-09 03:43:41 UTC (rev 3906)
+++ trunk/prototypes/java/lib/UmlGraph-5.7.jar 2015-08-16 01:46:35 UTC (rev 3907)
Property changes on: trunk/prototypes/java/lib/UmlGraph-5.7.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jac...@us...> - 2015-08-16 02:08:50
|
Revision: 3912
http://sourceforge.net/p/openlcb/svn/3912
Author: jacobsen
Date: 2015-08-16 02:08:45 +0000 (Sun, 16 Aug 2015)
Log Message:
-----------
Version 0.6.4 libraries and documentation. Note: This project may now be orphaned. Not clear what the future will bring. If you don't see updates here after a reasonable time, perhaps it's been moved to another group, but it may also be dead. If you're interested in reviving, see the README file.
Modified Paths:
--------------
trunk/prototypes/java/README
trunk/prototypes/java/doc/allclasses-frame.html
trunk/prototypes/java/doc/allclasses-noframe.html
trunk/prototypes/java/doc/constant-values.html
trunk/prototypes/java/doc/deprecated-list.html
trunk/prototypes/java/doc/help-doc.html
trunk/prototypes/java/doc/index-all.html
trunk/prototypes/java/doc/index.html
trunk/prototypes/java/doc/org/openlcb/AbstractConnection.html
trunk/prototypes/java/doc/org/openlcb/AddressedMessage.html
trunk/prototypes/java/doc/org/openlcb/ConfigurationPortal.html
trunk/prototypes/java/doc/org/openlcb/Connection.ConnectionListener.html
trunk/prototypes/java/doc/org/openlcb/Connection.html
trunk/prototypes/java/doc/org/openlcb/ConsumerIdentifiedMessage.html
trunk/prototypes/java/doc/org/openlcb/DatagramAcknowledgedMessage.html
trunk/prototypes/java/doc/org/openlcb/DatagramMessage.html
trunk/prototypes/java/doc/org/openlcb/DatagramRejectedMessage.html
trunk/prototypes/java/doc/org/openlcb/EventID.html
trunk/prototypes/java/doc/org/openlcb/Gateway.html
trunk/prototypes/java/doc/org/openlcb/IdentifyConsumersMessage.html
trunk/prototypes/java/doc/org/openlcb/IdentifyEventsMessage.html
trunk/prototypes/java/doc/org/openlcb/IdentifyProducersMessage.html
trunk/prototypes/java/doc/org/openlcb/InitializationCompleteMessage.html
trunk/prototypes/java/doc/org/openlcb/LearnEventMessage.html
trunk/prototypes/java/doc/org/openlcb/Message.html
trunk/prototypes/java/doc/org/openlcb/MessageDecoder.html
trunk/prototypes/java/doc/org/openlcb/MessageTypeIdentifier.html
trunk/prototypes/java/doc/org/openlcb/MimicNodeStore.NodeMemo.html
trunk/prototypes/java/doc/org/openlcb/MimicNodeStore.html
trunk/prototypes/java/doc/org/openlcb/Node.html
trunk/prototypes/java/doc/org/openlcb/NodeID.html
trunk/prototypes/java/doc/org/openlcb/OpenLcb.html
trunk/prototypes/java/doc/org/openlcb/ProducerConsumerEventReportMessage.html
trunk/prototypes/java/doc/org/openlcb/ProducerIdentifiedMessage.html
trunk/prototypes/java/doc/org/openlcb/ProtocolIdentification.html
trunk/prototypes/java/doc/org/openlcb/ProtocolIdentificationReplyMessage.html
trunk/prototypes/java/doc/org/openlcb/ProtocolIdentificationRequestMessage.html
trunk/prototypes/java/doc/org/openlcb/SimpleNodeIdent.html
trunk/prototypes/java/doc/org/openlcb/SimpleNodeIdentInfoReplyMessage.html
trunk/prototypes/java/doc/org/openlcb/SimpleNodeIdentInfoRequestMessage.html
trunk/prototypes/java/doc/org/openlcb/SingleLinkNode.html
trunk/prototypes/java/doc/org/openlcb/StreamDataCompleteMessage.html
trunk/prototypes/java/doc/org/openlcb/StreamDataProceedMessage.html
trunk/prototypes/java/doc/org/openlcb/StreamDataSendMessage.html
trunk/prototypes/java/doc/org/openlcb/StreamInitReplyMessage.html
trunk/prototypes/java/doc/org/openlcb/StreamInitRequestMessage.html
trunk/prototypes/java/doc/org/openlcb/Utilities.html
trunk/prototypes/java/doc/org/openlcb/VerifiedNodeIDNumberMessage.html
trunk/prototypes/java/doc/org/openlcb/VerifyNodeIDNumberMessage.html
trunk/prototypes/java/doc/org/openlcb/can/AliasMap.html
trunk/prototypes/java/doc/org/openlcb/can/CanFrame.html
trunk/prototypes/java/doc/org/openlcb/can/MessageBuilder.html
trunk/prototypes/java/doc/org/openlcb/can/NIDa.html
trunk/prototypes/java/doc/org/openlcb/can/NIDaAlgorithm.html
trunk/prototypes/java/doc/org/openlcb/can/OpenLcbCanFrame.html
trunk/prototypes/java/doc/org/openlcb/can/class-use/AliasMap.html
trunk/prototypes/java/doc/org/openlcb/can/class-use/CanFrame.html
trunk/prototypes/java/doc/org/openlcb/can/class-use/MessageBuilder.html
trunk/prototypes/java/doc/org/openlcb/can/class-use/NIDa.html
trunk/prototypes/java/doc/org/openlcb/can/class-use/NIDaAlgorithm.html
trunk/prototypes/java/doc/org/openlcb/can/class-use/OpenLcbCanFrame.html
trunk/prototypes/java/doc/org/openlcb/can/package-frame.html
trunk/prototypes/java/doc/org/openlcb/can/package-summary.html
trunk/prototypes/java/doc/org/openlcb/can/package-tree.html
trunk/prototypes/java/doc/org/openlcb/can/package-use.html
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.BitRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.EventID.html
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.Group.html
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.Identification.html
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.IntegerRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.Item.html
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.Map.html
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.Segment.html
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.StringRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/class-use/CdiRep.BitRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/class-use/CdiRep.EventID.html
trunk/prototypes/java/doc/org/openlcb/cdi/class-use/CdiRep.Group.html
trunk/prototypes/java/doc/org/openlcb/cdi/class-use/CdiRep.Identification.html
trunk/prototypes/java/doc/org/openlcb/cdi/class-use/CdiRep.IntegerRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/class-use/CdiRep.Item.html
trunk/prototypes/java/doc/org/openlcb/cdi/class-use/CdiRep.Map.html
trunk/prototypes/java/doc/org/openlcb/cdi/class-use/CdiRep.Segment.html
trunk/prototypes/java/doc/org/openlcb/cdi/class-use/CdiRep.StringRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/class-use/CdiRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/CdiMemConfigReader.ReaderAccess.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/CdiMemConfigReader.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiReader.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.BitRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.EventID.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.Group.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.Identification.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.IntRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.Item.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.Map.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.Segment.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.StringRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/CdiMemConfigReader.ReaderAccess.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/CdiMemConfigReader.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/JdomCdiReader.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/JdomCdiRep.BitRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/JdomCdiRep.EventID.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/JdomCdiRep.Group.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/JdomCdiRep.Identification.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/JdomCdiRep.IntRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/JdomCdiRep.Item.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/JdomCdiRep.Map.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/JdomCdiRep.Segment.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/JdomCdiRep.StringRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/JdomCdiRep.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/package-frame.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/package-summary.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/package-tree.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/package-use.html
trunk/prototypes/java/doc/org/openlcb/cdi/package-frame.html
trunk/prototypes/java/doc/org/openlcb/cdi/package-summary.html
trunk/prototypes/java/doc/org/openlcb/cdi/package-tree.html
trunk/prototypes/java/doc/org/openlcb/cdi/package-use.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.ReadReturn.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.ReadWriteAccess.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/class-use/CdiPanel.ReadReturn.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/class-use/CdiPanel.ReadWriteAccess.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/class-use/CdiPanel.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/package-frame.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/package-summary.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/package-tree.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/package-use.html
trunk/prototypes/java/doc/org/openlcb/class-use/AbstractConnection.html
trunk/prototypes/java/doc/org/openlcb/class-use/AddressedMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/ConfigurationPortal.html
trunk/prototypes/java/doc/org/openlcb/class-use/Connection.ConnectionListener.html
trunk/prototypes/java/doc/org/openlcb/class-use/Connection.html
trunk/prototypes/java/doc/org/openlcb/class-use/ConsumerIdentifiedMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/DatagramAcknowledgedMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/DatagramMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/DatagramRejectedMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/EventID.html
trunk/prototypes/java/doc/org/openlcb/class-use/Gateway.html
trunk/prototypes/java/doc/org/openlcb/class-use/IdentifyConsumersMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/IdentifyEventsMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/IdentifyProducersMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/InitializationCompleteMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/LearnEventMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/Message.html
trunk/prototypes/java/doc/org/openlcb/class-use/MessageDecoder.html
trunk/prototypes/java/doc/org/openlcb/class-use/MessageTypeIdentifier.html
trunk/prototypes/java/doc/org/openlcb/class-use/MimicNodeStore.NodeMemo.html
trunk/prototypes/java/doc/org/openlcb/class-use/MimicNodeStore.html
trunk/prototypes/java/doc/org/openlcb/class-use/Node.html
trunk/prototypes/java/doc/org/openlcb/class-use/NodeID.html
trunk/prototypes/java/doc/org/openlcb/class-use/OpenLcb.html
trunk/prototypes/java/doc/org/openlcb/class-use/ProducerConsumerEventReportMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/ProducerIdentifiedMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/ProtocolIdentification.html
trunk/prototypes/java/doc/org/openlcb/class-use/ProtocolIdentificationReplyMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/ProtocolIdentificationRequestMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/SimpleNodeIdent.html
trunk/prototypes/java/doc/org/openlcb/class-use/SimpleNodeIdentInfoReplyMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/SimpleNodeIdentInfoRequestMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/SingleLinkNode.html
trunk/prototypes/java/doc/org/openlcb/class-use/StreamDataCompleteMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/StreamDataProceedMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/StreamDataSendMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/StreamInitReplyMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/StreamInitRequestMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/Utilities.html
trunk/prototypes/java/doc/org/openlcb/class-use/VerifiedNodeIDNumberMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/VerifyNodeIDNumberMessage.html
trunk/prototypes/java/doc/org/openlcb/implementations/BlueGoldEngine.html
trunk/prototypes/java/doc/org/openlcb/implementations/BlueGoldExtendedEngine.html
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramMeteringBuffer.html
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramReceiver.html
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramService.DatagramServiceReceiveMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramService.DatagramServiceTransmitMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramService.ReplyMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramService.html
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramTransmitter.html
trunk/prototypes/java/doc/org/openlcb/implementations/EventFilterGateway.html
trunk/prototypes/java/doc/org/openlcb/implementations/MemoryConfigurationService.AddrSpaceDatagramMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/MemoryConfigurationService.ConfigDatagramMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/MemoryConfigurationService.McsAddrSpaceMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/MemoryConfigurationService.McsConfigMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/MemoryConfigurationService.McsReadMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/MemoryConfigurationService.McsWriteMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/MemoryConfigurationService.ReadDatagramMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/MemoryConfigurationService.WriteDatagramMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/MemoryConfigurationService.html
trunk/prototypes/java/doc/org/openlcb/implementations/ScatterGather.html
trunk/prototypes/java/doc/org/openlcb/implementations/SingleConsumer.html
trunk/prototypes/java/doc/org/openlcb/implementations/SingleConsumerNode.html
trunk/prototypes/java/doc/org/openlcb/implementations/SingleProducer.html
trunk/prototypes/java/doc/org/openlcb/implementations/SingleProducerNode.html
trunk/prototypes/java/doc/org/openlcb/implementations/StreamReceiver.html
trunk/prototypes/java/doc/org/openlcb/implementations/StreamTransmitter.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/BlueGoldEngine.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/BlueGoldExtendedEngine.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/DatagramMeteringBuffer.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/DatagramReceiver.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/DatagramService.DatagramServiceReceiveMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/DatagramService.DatagramServiceTransmitMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/DatagramService.ReplyMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/DatagramService.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/DatagramTransmitter.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/EventFilterGateway.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/MemoryConfigurationService.AddrSpaceDatagramMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/MemoryConfigurationService.ConfigDatagramMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/MemoryConfigurationService.McsAddrSpaceMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/MemoryConfigurationService.McsConfigMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/MemoryConfigurationService.McsReadMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/MemoryConfigurationService.McsWriteMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/MemoryConfigurationService.ReadDatagramMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/MemoryConfigurationService.WriteDatagramMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/MemoryConfigurationService.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/ScatterGather.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/SingleConsumer.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/SingleConsumerNode.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/SingleProducer.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/SingleProducerNode.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/StreamReceiver.html
trunk/prototypes/java/doc/org/openlcb/implementations/class-use/StreamTransmitter.html
trunk/prototypes/java/doc/org/openlcb/implementations/package-frame.html
trunk/prototypes/java/doc/org/openlcb/implementations/package-summary.html
trunk/prototypes/java/doc/org/openlcb/implementations/package-tree.html
trunk/prototypes/java/doc/org/openlcb/implementations/package-use.html
trunk/prototypes/java/doc/org/openlcb/package-frame.html
trunk/prototypes/java/doc/org/openlcb/package-summary.html
trunk/prototypes/java/doc/org/openlcb/package-tree.html
trunk/prototypes/java/doc/org/openlcb/package-use.html
trunk/prototypes/java/doc/org/openlcb/swing/ConsumerPane.html
trunk/prototypes/java/doc/org/openlcb/swing/EventIdTextField.html
trunk/prototypes/java/doc/org/openlcb/swing/MonPane.html
trunk/prototypes/java/doc/org/openlcb/swing/NodeSelector.html
trunk/prototypes/java/doc/org/openlcb/swing/ProducerPane.html
trunk/prototypes/java/doc/org/openlcb/swing/class-use/ConsumerPane.html
trunk/prototypes/java/doc/org/openlcb/swing/class-use/EventIdTextField.html
trunk/prototypes/java/doc/org/openlcb/swing/class-use/MonPane.html
trunk/prototypes/java/doc/org/openlcb/swing/class-use/NodeSelector.html
trunk/prototypes/java/doc/org/openlcb/swing/class-use/ProducerPane.html
trunk/prototypes/java/doc/org/openlcb/swing/memconfig/MemConfigDescriptionPane.html
trunk/prototypes/java/doc/org/openlcb/swing/memconfig/MemConfigReadWritePane.html
trunk/prototypes/java/doc/org/openlcb/swing/memconfig/class-use/MemConfigDescriptionPane.html
trunk/prototypes/java/doc/org/openlcb/swing/memconfig/class-use/MemConfigReadWritePane.html
trunk/prototypes/java/doc/org/openlcb/swing/memconfig/package-frame.html
trunk/prototypes/java/doc/org/openlcb/swing/memconfig/package-summary.html
trunk/prototypes/java/doc/org/openlcb/swing/memconfig/package-tree.html
trunk/prototypes/java/doc/org/openlcb/swing/memconfig/package-use.html
trunk/prototypes/java/doc/org/openlcb/swing/networktree/NodeTreeRep.html
trunk/prototypes/java/doc/org/openlcb/swing/networktree/TreePane.html
trunk/prototypes/java/doc/org/openlcb/swing/networktree/class-use/NodeTreeRep.html
trunk/prototypes/java/doc/org/openlcb/swing/networktree/class-use/TreePane.html
trunk/prototypes/java/doc/org/openlcb/swing/networktree/package-frame.html
trunk/prototypes/java/doc/org/openlcb/swing/networktree/package-summary.html
trunk/prototypes/java/doc/org/openlcb/swing/networktree/package-tree.html
trunk/prototypes/java/doc/org/openlcb/swing/networktree/package-use.html
trunk/prototypes/java/doc/org/openlcb/swing/package-frame.html
trunk/prototypes/java/doc/org/openlcb/swing/package-summary.html
trunk/prototypes/java/doc/org/openlcb/swing/package-tree.html
trunk/prototypes/java/doc/org/openlcb/swing/package-use.html
trunk/prototypes/java/doc/overview-frame.html
trunk/prototypes/java/doc/overview-summary.html
trunk/prototypes/java/doc/overview-tree.html
trunk/prototypes/java/doc/package-list
trunk/prototypes/java/doc/serialized-form.html
trunk/prototypes/java/openlcb-demo.jar
trunk/prototypes/java/openlcb.jar
trunk/prototypes/java/src/org/openlcb/Version.java
Added Paths:
-----------
trunk/prototypes/java/doc/org/openlcb/AbstractConnection.png
trunk/prototypes/java/doc/org/openlcb/AddressedMessage.png
trunk/prototypes/java/doc/org/openlcb/ConfigurationPortal.png
trunk/prototypes/java/doc/org/openlcb/Connection.ConnectionListener.png
trunk/prototypes/java/doc/org/openlcb/Connection.png
trunk/prototypes/java/doc/org/openlcb/ConsumerIdentifiedMessage.png
trunk/prototypes/java/doc/org/openlcb/DatagramAcknowledgedMessage.png
trunk/prototypes/java/doc/org/openlcb/DatagramMessage.png
trunk/prototypes/java/doc/org/openlcb/DatagramRejectedMessage.png
trunk/prototypes/java/doc/org/openlcb/EventID.png
trunk/prototypes/java/doc/org/openlcb/Gateway.png
trunk/prototypes/java/doc/org/openlcb/IdentifyConsumersMessage.png
trunk/prototypes/java/doc/org/openlcb/IdentifyEventsMessage.png
trunk/prototypes/java/doc/org/openlcb/IdentifyProducersMessage.png
trunk/prototypes/java/doc/org/openlcb/InitializationCompleteMessage.png
trunk/prototypes/java/doc/org/openlcb/LearnEventMessage.png
trunk/prototypes/java/doc/org/openlcb/Message.png
trunk/prototypes/java/doc/org/openlcb/MessageDecoder.png
trunk/prototypes/java/doc/org/openlcb/MessageTypeIdentifier.png
trunk/prototypes/java/doc/org/openlcb/MimicNodeStore.NodeMemo.png
trunk/prototypes/java/doc/org/openlcb/MimicNodeStore.png
trunk/prototypes/java/doc/org/openlcb/Node.png
trunk/prototypes/java/doc/org/openlcb/NodeID.png
trunk/prototypes/java/doc/org/openlcb/OpenLcb.png
trunk/prototypes/java/doc/org/openlcb/OptionalIntRejectedMessage.html
trunk/prototypes/java/doc/org/openlcb/OptionalIntRejectedMessage.png
trunk/prototypes/java/doc/org/openlcb/ProducerConsumerEventReportMessage.png
trunk/prototypes/java/doc/org/openlcb/ProducerIdentifiedMessage.png
trunk/prototypes/java/doc/org/openlcb/ProtocolIdentification.Protocol.html
trunk/prototypes/java/doc/org/openlcb/ProtocolIdentification.Protocol.png
trunk/prototypes/java/doc/org/openlcb/ProtocolIdentification.png
trunk/prototypes/java/doc/org/openlcb/ProtocolIdentificationReplyMessage.png
trunk/prototypes/java/doc/org/openlcb/ProtocolIdentificationRequestMessage.png
trunk/prototypes/java/doc/org/openlcb/SimpleNodeIdent.png
trunk/prototypes/java/doc/org/openlcb/SimpleNodeIdentInfoReplyMessage.png
trunk/prototypes/java/doc/org/openlcb/SimpleNodeIdentInfoRequestMessage.png
trunk/prototypes/java/doc/org/openlcb/SingleLinkNode.png
trunk/prototypes/java/doc/org/openlcb/StreamDataCompleteMessage.png
trunk/prototypes/java/doc/org/openlcb/StreamDataProceedMessage.png
trunk/prototypes/java/doc/org/openlcb/StreamDataSendMessage.png
trunk/prototypes/java/doc/org/openlcb/StreamInitReplyMessage.png
trunk/prototypes/java/doc/org/openlcb/StreamInitRequestMessage.png
trunk/prototypes/java/doc/org/openlcb/Throttle.html
trunk/prototypes/java/doc/org/openlcb/Throttle.png
trunk/prototypes/java/doc/org/openlcb/Utilities.png
trunk/prototypes/java/doc/org/openlcb/VerifiedNodeIDNumberMessage.png
trunk/prototypes/java/doc/org/openlcb/VerifyNodeIDNumberMessage.png
trunk/prototypes/java/doc/org/openlcb/Version.html
trunk/prototypes/java/doc/org/openlcb/Version.png
trunk/prototypes/java/doc/org/openlcb/can/AliasMap.png
trunk/prototypes/java/doc/org/openlcb/can/CanFrame.png
trunk/prototypes/java/doc/org/openlcb/can/MessageBuilder.AccumulationMemo.html
trunk/prototypes/java/doc/org/openlcb/can/MessageBuilder.AccumulationMemo.png
trunk/prototypes/java/doc/org/openlcb/can/MessageBuilder.png
trunk/prototypes/java/doc/org/openlcb/can/NIDa.png
trunk/prototypes/java/doc/org/openlcb/can/NIDaAlgorithm.png
trunk/prototypes/java/doc/org/openlcb/can/OpenLcbCanFrame.png
trunk/prototypes/java/doc/org/openlcb/can/class-use/MessageBuilder.AccumulationMemo.html
trunk/prototypes/java/doc/org/openlcb/can/org.openlcb.can.png
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.BitRep.png
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.EventID.png
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.Group.png
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.Identification.png
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.IntegerRep.png
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.Item.png
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.Map.png
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.Segment.png
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.StringRep.png
trunk/prototypes/java/doc/org/openlcb/cdi/CdiRep.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/CdiMemConfigReader.ReaderAccess.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/CdiMemConfigReader.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiReader.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.BitRep.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.EventID.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.Group.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.Identification.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.IntRep.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.Item.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.Map.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.Nested.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.Nested.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.Segment.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.StringRep.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/JdomCdiRep.png
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/class-use/JdomCdiRep.Nested.html
trunk/prototypes/java/doc/org/openlcb/cdi/jdom/org.openlcb.cdi.jdom.png
trunk/prototypes/java/doc/org/openlcb/cdi/org.openlcb.cdi.png
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.BitPane.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.BitPane.png
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.DisplayPane.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.DisplayPane.png
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.EventIdPane.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.EventIdPane.png
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.GroupPane.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.GroupPane.png
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.GuiItemFactory.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.GuiItemFactory.png
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.IntPane.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.IntPane.png
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.ReadReturn.png
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.ReadWriteAccess.png
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.StringPane.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.StringPane.png
trunk/prototypes/java/doc/org/openlcb/cdi/swing/CdiPanel.png
trunk/prototypes/java/doc/org/openlcb/cdi/swing/class-use/CdiPanel.BitPane.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/class-use/CdiPanel.DisplayPane.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/class-use/CdiPanel.EventIdPane.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/class-use/CdiPanel.GroupPane.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/class-use/CdiPanel.GuiItemFactory.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/class-use/CdiPanel.IntPane.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/class-use/CdiPanel.StringPane.html
trunk/prototypes/java/doc/org/openlcb/cdi/swing/org.openlcb.cdi.swing.png
trunk/prototypes/java/doc/org/openlcb/class-use/OptionalIntRejectedMessage.html
trunk/prototypes/java/doc/org/openlcb/class-use/ProtocolIdentification.Protocol.html
trunk/prototypes/java/doc/org/openlcb/class-use/Throttle.html
trunk/prototypes/java/doc/org/openlcb/class-use/Version.html
trunk/prototypes/java/doc/org/openlcb/implementations/BlueGoldEngine.png
trunk/prototypes/java/doc/org/openlcb/implementations/BlueGoldExtendedEngine.png
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramMeteringBuffer.Consumer.html
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramMeteringBuffer.Consumer.png
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramMeteringBuffer.MessageMemo.html
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramMeteringBuffer.MessageMemo.png
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramMeteringBuffer.ReplyHandler.html
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramMeteringBuffer.ReplyHandler.png
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramMeteringBuffer.png
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramReceiver.png
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramService.DatagramServiceReceiveMemo.png
trunk/prototypes/java/doc/org/openlcb/implementations/DatagramService.DatagramServiceTransmitMemo.png
trunk/prototypes/java/doc/org/open...
[truncated message content] |
|
From: <br...@us...> - 2015-09-08 21:23:17
|
Revision: 3924
http://sourceforge.net/p/openlcb/svn/3924
Author: bracz
Date: 2015-09-08 21:23:14 +0000 (Tue, 08 Sep 2015)
Log Message:
-----------
patch by Bob Jacobsen: "Fixes timing issue in memory write replies."
This patch includes several changes:
- fixes a bug in the datagram transmit handler that could cause the transmit Memo pointer to be lost. Previously if the transmit callback would immediately send a new datagram, the new datagram would incorrectly not be entered as the next pending transmit Memo pointer.
- adds scaffolding for support in Memory Config protocol writes that may send back a (possibly delayed) return datagram instead of just a success/failure to the write request datagram. The write responses are not fully plumbed through to the caller though.
- extends unittests for datagram transmit Memo objects.
Modified Paths:
--------------
trunk/prototypes/java/src/org/openlcb/implementations/DatagramService.java
trunk/prototypes/java/src/org/openlcb/implementations/MemoryConfigurationService.java
trunk/prototypes/java/test/org/openlcb/implementations/DatagramServiceTest.java
Modified: trunk/prototypes/java/src/org/openlcb/implementations/DatagramService.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/DatagramService.java 2015-09-08 20:30:17 UTC (rev 3923)
+++ trunk/prototypes/java/src/org/openlcb/implementations/DatagramService.java 2015-09-08 21:23:14 UTC (rev 3924)
@@ -83,7 +83,7 @@
rcvMemo.handleData(msg.getSourceNodeID(), msg.getData(), replyMemo);
// check that client replied
if (! replyMemo.hasReplied())
- System.err.println("No internal reply received to datagram with contents "+Utilities.toHexDotsString(msg.getData()));
+ System.err.println("No internal reply received to datagram with contents "+Utilities.toHexDotsString(msg.getData())); //log
} else {
// reject
replyMemo.acceptData(retval);
@@ -108,9 +108,10 @@
@Override
public void handleDatagramAcknowledged(DatagramAcknowledgedMessage msg, Connection sender){
if (xmtMemo != null && msg.getDestNodeID().equals(here) && xmtMemo.dest.equals(msg.getSourceNodeID()) ) {
- xmtMemo.handleReply(0);
+ DatagramServiceTransmitMemo temp = xmtMemo;
+ xmtMemo = null;
+ temp.handleReply(0);
}
- xmtMemo = null;
}
DatagramServiceReceiveMemo rcvMemo;
@@ -218,7 +219,7 @@
// TODO are these really immutable, given that subclass will inherit and change them?
@Immutable
@ThreadSafe
- static protected class DatagramServiceTransmitMemo {
+ static public class DatagramServiceTransmitMemo {
public DatagramServiceTransmitMemo(NodeID dest, int[] data) {
this.data = data;
this.dest = dest;
Modified: trunk/prototypes/java/src/org/openlcb/implementations/MemoryConfigurationService.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/MemoryConfigurationService.java 2015-09-08 20:30:17 UTC (rev 3923)
+++ trunk/prototypes/java/src/org/openlcb/implementations/MemoryConfigurationService.java 2015-09-08 21:23:14 UTC (rev 3924)
@@ -27,12 +27,15 @@
// connect to be notified of config service
downstream.registerForReceive(new DatagramService.DatagramServiceReceiveMemo(DATAGRAM_TYPE){
+ // Process a datagram received here; previous request state part of decoding
+ //
// does not allow for overlapping operations, either to a single node nor or multiple types
// nor to multiple nodes
//
// doesn't check for match of reply to memo, but eventually should.
@Override
public void handleData(NodeID dest, int[] data, DatagramService.ReplyMemo service) {
+ //log System.out.println("OLCB: handleData");
service.acceptData(0);
if (readMemo != null) {
// figure out address space uses byte?
@@ -74,6 +77,13 @@
configMemo = null;
memo.handleConfigData(dest, commands, options, highSpace, lowSpace,"");
}
+ if (writeMemo != null) {
+ // needs code to handle delayed reply
+ System.err.println("MemoryConfiguration Service: Code for delayed reply not yet present"); //log
+ McsWriteMemo memo = writeMemo;
+ writeMemo = null;
+ //memo.handleConfigData(dest, commands, options, highSpace, lowSpace,"");
+ }
}
});
}
@@ -86,8 +96,10 @@
this(mcs.here, mcs.downstream);
}
+ McsWriteMemo writeMemo; // can receive a delayed reply
public void request(McsWriteMemo memo) {
// forward as write Datagram
+ writeMemo = memo;
WriteDatagramMemo dg = new WriteDatagramMemo(memo.dest, memo.space, memo.address, memo.data, memo);
downstream.sendData(dg);
}
@@ -233,7 +245,6 @@
public int hashCode() { return this.data.length+this.data[0]+dest.hashCode()+((int)address)+space; }
/**
- * Overload this for notification of response
* @param code 0 for OK, non-zero for error reply
*/
public void handleWriteReply(int code) {
@@ -266,6 +277,10 @@
this.memo = memo;
}
McsWriteMemo memo;
+ /**
+ * Handle immediate write reply from datagram.
+ * Should refer back to the memo request
+ */
public void handleReply(int code) {
memo.handleWriteReply(code);
}
Modified: trunk/prototypes/java/test/org/openlcb/implementations/DatagramServiceTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/DatagramServiceTest.java 2015-09-08 20:30:17 UTC (rev 3923)
+++ trunk/prototypes/java/test/org/openlcb/implementations/DatagramServiceTest.java 2015-09-08 21:23:14 UTC (rev 3924)
@@ -36,6 +36,7 @@
public void testCtorViaSetup() {
}
+
public void testRcvMemoIsRealClass() {
DatagramService.DatagramServiceReceiveMemo m20 =
new DatagramService.DatagramServiceReceiveMemo(0x20);
@@ -51,21 +52,33 @@
public void testXmtMemoIsRealClass() {
DatagramService.DatagramServiceTransmitMemo m20 =
new DatagramService.DatagramServiceTransmitMemo(farID,new int[]{1});
+
DatagramService.DatagramServiceTransmitMemo m21 =
new DatagramService.DatagramServiceTransmitMemo(farID,new int[]{1});
DatagramService.DatagramServiceTransmitMemo m22 =
new DatagramService.DatagramServiceTransmitMemo(farID,new int[]{2});
DatagramService.DatagramServiceTransmitMemo m23 =
new DatagramService.DatagramServiceTransmitMemo(farID,new int[]{1,2});
+ DatagramService.DatagramServiceTransmitMemo m24 =
+ new DatagramService.DatagramServiceTransmitMemo(hereID,new int[]{1,2});
+ Assert.assertTrue(!m20.equals(null));
+ Assert.assertTrue(!m21.equals(null));
+ Assert.assertTrue(!m22.equals(null));
+ Assert.assertTrue(!m23.equals(null));
+ Assert.assertTrue(!m24.equals(null));
+
Assert.assertTrue(m20.equals(m20));
Assert.assertTrue(m20.equals(m21));
- Assert.assertTrue(!m20.equals(null));
- Assert.assertTrue(!m20.equals(m22));
- Assert.assertTrue(!m20.equals(m23));
- Assert.assertTrue(!m22.equals(m20));
- Assert.assertTrue(!m23.equals(m20));
+
+ Assert.assertTrue(!m21.equals(m22));
+ Assert.assertTrue(!m21.equals(m23));
+ Assert.assertTrue(!m21.equals(m24));
+ Assert.assertTrue(!m22.equals(m23));
+ Assert.assertTrue(!m22.equals(m24));
+ Assert.assertTrue(!m23.equals(m24));
+
}
public void testRegisterForData() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2015-09-08 21:35:14
|
Revision: 3925
http://sourceforge.net/p/openlcb/svn/3925
Author: bracz
Date: 2015-09-08 21:35:10 +0000 (Tue, 08 Sep 2015)
Log Message:
-----------
renames 0nmraCDI.xml to NMRAnetDatabaseTrainNode.xml to make unittest happy.
Modified Paths:
--------------
trunk/prototypes/java/openlcb-demo.jar
trunk/prototypes/java/openlcb.jar
Added Paths:
-----------
trunk/prototypes/java/NMRAnetDatabaseTrainNode.xml
Removed Paths:
-------------
trunk/prototypes/java/0nmraCDI.xml
Deleted: trunk/prototypes/java/0nmraCDI.xml
===================================================================
--- trunk/prototypes/java/0nmraCDI.xml 2015-09-08 21:23:14 UTC (rev 3924)
+++ trunk/prototypes/java/0nmraCDI.xml 2015-09-08 21:35:10 UTC (rev 3925)
@@ -1,1971 +0,0 @@
-<cdi xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openlcb.org/trunk/specs/schema/cdi.xsd">
- <identification>
- <manufacturer>NMRA</manufacturer>
- <model>NMRA standard CV definitions</model>
- <hardwareVersion />
- <softwareVersion />
- <map>
- <relation>
- <property>Model</property>
- <value>NMRA standard CV definitions</value>
- </relation>
- </map>
- </identification>
- <acdi />
- <segment origin="1" space="253">
- <group replication="256">
- <name>CVs</name>
- <repname>CV</repname>
- <description>Raw CV access</description>
- <int size="1">
- <min>0</min>
- <max>255</max>
- </int>
- </group>
- </segment>
- <segment space="253">
- <int origin="1">
- <name>Primary Address</name>
- <description>Short address</description>
- </int>
- <int origin="17" size="2">
- <name>Extended Address</name>
- </int>
- <bit size="8" mask="32" origin="29">
- <name>Address Format</name>
- <map>
- <relation>
- <property>0</property>
- <value>One byte (short) address</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Two byte (extended) address</value>
- </relation>
- </map>
- </bit>
- <int origin="3">
- <name>Acceleration Rate</name>
- </int>
- <int origin="4">
- <name>Deceleration Rate</name>
- </int>
- <int origin="2">
- <name>Vstart</name>
- <description>A value of 255 corresponds to 100%</description>
- </int>
- <int origin="5">
- <name>Vhigh</name>
- </int>
- <int origin="6">
- <name>Vmid</name>
- </int>
- <int origin="7">
- <name>Manufacturer Version No:</name>
- </int>
- <int origin="8">
- <name>Manufacturer ID:</name>
- </int>
- <int origin="9">
- <name>Total PWM Period</name>
- </int>
- <int origin="10">
- <name>EMF Feedback Cutout</name>
- </int>
- <int origin="11">
- <name>Packet Time-out Value</name>
- </int>
- <bit size="8" mask="1" origin="12">
- <name>Analog Power Conversion</name>
- <map>
- <relation>
- <property>0</property>
- <value>disabled</value>
- </relation>
- <relation>
- <property>1</property>
- <value>enabled</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="2" origin="12">
- <name>Radio Power Conversion</name>
- <map>
- <relation>
- <property>0</property>
- <value>disabled</value>
- </relation>
- <relation>
- <property>1</property>
- <value>enabled</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="4" origin="12">
- <name>Zero-1 Power Conversion</name>
- <map>
- <relation>
- <property>0</property>
- <value>disabled</value>
- </relation>
- <relation>
- <property>1</property>
- <value>enabled</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="8" origin="12">
- <name>Trix Power Conversion</name>
- <map>
- <relation>
- <property>0</property>
- <value>disabled</value>
- </relation>
- <relation>
- <property>1</property>
- <value>enabled</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="16" origin="12">
- <name>CTC/Railcommand Power Conversion</name>
- <map>
- <relation>
- <property>0</property>
- <value>disabled</value>
- </relation>
- <relation>
- <property>1</property>
- <value>enabled</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="1" origin="13">
- <name>Analog Mode Function Status - F1</name>
- <map>
- <relation>
- <property>0</property>
- <value>Off</value>
- </relation>
- <relation>
- <property>1</property>
- <value>On</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="2" origin="13">
- <name>Analog Mode Function Status - F2</name>
- <map>
- <relation>
- <property>0</property>
- <value>Off</value>
- </relation>
- <relation>
- <property>1</property>
- <value>On</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="4" origin="13">
- <name>Analog Mode Function Status - F3</name>
- <map>
- <relation>
- <property>0</property>
- <value>Off</value>
- </relation>
- <relation>
- <property>1</property>
- <value>On</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="8" origin="13">
- <name>Analog Mode Function Status - F4</name>
- <map>
- <relation>
- <property>0</property>
- <value>Off</value>
- </relation>
- <relation>
- <property>1</property>
- <value>On</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="16" origin="13">
- <name>Analog Mode Function Status - F5</name>
- <map>
- <relation>
- <property>0</property>
- <value>Off</value>
- </relation>
- <relation>
- <property>1</property>
- <value>On</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="32" origin="13">
- <name>Analog Mode Function Status - F6</name>
- <map>
- <relation>
- <property>0</property>
- <value>Off</value>
- </relation>
- <relation>
- <property>1</property>
- <value>On</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="64" origin="13">
- <name>Analog Mode Function Status - F7</name>
- <map>
- <relation>
- <property>0</property>
- <value>Off</value>
- </relation>
- <relation>
- <property>1</property>
- <value>On</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="128" origin="13">
- <name>Analog Mode Function Status - F8</name>
- <map>
- <relation>
- <property>0</property>
- <value>Off</value>
- </relation>
- <relation>
- <property>1</property>
- <value>On</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="7" origin="16">
- <name>Decoder Lock ID number</name>
- </bit>
- <bit size="8" mask="1" origin="21">
- <name>Consist Address Active For F1</name>
- <map>
- <relation>
- <property>0</property>
- <value>Locomotive Address Only</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Respond to Consist Address</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="2" origin="21">
- <name>Consist Address Active For F2</name>
- <map>
- <relation>
- <property>0</property>
- <value>Locomotive Address Only</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Respond to Consist Address</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="4" origin="21">
- <name>Consist Address Active For F3</name>
- <map>
- <relation>
- <property>0</property>
- <value>Locomotive Address Only</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Respond to Consist Address</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="8" origin="21">
- <name>Consist Address Active For F4</name>
- <map>
- <relation>
- <property>0</property>
- <value>Locomotive Address Only</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Respond to Consist Address</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="16" origin="21">
- <name>Consist Address Active For F5</name>
- <map>
- <relation>
- <property>0</property>
- <value>Locomotive Address Only</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Respond to Consist Address</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="32" origin="21">
- <name>Consist Address Active For F6</name>
- <map>
- <relation>
- <property>0</property>
- <value>Locomotive Address Only</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Respond to Consist Address</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="64" origin="21">
- <name>Consist Address Active For F7</name>
- <map>
- <relation>
- <property>0</property>
- <value>Locomotive Address Only</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Respond to Consist Address</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="128" origin="21">
- <name>Consist Address Active For F8</name>
- <map>
- <relation>
- <property>0</property>
- <value>Locomotive Address Only</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Respond to Consist Address</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="1" origin="22">
- <name>Consist Address Active For FL in Forward</name>
- <map>
- <relation>
- <property>0</property>
- <value>Locomotive Address Only</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Respond to Consist Address</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="2" origin="22">
- <name>Consist Address Active For FL in Reverse</name>
- <map>
- <relation>
- <property>0</property>
- <value>Locomotive Address Only</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Respond to Consist Address</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="127" origin="19">
- <name>Consist Address</name>
- </bit>
- <bit size="8" mask="128" origin="19">
- <name>Consist Direction</name>
- <map>
- <relation>
- <property>0</property>
- <value>forward</value>
- </relation>
- <relation>
- <property>1</property>
- <value>reverse</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="127" origin="23">
- <name>Consist Acceleration Adjustment</name>
- </bit>
- <bit size="8" mask="128" origin="23">
- <name>Consist Acceleration Adjustment Sign</name>
- <map>
- <relation>
- <property>0</property>
- <value>Adjustment Added</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Adjustment Subtracted</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="127" origin="24">
- <name>Consist Deceleration Adjustment</name>
- </bit>
- <bit size="8" mask="128" origin="24">
- <name>Consist Deceleration Adjustment Sign</name>
- <map>
- <relation>
- <property>0</property>
- <value>Adjustment Added</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Adjustment Subtracted</value>
- </relation>
- </map>
- </bit>
- <int origin="25">
- <name>Speed Table/Mid Range Cab Speed Step</name>
- <description>See RP 9.2.2 for more information. Values from 2 to 127 indicate preloaded speed tables. 0 or 1 means not used. Values between 128 and 154 define the cab throttle position where the mid range decoder speed value is applied</description>
- </int>
- <bit size="8" mask="1" origin="29">
- <name>Locomotive Direction</name>
- <map>
- <relation>
- <property>0</property>
- <value>forward</value>
- </relation>
- <relation>
- <property>1</property>
- <value>reverse</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="2" origin="29">
- <name>FL Location</name>
- <map>
- <relation>
- <property>0</property>
- <value>14 speed step format</value>
- </relation>
- <relation>
- <property>1</property>
- <value>28 speed step format</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="4" origin="29">
- <name>Power Source Conversion</name>
- <map>
- <relation>
- <property>0</property>
- <value>NMRA Digital only</value>
- </relation>
- <relation>
- <property>1</property>
- <value>DC conversion enabled</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="8" origin="29">
- <name>Advanced Decoder Acknowledgement</name>
- <map>
- <relation>
- <property>0</property>
- <value>disabled</value>
- </relation>
- <relation>
- <property>1</property>
- <value>enabled</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="16" origin="29">
- <name>Speed Table Definition</name>
- <map>
- <relation>
- <property>0</property>
- <value>Use Vstart, Vmid, Vhigh</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Use table in CVs 66 through 95</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="1" origin="33">
- <name>FL(f) controls output 1</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="2" origin="33">
- <name>FL(f) controls output 2</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="4" origin="33">
- <name>FL(f) controls output 3</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="8" origin="33">
- <name>FL(f) controls output 4</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="16" origin="33">
- <name>FL(f) controls output 5</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="32" origin="33">
- <name>FL(f) controls output 6</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="64" origin="33">
- <name>FL(f) controls output 7</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="128" origin="33">
- <name>FL(f) controls output 8</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="1" origin="34">
- <name>FL(r) controls output 1</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="2" origin="34">
- <name>FL(r) controls output 2</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="4" origin="34">
- <name>FL(r) controls output 3</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="8" origin="34">
- <name>FL(r) controls output 4</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="16" origin="34">
- <name>FL(r) controls output 5</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="32" origin="34">
- <name>FL(r) controls output 6</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="64" origin="34">
- <name>FL(r) controls output 7</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="128" origin="34">
- <name>FL(r) controls output 8</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="1" origin="35">
- <name>F1 controls output 1</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="2" origin="35">
- <name>F1 controls output 2</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="4" origin="35">
- <name>F1 controls output 3</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="8" origin="35">
- <name>F1 controls output 4</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="16" origin="35">
- <name>F1 controls output 5</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="32" origin="35">
- <name>F1 controls output 6</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="64" origin="35">
- <name>F1 controls output 7</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="128" origin="35">
- <name>F1 controls output 8</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="1" origin="36">
- <name>F2 controls output 1</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="2" origin="36">
- <name>F2 controls output 2</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="4" origin="36">
- <name>F2 controls output 3</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="8" origin="36">
- <name>F2 controls output 4</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="16" origin="36">
- <name>F2 controls output 5</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="32" origin="36">
- <name>F2 controls output 6</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="64" origin="36">
- <name>F2 controls output 7</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="128" origin="36">
- <name>F2 controls output 8</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="1" origin="37">
- <name>F3 controls output 1</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="2" origin="37">
- <name>F3 controls output 2</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="4" origin="37">
- <name>F3 controls output 3</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="8" origin="37">
- <name>F3 controls output 4</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="16" origin="37">
- <name>F3 controls output 5</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="32" origin="37">
- <name>F3 controls output 6</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="64" origin="37">
- <name>F3 controls output 7</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="128" origin="37">
- <name>F3 controls output 8</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="1" origin="38">
- <name>F4 controls output 4</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="2" origin="38">
- <name>F4 controls output 5</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="4" origin="38">
- <name>F4 controls output 6</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="8" origin="38">
- <name>F4 controls output 7</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="16" origin="38">
- <name>F4 controls output 8</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="32" origin="38">
- <name>F4 controls output 9</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property>1</property>
- <value>Yes</value>
- </relation>
- </map>
- </bit>
- <bit size="8" mask="64" origin="38">
- <name>F4 controls output 10</name>
- <map>
- <relation>
- <property>0</property>
- <value>No</value>
- </relation>
- <relation>
- <property...
[truncated message content] |
|
From: <br...@us...> - 2015-09-08 21:40:54
|
Revision: 3926
http://sourceforge.net/p/openlcb/svn/3926
Author: bracz
Date: 2015-09-08 21:40:51 +0000 (Tue, 08 Sep 2015)
Log Message:
-----------
Recompiles jar files after patches are applied.
Modified Paths:
--------------
trunk/prototypes/java/openlcb-demo.jar
trunk/prototypes/java/openlcb.jar
Modified: trunk/prototypes/java/openlcb-demo.jar
===================================================================
(Binary files differ)
Modified: trunk/prototypes/java/openlcb.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2015-09-16 07:36:57
|
Revision: 3927
http://sourceforge.net/p/openlcb/svn/3927
Author: bracz
Date: 2015-09-16 07:36:54 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
Packages version 0.6.5 of the java library for OpenLCB.
Modified Paths:
--------------
trunk/prototypes/java/manifest
trunk/prototypes/java/openlcb-demo.jar
trunk/prototypes/java/openlcb.jar
trunk/prototypes/java/src/org/openlcb/Version.java
Modified: trunk/prototypes/java/manifest
===================================================================
--- trunk/prototypes/java/manifest 2015-09-08 21:40:51 UTC (rev 3926)
+++ trunk/prototypes/java/manifest 2015-09-16 07:36:54 UTC (rev 3927)
@@ -7,6 +7,6 @@
Specification-Version: 0.6.4
Specification-Vendor: OpenLCB group
Package-Title: openlcb
-Package-Version: 0.6.4
+Package-Version: 0.6.5
Package-Vendor: OpenLCB group
Modified: trunk/prototypes/java/openlcb-demo.jar
===================================================================
(Binary files differ)
Modified: trunk/prototypes/java/openlcb.jar
===================================================================
(Binary files differ)
Modified: trunk/prototypes/java/src/org/openlcb/Version.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/Version.java 2015-09-08 21:40:51 UTC (rev 3926)
+++ trunk/prototypes/java/src/org/openlcb/Version.java 2015-09-16 07:36:54 UTC (rev 3927)
@@ -34,7 +34,7 @@
/* Library modifier - updated periodically
*/
- static final public int libMod = 4;
+ static final public int libMod = 5;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2016-01-01 20:04:45
|
Revision: 3957
http://sourceforge.net/p/openlcb/svn/3957
Author: bracz
Date: 2016-01-01 20:04:42 +0000 (Fri, 01 Jan 2016)
Log Message:
-----------
Renames TrainNode to RemoteTrainNode to better represent the intention of this class (as opposed to Node classes that act as a node on the bus).
Modified Paths:
--------------
trunk/prototypes/java/src/org/openlcb/implementations/throttle/AbstractNodeCache.java
trunk/prototypes/java/src/org/openlcb/implementations/throttle/TrainNodeCache.java
trunk/prototypes/java/src/org/openlcb/implementations/throttle/dcc/DccProxyCache.java
trunk/prototypes/java/test/org/openlcb/implementations/throttle/PackageTest.java
trunk/prototypes/java/test/org/openlcb/implementations/throttle/dcc/DccProxyCacheTest.java
Added Paths:
-----------
trunk/prototypes/java/src/org/openlcb/implementations/throttle/RemoteTrainNode.java
trunk/prototypes/java/test/org/openlcb/implementations/throttle/RemoteTrainNodeCacheTest.java
trunk/prototypes/java/test/org/openlcb/implementations/throttle/RemoteTrainNodeTest.java
Removed Paths:
-------------
trunk/prototypes/java/src/org/openlcb/implementations/throttle/TrainNode.java
trunk/prototypes/java/test/org/openlcb/implementations/throttle/TrainNodeCacheTest.java
trunk/prototypes/java/test/org/openlcb/implementations/throttle/TrainNodeTest.java
Modified: trunk/prototypes/java/src/org/openlcb/implementations/throttle/AbstractNodeCache.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/throttle/AbstractNodeCache.java 2016-01-01 20:04:22 UTC (rev 3956)
+++ trunk/prototypes/java/src/org/openlcb/implementations/throttle/AbstractNodeCache.java 2016-01-01 20:04:42 UTC (rev 3957)
@@ -1,18 +1,20 @@
package org.openlcb.implementations.throttle;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import org.openlcb.Connection;
import org.openlcb.EventID;
import org.openlcb.NodeID;
import org.openlcb.MessageDecoder;
import org.openlcb.ProducerConsumerEventReportMessage;
+import org.openlcb.ProducerIdentifiedMessage;
/**
* Maintains a cache of nodes seen to emit a particular EventID.
*
* @TODO: Type of node needs to be made generic T
- *
+ *
* @TODO: make sure name and semantics of contained property are correct for a Bean, e.g.
* it has the right name and related methods are present.
* http://docs.oracle.com/javase/tutorial/javabeans/writing/properties.html
@@ -25,9 +27,11 @@
public AbstractNodeCache(EventID indicator) {
this.indicator = indicator;
}
+ // Stores which nodes we've seen so far and at what index they are.
+ HashMap<NodeID, Integer> index = new HashMap<>();
ArrayList<T> list = new ArrayList<T>();
EventID indicator;
-
+
// for indexed Bean form
public T[] getCache() {
return (T[])list.toArray();
@@ -35,27 +39,44 @@
public T getCache(int index) throws ArrayIndexOutOfBoundsException {
return list.get(index);
}
-
+
public List<T> getList() {
return list;
}
+ @Override
public void handleProducerConsumerEventReport(ProducerConsumerEventReportMessage msg, Connection sender) {
EventID evt = msg.getEventID();
- if (evt.equals(indicator)) {
- // get source as Node ID for train node
- T node = newObject(msg.getSourceNodeID());
- list.add(node);
- firePropertyChange("cache", null, node);
+ processEvent(msg.getSourceNodeID(), evt);
+ }
+
+ private synchronized void processEvent(NodeID src, EventID evt) {
+ if (!evt.equals(indicator)) {
+ return;
}
+ if (index.containsKey(src)) {
+ return;
+ }
+ // get source as Node ID for train node
+ T node = newObject(src);
+ list.add(node);
+ int last = list.size() - 1;
+ index.put(src, last);
+ firePropertyChange("cache", null, node);
}
-
+
+ @Override
+ public void handleProducerIdentified(ProducerIdentifiedMessage msg, Connection sender) {
+ EventID evt = msg.getEventID();
+ processEvent(msg.getSourceNodeID(), evt);
+ }
+
/**
* Implement this for specific type to be created in this cache - inelegant!
*/
protected abstract T newObject(NodeID id);
-
+
java.beans.PropertyChangeSupport pcs = new java.beans.PropertyChangeSupport(this);
public synchronized void addPropertyChangeListener(java.beans.PropertyChangeListener l) {
pcs.addPropertyChangeListener(l);
Copied: trunk/prototypes/java/src/org/openlcb/implementations/throttle/RemoteTrainNode.java (from rev 3956, trunk/prototypes/java/src/org/openlcb/implementations/throttle/TrainNode.java)
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/throttle/RemoteTrainNode.java (rev 0)
+++ trunk/prototypes/java/src/org/openlcb/implementations/throttle/RemoteTrainNode.java 2016-01-01 20:04:42 UTC (rev 3957)
@@ -0,0 +1,24 @@
+package org.openlcb.implementations.throttle;
+
+import net.jcip.annotations.Immutable;
+import net.jcip.annotations.ThreadSafe;
+import org.openlcb.*;
+
+/**
+ * Represents local view about a remote Train Node, a node that implements the Traction protocol.
+ *
+ *
+ * @author Bob Jacobsen Copyright 2012
+ * @version $Revision$
+ */
+@Immutable
+@ThreadSafe
+public class RemoteTrainNode {
+
+ public RemoteTrainNode(NodeID node) {
+ this.node = node;
+ }
+ NodeID node;
+
+ public NodeID getNodeId() { return node; }
+}
Deleted: trunk/prototypes/java/src/org/openlcb/implementations/throttle/TrainNode.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/throttle/TrainNode.java 2016-01-01 20:04:22 UTC (rev 3956)
+++ trunk/prototypes/java/src/org/openlcb/implementations/throttle/TrainNode.java 2016-01-01 20:04:42 UTC (rev 3957)
@@ -1,24 +0,0 @@
-package org.openlcb.implementations.throttle;
-
-import net.jcip.annotations.Immutable;
-import net.jcip.annotations.ThreadSafe;
-import org.openlcb.*;
-
-/**
- * Represents a TrainNode, a node that implements the Train protocol.
- *
- *
- * @author Bob Jacobsen Copyright 2012
- * @version $Revision$
- */
-@Immutable
-@ThreadSafe
-public class TrainNode {
-
- public TrainNode(NodeID node) {
- this.node = node;
- }
- NodeID node;
-
- public NodeID getNode() { return node; }
-}
Modified: trunk/prototypes/java/src/org/openlcb/implementations/throttle/TrainNodeCache.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/throttle/TrainNodeCache.java 2016-01-01 20:04:22 UTC (rev 3956)
+++ trunk/prototypes/java/src/org/openlcb/implementations/throttle/TrainNodeCache.java 2016-01-01 20:04:42 UTC (rev 3957)
@@ -1,7 +1,5 @@
package org.openlcb.implementations.throttle;
-import net.jcip.annotations.Immutable;
-import net.jcip.annotations.ThreadSafe;
import org.openlcb.*;
/**
@@ -11,14 +9,17 @@
* @author Bob Jacobsen Copyright 2012
* @version $Revision$
*/
-public class TrainNodeCache extends AbstractNodeCache<TrainNode> {
+public class TrainNodeCache extends AbstractNodeCache<RemoteTrainNode> {
- public TrainNodeCache() {
- super(new EventID("01.01.00.00.00.00.03.01"));
+ private final OlcbInterface iface;
+
+ public TrainNodeCache(OlcbInterface iface) {
+ super(CommonIdentifiers.IS_TRAIN);
+ this.iface = iface;
}
- protected TrainNode newObject(NodeID id) {
- return new TrainNode(id);
+ protected RemoteTrainNode newObject(NodeID id) {
+ return new RemoteTrainNode(id);
}
}
Modified: trunk/prototypes/java/src/org/openlcb/implementations/throttle/dcc/DccProxyCache.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/throttle/dcc/DccProxyCache.java 2016-01-01 20:04:22 UTC (rev 3956)
+++ trunk/prototypes/java/src/org/openlcb/implementations/throttle/dcc/DccProxyCache.java 2016-01-01 20:04:42 UTC (rev 3957)
@@ -1,11 +1,9 @@
package org.openlcb.implementations.throttle.dcc;
-import net.jcip.annotations.Immutable;
-import net.jcip.annotations.ThreadSafe;
import org.openlcb.*;
import org.openlcb.implementations.throttle.AbstractNodeCache;
-import org.openlcb.implementations.throttle.TrainNode;
+import org.openlcb.implementations.throttle.RemoteTrainNode;
/**
* Maintain a cache of Train objects on OpenLCB network
@@ -14,13 +12,13 @@
* @author Bob Jacobsen Copyright 2012
* @version $Revision$
*/
-public class DccProxyCache extends AbstractNodeCache<TrainNode> {
+public class DccProxyCache extends AbstractNodeCache<RemoteTrainNode> {
public DccProxyCache() {
super(new EventID("01.01.00.00.00.00.04.01"));
}
- protected TrainNode newObject(NodeID id) {
- return new TrainNode(id);
+ protected RemoteTrainNode newObject(NodeID id) {
+ return new RemoteTrainNode(id);
}
}
Modified: trunk/prototypes/java/test/org/openlcb/implementations/throttle/PackageTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/throttle/PackageTest.java 2016-01-01 20:04:22 UTC (rev 3956)
+++ trunk/prototypes/java/test/org/openlcb/implementations/throttle/PackageTest.java 2016-01-01 20:04:42 UTC (rev 3957)
@@ -1,6 +1,5 @@
package org.openlcb.implementations.throttle;
-import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -32,8 +31,8 @@
suite.addTest(Float16Test.suite());
suite.addTest(ThrottleSpeedDatagramTest.suite());
suite.addTest(ThrottleImplementationTest.suite());
- suite.addTest(TrainNodeTest.suite());
- suite.addTest(TrainNodeCacheTest.suite());
+ suite.addTest(RemoteTrainNodeTest.suite());
+ suite.addTest(RemoteTrainNodeCacheTest.suite());
suite.addTest(org.openlcb.implementations.throttle.dcc.PackageTest.suite());
Added: trunk/prototypes/java/test/org/openlcb/implementations/throttle/RemoteTrainNodeCacheTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/throttle/RemoteTrainNodeCacheTest.java (rev 0)
+++ trunk/prototypes/java/test/org/openlcb/implementations/throttle/RemoteTrainNodeCacheTest.java 2016-01-01 20:04:42 UTC (rev 3957)
@@ -0,0 +1,112 @@
+package org.openlcb.implementations.throttle;
+
+import junit.framework.Assert;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.openlcb.CommonIdentifiers;
+import org.openlcb.EventID;
+import org.openlcb.FakeOlcbInterface;
+import org.openlcb.Message;
+import org.openlcb.NodeID;
+import org.openlcb.OptionalIntRejectedMessage;
+import org.openlcb.ProducerConsumerEventReportMessage;
+import org.openlcb.ProducerIdentifiedMessage;
+
+/**
+ * @author Bob Jacobsen Copyright 2012
+ * @version $Revision$
+ */
+public class RemoteTrainNodeCacheTest extends TestCase {
+ TrainNodeCache cache;
+ FakeOlcbInterface fakeInterface;
+
+ public RemoteTrainNodeCacheTest(String s) {
+ super(s);
+ }
+
+ // Main entry point
+ static public void main(String[] args) {
+ String[] testCaseName = {RemoteTrainNodeCacheTest.class.getName()};
+ junit.swingui.TestRunner.main(testCaseName);
+ }
+
+ // test suite from all defined tests
+ public static Test suite() {
+ TestSuite suite = new TestSuite(RemoteTrainNodeCacheTest.class);
+ return suite;
+ }
+
+ public void testSetup() {
+ Assert.assertTrue(cache != null);
+ }
+
+ public void testEmpty() {
+ Assert.assertTrue(cache.getList() != null);
+ Assert.assertEquals(0, cache.getList().size());
+ }
+
+ public void testIgnoresMessage() {
+
+ Message m = new OptionalIntRejectedMessage(null, null, 0, 0);
+
+ cache.put(m, null);
+ Assert.assertTrue(cache.getList() != null);
+ Assert.assertEquals(0, cache.getList().size());
+ }
+
+ public void testIgnoresEvent() {
+
+ Message m = new ProducerConsumerEventReportMessage(null, new EventID("01.02.03.04.05.06" +
+ ".07.08"));
+
+ cache.put(m, null);
+ Assert.assertTrue(cache.getList() != null);
+ Assert.assertEquals(0, cache.getList().size());
+ }
+
+ // from here down is testing infrastructure
+
+ public void testSeesIsTrainEvent() {
+ Message m = new ProducerConsumerEventReportMessage(new NodeID(new byte[]{1, 1, 0, 0, 4,
+ 4}), CommonIdentifiers.IS_TRAIN);
+
+ cache.put(m, null);
+ Assert.assertTrue(cache.getList() != null);
+ Assert.assertEquals(1, cache.getList().size());
+
+ RemoteTrainNode tn = cache.getList().get(0);
+
+ Assert.assertTrue(tn.getNodeId().equals(new NodeID(new byte[]{1, 1, 0, 0, 4, 4})));
+ }
+
+ public void testNoDuplicates() {
+ Message m = new ProducerConsumerEventReportMessage(new NodeID(new byte[]{1, 1, 0, 0, 4,
+ 4}), CommonIdentifiers.IS_TRAIN);
+
+ cache.put(m, null);
+ Assert.assertTrue(cache.getList() != null);
+ Assert.assertEquals(1, cache.getList().size());
+
+ m = new ProducerIdentifiedMessage(new NodeID(new byte[]{1, 1, 0, 0, 4, 4}),
+ CommonIdentifiers.IS_TRAIN);
+ cache.put(m, null);
+
+ Assert.assertEquals(1, cache.getList().size());
+
+ m = new ProducerIdentifiedMessage(new NodeID(new byte[]{1, 1, 0, 0, 4, 5}), new EventID
+ ("01.01.00.00.00.00.03.03"));
+ cache.put(m, null);
+
+ Assert.assertEquals(2, cache.getList().size());
+
+ Assert.assertEquals(new NodeID(new byte[]{1, 1, 0, 0, 4, 4}), cache.getCache(0).getNodeId());
+ Assert.assertEquals(new NodeID(new byte[]{1, 1, 0, 0, 4, 5}), cache.getCache(1).getNodeId());
+ }
+
+ public void setUp() {
+ fakeInterface = new FakeOlcbInterface();
+ cache = new TrainNodeCache(fakeInterface);
+ }
+}
Copied: trunk/prototypes/java/test/org/openlcb/implementations/throttle/RemoteTrainNodeTest.java (from rev 3956, trunk/prototypes/java/test/org/openlcb/implementations/throttle/TrainNodeTest.java)
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/throttle/RemoteTrainNodeTest.java (rev 0)
+++ trunk/prototypes/java/test/org/openlcb/implementations/throttle/RemoteTrainNodeTest.java 2016-01-01 20:04:42 UTC (rev 3957)
@@ -0,0 +1,43 @@
+package org.openlcb.implementations.throttle;
+
+import org.openlcb.*;
+
+import junit.framework.Assert;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ *
+ * @author Bob Jacobsen Copyright 2012
+ * @version $Revision$
+ */
+public class RemoteTrainNodeTest extends TestCase {
+
+ public void testCtor() {
+ new RemoteTrainNode(new NodeID(new byte[]{1,2,3,4,5,6}));
+ }
+
+ public void testNodeMemory() {
+ RemoteTrainNode node = new RemoteTrainNode(new NodeID(new byte[]{1,2,3,4,5,6}));
+ Assert.assertTrue(new NodeID(new byte[]{1,2,3,4,5,6}).equals(node.getNodeId()));
+ }
+
+ // from here down is testing infrastructure
+
+ public RemoteTrainNodeTest(String s) {
+ super(s);
+ }
+
+ // Main entry point
+ static public void main(String[] args) {
+ String[] testCaseName = {RemoteTrainNodeTest.class.getName()};
+ junit.swingui.TestRunner.main(testCaseName);
+ }
+
+ // test suite from all defined tests
+ public static Test suite() {
+ TestSuite suite = new TestSuite(RemoteTrainNodeTest.class);
+ return suite;
+ }
+}
Deleted: trunk/prototypes/java/test/org/openlcb/implementations/throttle/TrainNodeCacheTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/throttle/TrainNodeCacheTest.java 2016-01-01 20:04:22 UTC (rev 3956)
+++ trunk/prototypes/java/test/org/openlcb/implementations/throttle/TrainNodeCacheTest.java 2016-01-01 20:04:42 UTC (rev 3957)
@@ -1,80 +0,0 @@
-package org.openlcb.implementations.throttle;
-
-import org.openlcb.*;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- *
- * @author Bob Jacobsen Copyright 2012
- * @version $Revision$
- */
-public class TrainNodeCacheTest extends TestCase {
- TrainNodeCache cache;
-
- public void testSetup() {
- Assert.assertTrue(cache != null);
- }
-
- public void testEmpty() {
- Assert.assertTrue(cache.getList() != null);
- Assert.assertEquals(0, cache.getList().size());
- }
-
- public void testIgnoresMessage() {
-
- Message m = new OptionalIntRejectedMessage(null, null, 0, 0);
-
- cache.put(m, null);
- Assert.assertTrue(cache.getList() != null);
- Assert.assertEquals(0, cache.getList().size());
- }
-
- public void testIgnoresEvent() {
-
- Message m = new ProducerConsumerEventReportMessage(null, new EventID("01.02.03.04.05.06.07.08"));
-
- cache.put(m, null);
- Assert.assertTrue(cache.getList() != null);
- Assert.assertEquals(0, cache.getList().size());
- }
-
- public void testSeesIsTrainEvent() {
-
- Message m = new ProducerConsumerEventReportMessage(new NodeID(new byte[]{1,1,0,0,4,4}), new EventID("01.01.00.00.00.00.03.01"));
-
- cache.put(m, null);
- Assert.assertTrue(cache.getList() != null);
- Assert.assertEquals(1, cache.getList().size());
-
- TrainNode tn = cache.getList().get(0);
-
- Assert.assertTrue(tn.getNode().equals(new NodeID(new byte[]{1,1,0,0,4,4})));
-
- }
-
- public void setUp() {
- cache = new TrainNodeCache();
- }
-
- // from here down is testing infrastructure
-
- public TrainNodeCacheTest(String s) {
- super(s);
- }
-
- // Main entry point
- static public void main(String[] args) {
- String[] testCaseName = {TrainNodeCacheTest.class.getName()};
- junit.swingui.TestRunner.main(testCaseName);
- }
-
- // test suite from all defined tests
- public static Test suite() {
- TestSuite suite = new TestSuite(TrainNodeCacheTest.class);
- return suite;
- }
-}
Deleted: trunk/prototypes/java/test/org/openlcb/implementations/throttle/TrainNodeTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/throttle/TrainNodeTest.java 2016-01-01 20:04:22 UTC (rev 3956)
+++ trunk/prototypes/java/test/org/openlcb/implementations/throttle/TrainNodeTest.java 2016-01-01 20:04:42 UTC (rev 3957)
@@ -1,43 +0,0 @@
-package org.openlcb.implementations.throttle;
-
-import org.openlcb.*;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- *
- * @author Bob Jacobsen Copyright 2012
- * @version $Revision$
- */
-public class TrainNodeTest extends TestCase {
-
- public void testCtor() {
- new TrainNode(new NodeID(new byte[]{1,2,3,4,5,6}));
- }
-
- public void testNodeMemory() {
- TrainNode node = new TrainNode(new NodeID(new byte[]{1,2,3,4,5,6}));
- Assert.assertTrue(new NodeID(new byte[]{1,2,3,4,5,6}).equals(node.getNode()));
- }
-
- // from here down is testing infrastructure
-
- public TrainNodeTest(String s) {
- super(s);
- }
-
- // Main entry point
- static public void main(String[] args) {
- String[] testCaseName = {TrainNodeTest.class.getName()};
- junit.swingui.TestRunner.main(testCaseName);
- }
-
- // test suite from all defined tests
- public static Test suite() {
- TestSuite suite = new TestSuite(TrainNodeTest.class);
- return suite;
- }
-}
Modified: trunk/prototypes/java/test/org/openlcb/implementations/throttle/dcc/DccProxyCacheTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/throttle/dcc/DccProxyCacheTest.java 2016-01-01 20:04:22 UTC (rev 3956)
+++ trunk/prototypes/java/test/org/openlcb/implementations/throttle/dcc/DccProxyCacheTest.java 2016-01-01 20:04:42 UTC (rev 3957)
@@ -52,9 +52,9 @@
Assert.assertTrue(cache.getList() != null);
Assert.assertEquals(1, cache.getList().size());
- TrainNode tn = cache.getList().get(0);
+ RemoteTrainNode tn = cache.getList().get(0);
- Assert.assertTrue(tn.getNode().equals(new NodeID(new byte[]{1,1,0,0,4,4})));
+ Assert.assertTrue(tn.getNodeId().equals(new NodeID(new byte[]{1,1,0,0,4,4})));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2016-01-01 20:05:26
|
Revision: 3959
http://sourceforge.net/p/openlcb/svn/3959
Author: bracz
Date: 2016-01-01 20:05:24 +0000 (Fri, 01 Jan 2016)
Log Message:
-----------
Implementing traction protocol messages:
- adds new abstract message base class: AddressedPayloadMessage, with common handling for parsing and serializing.
- adds MTI values for traction control/proxy command/request
- adds message implementation classes for traction control/proxy command/request messages.
- adds CAN frame serializing for generic AddressedPayloadMessage.
- adds CAN frame parsing for these four messages.
- adds some unit test coverage.
Modified Paths:
--------------
trunk/prototypes/java/src/org/openlcb/MessageDecoder.java
trunk/prototypes/java/src/org/openlcb/MessageTypeIdentifier.java
trunk/prototypes/java/src/org/openlcb/can/MessageBuilder.java
trunk/prototypes/java/src/org/openlcb/can/OpenLcbCanFrame.java
trunk/prototypes/java/test/org/openlcb/MessageTypeIdentifierTest.java
trunk/prototypes/java/test/org/openlcb/can/MessageBuilderTest.java
Added Paths:
-----------
trunk/prototypes/java/src/org/openlcb/AddressedPayloadMessage.java
trunk/prototypes/java/src/org/openlcb/messages/
trunk/prototypes/java/src/org/openlcb/messages/TractionControlReplyMessage.java
trunk/prototypes/java/src/org/openlcb/messages/TractionControlRequestMessage.java
trunk/prototypes/java/src/org/openlcb/messages/TractionProxyReplyMessage.java
trunk/prototypes/java/src/org/openlcb/messages/TractionProxyRequestMessage.java
Added: trunk/prototypes/java/src/org/openlcb/AddressedPayloadMessage.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/AddressedPayloadMessage.java (rev 0)
+++ trunk/prototypes/java/src/org/openlcb/AddressedPayloadMessage.java 2016-01-01 20:05:24 UTC (rev 3959)
@@ -0,0 +1,34 @@
+package org.openlcb;
+
+/**
+ * Common base class for Addressed messages carrying a payload. This base class is easy
+ * to serialize and deserialize from an interface like CAN.
+ *
+ * Created by bracz on 12/29/15.
+ */
+public abstract class AddressedPayloadMessage extends AddressedMessage {
+ protected byte[] payload;
+
+ public byte[] getPayload() { return payload; }
+
+ public AddressedPayloadMessage(NodeID source, NodeID dest, byte[] payload) {
+ super(source, dest);
+ if (payload == null) {
+ this.payload = new byte[0];
+ } else {
+ this.payload = payload.clone();
+ }
+ }
+
+ public String toString() {
+ return super.toString() + " " + getEMTI().toString() + " with payload " + Utilities
+ .toHexSpaceString(payload);
+ }
+
+ public abstract MessageTypeIdentifier getEMTI();
+
+ @Override
+ public int getMTI() {
+ return getEMTI().mti();
+ }
+}
Modified: trunk/prototypes/java/src/org/openlcb/MessageDecoder.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/MessageDecoder.java 2016-01-01 20:05:02 UTC (rev 3958)
+++ trunk/prototypes/java/src/org/openlcb/MessageDecoder.java 2016-01-01 20:05:24 UTC (rev 3959)
@@ -1,5 +1,10 @@
package org.openlcb;
+import org.openlcb.messages.TractionControlReplyMessage;
+import org.openlcb.messages.TractionControlRequestMessage;
+import org.openlcb.messages.TractionProxyReplyMessage;
+import org.openlcb.messages.TractionProxyRequestMessage;
+
/**
* This class provides a basic double-dispatch mechanism for handling
* messages. OpenLCB messages in this implementation
@@ -176,4 +181,32 @@
public void handleOptionalIntRejected(OptionalIntRejectedMessage msg, Connection sender){
defaultHandler(msg, sender);
}
+
+ /**
+ * Handle "Traction Control Request" message
+ */
+ public void handleTractionControlRequest(TractionControlRequestMessage msg, Connection sender) {
+ defaultHandler(msg, sender);
+ }
+
+ /**
+ * Handle "Traction Control Reply" message
+ */
+ public void handleTractionControlReply(TractionControlReplyMessage msg, Connection sender) {
+ defaultHandler(msg, sender);
+ }
+
+ /**
+ * Handle "Traction Proxy Request" message
+ */
+ public void handleTractionProxyRequest(TractionProxyRequestMessage msg, Connection sender) {
+ defaultHandler(msg, sender);
+ }
+
+ /**
+ * Handle "Traction Proxy Reply" message
+ */
+ public void handleTractionProxyReply(TractionProxyReplyMessage msg, Connection sender) {
+ defaultHandler(msg, sender);
+ }
}
Modified: trunk/prototypes/java/src/org/openlcb/MessageTypeIdentifier.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/MessageTypeIdentifier.java 2016-01-01 20:05:02 UTC (rev 3958)
+++ trunk/prototypes/java/src/org/openlcb/MessageTypeIdentifier.java 2016-01-01 20:05:24 UTC (rev 3959)
@@ -27,6 +27,8 @@
// Type number
// Modifier (0-3)
// Name
+
+ // addr, event, simpl, S, P, Ty, M, Name
InitializationComplete ( false, false, false, 0, 0, 8, 0, "InitializationComplete"),
VerifyNodeIdAddressed ( true, false, false, 0, 1, 4, 0, "VerifyNodeIdAddressed"),
@@ -53,9 +55,14 @@
IdentifyEventsAddressed ( true, false, false, 0, 2, 11, 0, "IdentifyEventsAddressed"),
IdentifyEventsGlobal ( false, false, true, 0, 2, 11, 0, "IdentifyEventsGlobal"),
- LearnEvent ( false, true, true, 0, 1, 12, 0, "LearnEvent"),
- ProducerConsumerEventReport ( false, true, true, 0, 1, 13, 0, "ProducerConsumerEventReport"),
-
+ LearnEvent ( false, true, true, 0, 1, 12, 0, "LearnEvent"),
+ ProducerConsumerEventReport ( false, true, true, 0, 1, 13, 0, "ProducerConsumerEventReport"),
+
+ TractionControlRequest ( true, false, false, 0, 1, 15, 3, "TractionControlRequest" ),
+ TractionControlReply ( true, false, false, 0, 0, 15, 1, "TractionControlReply" ),
+ TractionProxyRequest ( true, false, false, 0, 1, 15, 2, "TractionProxyRequest" ),
+ TractionProxyReply ( true, false, false, 0, 0, 15, 0, "TractionProxyReply" ),
+
SimpleNodeIdentInfoRequest ( true, false, false, 0, 3, 15, 0, "SimpleNodeIdentInfoRequest"),
SimpleNodeIdentInfoReply ( true, false, false, 0, 2, 16, 0, "SimpleNodeIdentInfoReply"),
Modified: trunk/prototypes/java/src/org/openlcb/can/MessageBuilder.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/can/MessageBuilder.java 2016-01-01 20:05:02 UTC (rev 3958)
+++ trunk/prototypes/java/src/org/openlcb/can/MessageBuilder.java 2016-01-01 20:05:24 UTC (rev 3959)
@@ -4,6 +4,10 @@
import java.util.HashMap;
import java.util.List;
import org.openlcb.*;
+import org.openlcb.messages.TractionControlReplyMessage;
+import org.openlcb.messages.TractionControlRequestMessage;
+import org.openlcb.messages.TractionProxyReplyMessage;
+import org.openlcb.messages.TractionProxyRequestMessage;
/**
* Converts CAN frame messages to regular messages
@@ -117,7 +121,9 @@
NodeID dest = null;
int mti = getMTI(f);
byte[] data = f.getData();
-
+
+ byte[] content = null;
+
if ( ((mti&0x008) != 0) && (f.getNumDataElements() >= 2) ) {
// addressed message
dest = map.getNodeID( ( (f.getElement(0) << 8) + (f.getElement(1) & 0xff) ) & 0xFFF );
@@ -143,6 +149,9 @@
// we're going to continue processing with the accumulated data
data = mold.data;
accumulations.remove(f.getHeader());
+
+ content = new byte[data.length-2];
+ System.arraycopy(data, 2, content, 0, content.length);
}
MessageTypeIdentifier value = MessageTypeIdentifier.get(mti);
@@ -187,7 +196,18 @@
case ProtocolSupportReply:
retlist.add(new ProtocolIdentificationReplyMessage(source, dest, f.dataAsLong()));
return retlist;
-
+ case TractionControlRequest:
+ retlist.add(new TractionControlRequestMessage(source, dest, content));
+ return retlist;
+ case TractionControlReply:
+ retlist.add(new TractionControlReplyMessage(source, dest, content));
+ return retlist;
+ case TractionProxyRequest:
+ retlist.add(new TractionProxyRequestMessage(source, dest, content));
+ return retlist;
+ case TractionProxyReply:
+ retlist.add(new TractionProxyReplyMessage(source, dest, content));
+ return retlist;
case IdentifyConsumer:
retlist.add(new IdentifyConsumersMessage(source, getEventID(f)));
return retlist;
@@ -215,10 +235,7 @@
case SimpleNodeIdentInfoRequest:
retlist.add(new SimpleNodeIdentInfoRequestMessage(source, dest));
return retlist;
- case SimpleNodeIdentInfoReply:
- byte[] content = new byte[data.length-2];
- System.arraycopy(data, 2, content, 0, content.length);
-
+ case SimpleNodeIdentInfoReply:
retlist.add(new SimpleNodeIdentInfoReplyMessage(source, dest, content));
return retlist;
@@ -353,7 +370,27 @@
return retlist;
}
-
+
+ private void handleAddressedPayloadMessage(AddressedPayloadMessage msg, Connection sender) {
+ byte[] payload = msg.getPayload();
+ if (payload == null) {
+ payload = new byte[0];
+ }
+ for (int i = 0; i < Math.max(1, payload.length); i += 6) {
+ // Note that the order of these calls are carefully chosen so that internally
+ // OpenLcbCanFrame does not overwrite parts of the payload with each other.
+ OpenLcbCanFrame f = new OpenLcbCanFrame(map.getAlias(msg.getSourceNodeID()));
+ f.setOpenLcbMTI(msg.getEMTI().mti());
+ int thislen = Math.min(6, payload.length - i);
+ byte[] data = new byte[thislen + 2];
+ System.arraycopy(payload, i, data, 2, thislen);
+ f.setData(data);
+ f.setDestAlias(map.getAlias(msg.getDestNodeID()));
+ f.setContinuation(i == 0, (i + 6 >= payload.length));
+ retlist.add(f);
+ }
+ }
+
/**
* Handle "Initialization Complete" message
*/
@@ -461,7 +498,37 @@
public void handleLearnEvent(LearnEventMessage msg, Connection sender){
defaultHandler(msg, sender);
}
+
+ @Override
/**
+ * Handle "Traction Control Request" message
+ */
+ public void handleTractionControlRequest(TractionControlRequestMessage msg, Connection sender) {
+ handleAddressedPayloadMessage(msg, sender);
+ }
+
+ /**
+ * Handle "Traction Control Reply" message
+ */
+ public void handleTractionControlReply(TractionControlReplyMessage msg, Connection sender) {
+ handleAddressedPayloadMessage(msg, sender);
+ }
+
+ /**
+ * Handle "Traction Proxy Request" message
+ */
+ public void handleTractionProxyRequest(TractionProxyRequestMessage msg, Connection sender) {
+ handleAddressedPayloadMessage(msg, sender);
+ }
+
+ /**
+ * Handle "Traction Proxy Reply" message
+ */
+ public void handleTractionProxyReply(TractionProxyReplyMessage msg, Connection sender) {
+ handleAddressedPayloadMessage(msg, sender);
+ }
+
+ /**
* Handle "Simple Node Ident Info Request" message
*/
@Override
Modified: trunk/prototypes/java/src/org/openlcb/can/OpenLcbCanFrame.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/can/OpenLcbCanFrame.java 2016-01-01 20:05:02 UTC (rev 3958)
+++ trunk/prototypes/java/src/org/openlcb/can/OpenLcbCanFrame.java 2016-01-01 20:05:24 UTC (rev 3959)
@@ -103,7 +103,14 @@
data[1] = (byte)(a&0xFF);
length = (length<2) ? 2 : length;
}
-
+
+ /** Sets the continuation bits for an addressed frame. */
+ void setContinuation(boolean first, boolean last) {
+ data[0] &= CONTINUATION_BITS_MASK;
+ if (!first) data[0] |= CONTINUATION_BITS_NOT_FIRST_FRAME;
+ if (!last) data[0] |= CONTINUATION_BITS_NOT_LAST_FRAME;
+ }
+
void setFrameTypeCAN() {
id &= ~MASK_FRAME_TYPE;
}
@@ -420,4 +427,9 @@
static final int FRAME_FORMAT_ADDRESSED_NON_DATAGRAM = 6;
static final int FRAME_FORMAT_STREAM_CODE = 7;
+ // Continuation bits
+ static final byte CONTINUATION_BITS_MASK = (byte) 0xCF;
+ static final byte CONTINUATION_BITS_NOT_FIRST_FRAME = (byte) 0x20;
+ static final byte CONTINUATION_BITS_NOT_LAST_FRAME = (byte) 0x10;
+
}
Added: trunk/prototypes/java/src/org/openlcb/messages/TractionControlReplyMessage.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/messages/TractionControlReplyMessage.java (rev 0)
+++ trunk/prototypes/java/src/org/openlcb/messages/TractionControlReplyMessage.java 2016-01-01 20:05:24 UTC (rev 3959)
@@ -0,0 +1,34 @@
+package org.openlcb.messages;
+
+import net.jcip.annotations.Immutable;
+import net.jcip.annotations.ThreadSafe;
+
+import org.openlcb.AddressedMessage;
+import org.openlcb.AddressedPayloadMessage;
+import org.openlcb.Connection;
+import org.openlcb.MessageDecoder;
+import org.openlcb.MessageTypeIdentifier;
+import org.openlcb.NodeID;
+
+/**
+ * Traction Control Reply message implementation.
+ * <p/>
+ * Created by bracz on 12/29/15.
+ */
+@Immutable
+@ThreadSafe
+public class TractionControlReplyMessage extends AddressedPayloadMessage {
+ public TractionControlReplyMessage(NodeID source, NodeID dest, byte[] payload) {
+ super(source, dest, payload);
+ }
+
+ @Override
+ public void applyTo(MessageDecoder decoder, Connection sender) {
+ decoder.handleTractionControlReply(this, sender);
+ }
+
+ @Override
+ public MessageTypeIdentifier getEMTI() {
+ return MessageTypeIdentifier.TractionControlReply;
+ }
+}
Added: trunk/prototypes/java/src/org/openlcb/messages/TractionControlRequestMessage.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/messages/TractionControlRequestMessage.java (rev 0)
+++ trunk/prototypes/java/src/org/openlcb/messages/TractionControlRequestMessage.java 2016-01-01 20:05:24 UTC (rev 3959)
@@ -0,0 +1,34 @@
+package org.openlcb.messages;
+
+import net.jcip.annotations.Immutable;
+import net.jcip.annotations.ThreadSafe;
+
+import org.openlcb.AddressedPayloadMessage;
+import org.openlcb.Connection;
+import org.openlcb.MessageDecoder;
+import org.openlcb.MessageTypeIdentifier;
+import org.openlcb.NodeID;
+
+/**
+ * Traction Control Request message implementation.
+ * <p/>
+ * Created by bracz on 12/29/15.
+ */
+@Immutable
+@ThreadSafe
+public class TractionControlRequestMessage extends AddressedPayloadMessage {
+ public TractionControlRequestMessage(NodeID source, NodeID dest, byte[] payload) {
+ super(source, dest, payload);
+ this.payload = payload.clone();
+ }
+
+ @Override
+ public void applyTo(MessageDecoder decoder, Connection sender) {
+ decoder.handleTractionControlRequest(this, sender);
+ }
+
+ @Override
+ public MessageTypeIdentifier getEMTI() {
+ return MessageTypeIdentifier.TractionControlRequest;
+ }
+}
Added: trunk/prototypes/java/src/org/openlcb/messages/TractionProxyReplyMessage.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/messages/TractionProxyReplyMessage.java (rev 0)
+++ trunk/prototypes/java/src/org/openlcb/messages/TractionProxyReplyMessage.java 2016-01-01 20:05:24 UTC (rev 3959)
@@ -0,0 +1,34 @@
+package org.openlcb.messages;
+
+import net.jcip.annotations.Immutable;
+import net.jcip.annotations.ThreadSafe;
+
+import org.openlcb.AddressedMessage;
+import org.openlcb.AddressedPayloadMessage;
+import org.openlcb.Connection;
+import org.openlcb.MessageDecoder;
+import org.openlcb.MessageTypeIdentifier;
+import org.openlcb.NodeID;
+
+/**
+ * Traction Proxy Reply message implementation.
+ * <p/>
+ * Created by bracz on 12/29/15.
+ */
+@Immutable
+@ThreadSafe
+public class TractionProxyReplyMessage extends AddressedPayloadMessage {
+ public TractionProxyReplyMessage(NodeID source, NodeID dest, byte[] payload) {
+ super(source, dest, payload);
+ }
+
+ @Override
+ public void applyTo(MessageDecoder decoder, Connection sender) {
+ decoder.handleTractionProxyReply(this, sender);
+ }
+
+ @Override
+ public MessageTypeIdentifier getEMTI() {
+ return MessageTypeIdentifier.TractionProxyReply;
+ }
+}
Added: trunk/prototypes/java/src/org/openlcb/messages/TractionProxyRequestMessage.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/messages/TractionProxyRequestMessage.java (rev 0)
+++ trunk/prototypes/java/src/org/openlcb/messages/TractionProxyRequestMessage.java 2016-01-01 20:05:24 UTC (rev 3959)
@@ -0,0 +1,35 @@
+package org.openlcb.messages;
+
+import net.jcip.annotations.Immutable;
+import net.jcip.annotations.ThreadSafe;
+
+import org.openlcb.AddressedMessage;
+import org.openlcb.AddressedPayloadMessage;
+import org.openlcb.Connection;
+import org.openlcb.MessageDecoder;
+import org.openlcb.MessageTypeIdentifier;
+import org.openlcb.NodeID;
+
+/**
+ * Traction Proxy Request message implementation.
+ * <p/>
+ * Created by bracz on 12/29/15.
+ */
+@Immutable
+@ThreadSafe
+public class TractionProxyRequestMessage extends AddressedPayloadMessage {
+ public TractionProxyRequestMessage(NodeID source, NodeID dest, byte[] payload) {
+ super(source, dest, payload);
+ }
+
+ @Override
+ public void applyTo(MessageDecoder decoder, Connection sender) {
+ decoder.handleTractionProxyRequest(this, sender);
+ }
+
+ @Override
+ public MessageTypeIdentifier getEMTI() {
+ return MessageTypeIdentifier.TractionProxyRequest;
+ }
+
+}
Modified: trunk/prototypes/java/test/org/openlcb/MessageTypeIdentifierTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/MessageTypeIdentifierTest.java 2016-01-01 20:05:02 UTC (rev 3958)
+++ trunk/prototypes/java/test/org/openlcb/MessageTypeIdentifierTest.java 2016-01-01 20:05:24 UTC (rev 3959)
@@ -66,6 +66,11 @@
Assert.assertEquals(0x0594, MessageTypeIdentifier.LearnEvent.mti());
Assert.assertEquals(0x05B4, MessageTypeIdentifier.ProducerConsumerEventReport.mti());
+ Assert.assertEquals(0x05EB, MessageTypeIdentifier.TractionControlRequest.mti());
+ Assert.assertEquals(0x01E9, MessageTypeIdentifier.TractionControlReply.mti());
+ Assert.assertEquals(0x05EA, MessageTypeIdentifier.TractionProxyRequest.mti());
+ Assert.assertEquals(0x01E8, MessageTypeIdentifier.TractionProxyReply.mti());
+
Assert.assertEquals(0x0DE8, MessageTypeIdentifier.SimpleNodeIdentInfoRequest.mti());
Assert.assertEquals(0x0A08, MessageTypeIdentifier.SimpleNodeIdentInfoReply.mti());
Modified: trunk/prototypes/java/test/org/openlcb/can/MessageBuilderTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/can/MessageBuilderTest.java 2016-01-01 20:05:02 UTC (rev 3958)
+++ trunk/prototypes/java/test/org/openlcb/can/MessageBuilderTest.java 2016-01-01 20:05:24 UTC (rev 3959)
@@ -1,6 +1,10 @@
package org.openlcb.can;
import org.openlcb.*;
+import org.openlcb.messages.TractionControlReplyMessage;
+import org.openlcb.messages.TractionControlRequestMessage;
+import org.openlcb.messages.TractionProxyReplyMessage;
+import org.openlcb.messages.TractionProxyRequestMessage;
import java.util.List;
@@ -95,6 +99,75 @@
compareContent(event.getContents(), f0);
}
+ public void testTractionControlRequestMessageSingle() {
+ Message m = new TractionControlRequestMessage(source, destination, new byte[]{(byte)0xCC,
+ (byte)0xAA, 0x55, 4, 5, 6});
+ MessageBuilder b = new MessageBuilder(map);
+
+ List<OpenLcbCanFrame> list = b.processMessage(m);
+
+ Assert.assertEquals("count", 1, list.size());
+ CanFrame f0 = list.get(0);
+ Assert.assertEquals("header", toHexString(0x195EB123), toHexString(f0.getHeader()));
+ compareContent(Utilities.bytesFromHexString("03 21 CC AA 55 04 05 06"), f0);
+ }
+
+ public void testTractionControlRequestMessageMulti() {
+ Message m = new TractionControlRequestMessage(source, destination, new byte[]{(byte)0xCC,
+ (byte)0xAA, 0x55, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14});
+ MessageBuilder b = new MessageBuilder(map);
+
+ List<OpenLcbCanFrame> list = b.processMessage(m);
+
+ Assert.assertEquals("count", 3, list.size());
+ CanFrame f0 = list.get(0);
+ Assert.assertEquals("header", toHexString(0x195EB123), toHexString(list.get(0).getHeader()));
+ Assert.assertEquals("header", toHexString(0x195EB123), toHexString(list.get(1).getHeader()));
+ Assert.assertEquals("header", toHexString(0x195EB123), toHexString(list.get(2).getHeader()));
+ compareContent(Utilities.bytesFromHexString("13 21 CC AA 55 04 05 06"), list.get(0));
+ compareContent(Utilities.bytesFromHexString("33 21 07 08 09 0a 0b 0c"), list.get(1));
+ compareContent(Utilities.bytesFromHexString("23 21 0d 0e"), list.get(2));
+ }
+
+ public void testTractionControlReplyMessage() {
+ Message m = new TractionControlReplyMessage(source, destination, new byte[]{(byte)0xCC,
+ (byte)0xAA, 0x55, 4, 5, 6});
+ MessageBuilder b = new MessageBuilder(map);
+
+ List<OpenLcbCanFrame> list = b.processMessage(m);
+
+ Assert.assertEquals("count", 1, list.size());
+ CanFrame f0 = list.get(0);
+ Assert.assertEquals("header", toHexString(0x191E9123), toHexString(f0.getHeader()));
+ compareContent(Utilities.bytesFromHexString("03 21 CC AA 55 04 05 06"), f0);
+ }
+
+ public void testTractionProxyRequestMessage() {
+ Message m = new TractionProxyRequestMessage(source, destination, new byte[]{(byte)0xCC,
+ (byte)0xAA, 0x55, 4, 5, 6});
+ MessageBuilder b = new MessageBuilder(map);
+
+ List<OpenLcbCanFrame> list = b.processMessage(m);
+
+ Assert.assertEquals("count", 1, list.size());
+ CanFrame f0 = list.get(0);
+ Assert.assertEquals("header", toHexString(0x195EA123), toHexString(f0.getHeader()));
+ compareContent(Utilities.bytesFromHexString("03 21 CC AA 55 04 05 06"), f0);
+ }
+
+ public void testTractionProxyReplyMessage() {
+ Message m = new TractionProxyReplyMessage(source, destination, new byte[]{(byte)0xCC,
+ (byte)0xAA, 0x55, 4, 5, 6});
+ MessageBuilder b = new MessageBuilder(map);
+
+ List<OpenLcbCanFrame> list = b.processMessage(m);
+
+ Assert.assertEquals("count", 1, list.size());
+ CanFrame f0 = list.get(0);
+ Assert.assertEquals("header", toHexString(0x191E8123), toHexString(f0.getHeader()));
+ compareContent(Utilities.bytesFromHexString("03 21 CC AA 55 04 05 06"), f0);
+ }
+
public void testDatagramMessageShort() {
int[] data = new int[]{21,22,23};
Message m = new DatagramMessage(source, destination, data);
@@ -390,6 +463,21 @@
}
+ public void testTractionControlRequestParseSingle() {
+ OpenLcbCanFrame frame = new OpenLcbCanFrame(0x123);
+ frame.setHeader(0x195EB123);
+ frame.setData(new byte[]{0x03, 0x21, 0x12, 0x34});
+
+ MessageBuilder b = new MessageBuilder(map);
+ List<Message> list = b.processFrame(frame);
+
+ Assert.assertEquals("count", 1, list.size());
+
+ Message msg = list.get(0);
+ Assert.assertTrue(msg instanceof TractionControlRequestMessage);
+ Assert.assertEquals("payload", "12 34", Utilities.toHexSpaceString(((AddressedPayloadMessage)msg).getPayload()));
+ }
+
public void testAliasExtraction() {
NodeID high = new NodeID(new byte[]{11,12,13,14,15,16});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2016-01-01 20:06:22
|
Revision: 3962
http://sourceforge.net/p/openlcb/svn/3962
Author: bracz
Date: 2016-01-01 20:06:18 +0000 (Fri, 01 Jan 2016)
Log Message:
-----------
Adds factory methods to traction control request message.
Adds new test suite class for the new directories.
Modified Paths:
--------------
trunk/prototypes/java/src/org/openlcb/implementations/throttle/Float16.java
trunk/prototypes/java/src/org/openlcb/messages/TractionControlRequestMessage.java
trunk/prototypes/java/test/org/openlcb/PackageTest.java
Added Paths:
-----------
trunk/prototypes/java/test/org/openlcb/messages/
trunk/prototypes/java/test/org/openlcb/messages/PackageTest.java
trunk/prototypes/java/test/org/openlcb/messages/TractionControlRequestMessageTest.java
Modified: trunk/prototypes/java/src/org/openlcb/implementations/throttle/Float16.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/throttle/Float16.java 2016-01-01 20:05:59 UTC (rev 3961)
+++ trunk/prototypes/java/src/org/openlcb/implementations/throttle/Float16.java 2016-01-01 20:06:18 UTC (rev 3962)
@@ -70,7 +70,10 @@
public int getInt() {
return ((byte1&0xFF)<<8)|(byte2&0xFF);
}
-
+
+ public byte getByte1() { return byte1; }
+ public byte getByte2() { return byte2; }
+
public float getFloat() {
if (byte1 == 0 && byte2 == 0) return 0.0f;
int ch = (byte2&0xFF) | ((byte1&0x3)<<8) | 0x400;
Modified: trunk/prototypes/java/src/org/openlcb/messages/TractionControlRequestMessage.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/messages/TractionControlRequestMessage.java 2016-01-01 20:05:59 UTC (rev 3961)
+++ trunk/prototypes/java/src/org/openlcb/messages/TractionControlRequestMessage.java 2016-01-01 20:06:18 UTC (rev 3962)
@@ -8,6 +8,7 @@
import org.openlcb.MessageDecoder;
import org.openlcb.MessageTypeIdentifier;
import org.openlcb.NodeID;
+import org.openlcb.implementations.throttle.Float16;
/**
* Traction Control Request message implementation.
@@ -17,11 +18,103 @@
@Immutable
@ThreadSafe
public class TractionControlRequestMessage extends AddressedPayloadMessage {
+ public final static byte CMD_SET_SPEED = 0x00;
+ public final static byte CMD_SET_FN = 0x01;
+ public final static byte CMD_ESTOP = 0x02;
+ public final static byte CMD_GET_SPEED = 0x10;
+ public final static byte CMD_GET_FN = 0x11;
+
+ public final static byte CMD_CONTROLLER = 0x20;
+ public final static byte SUBCMD_CONTROLLER_ASSIGN = 1;
+ public final static byte SUBCMD_CONTROLLER_RELEASE = 2;
+ public final static byte SUBCMD_CONTROLLER_QUERY = 3;
+ public final static byte SUBCMD_CONTROLLER_CHANGE = 4;
+
+ public final static byte CMD_CONSIST = 0x30;
+ public final static byte SUBCMD_CONSIST_ATTACH = 1;
+ public final static byte SUBCMD_CONSIST_DETACH = 2;
+ public final static byte SUBCMD_CONSIST_QUERY = 3;
+
+ public final static byte CMD_MGMT = 0x20;
+ public final static byte SUBCMD_MGMT_RESERVE = 1;
+ public final static byte SUBCMD_MGMT_RELEASE = 2;
+
+
public TractionControlRequestMessage(NodeID source, NodeID dest, byte[] payload) {
super(source, dest, payload);
this.payload = payload.clone();
}
+ static TractionControlRequestMessage createSetSpeed(NodeID source, NodeID dest, boolean
+ isForward, double speed) {
+ if (isForward) {
+ if (speed < 0) speed = -speed;
+ } else {
+ if (speed >= 0) speed = -speed;
+ }
+ Float16 sp = new Float16(speed);
+ byte[] payload = new byte[]{CMD_SET_SPEED, sp.getByte1(), sp.getByte2()};
+ return new TractionControlRequestMessage(source, dest, payload);
+ }
+
+ static TractionControlRequestMessage createGetSpeed(NodeID source, NodeID dest) {
+ return new TractionControlRequestMessage(source, dest, new byte[]{CMD_GET_SPEED});
+ }
+
+ static TractionControlRequestMessage createSetFn(NodeID source, NodeID dest, int fn, int val) {
+ byte[] payload = new byte[]{CMD_SET_FN, (byte) ((fn >> 16) & 0xff), (byte) ((fn >> 8) &
+ 0xff), (byte) (fn & 0xff), (byte) ((val >> 8) & 0xff), (byte) (val & 0xff)};
+ return new TractionControlRequestMessage(source, dest, payload);
+ }
+
+ static TractionControlRequestMessage createGetFn(NodeID source, NodeID dest, int fn) {
+ byte[] payload = new byte[]{CMD_GET_FN, (byte) ((fn >> 16) & 0xff), (byte) ((fn >> 8) &
+ 0xff), (byte) (fn & 0xff)};
+ return new TractionControlRequestMessage(source, dest, payload);
+ }
+
+ // Assigns the 'source' as controller id.
+ static TractionControlRequestMessage createAssignController(NodeID source, NodeID dest) {
+ byte[] payload = new byte[]{CMD_CONTROLLER, SUBCMD_CONTROLLER_ASSIGN, 0, 1, 2, 3, 4, 5, 6};
+ System.arraycopy(source.getContents(), 0, payload, 3, 6);
+ return new TractionControlRequestMessage(source, dest, payload);
+ }
+
+ // Releases the controller, filling source as the controlling id.
+ static TractionControlRequestMessage createReleaseController(NodeID source, NodeID dest) {
+ byte[] payload = new byte[]{CMD_CONTROLLER, SUBCMD_CONTROLLER_RELEASE, 0, 1, 2, 3, 4, 5, 6};
+ System.arraycopy(source.getContents(), 0, payload, 3, 6);
+ return new TractionControlRequestMessage(source, dest, payload);
+ }
+
+ // Releases the controller, filling source as the controlling id.
+ static TractionControlRequestMessage createQueryController(NodeID source, NodeID dest) {
+ byte[] payload = new byte[]{CMD_CONTROLLER, SUBCMD_CONTROLLER_QUERY};
+ return new TractionControlRequestMessage(source, dest, payload);
+ }
+
+ // Releases the controller, filling source as the controlling id.
+ static TractionControlRequestMessage createControllerChangeNotify(NodeID source, NodeID dest,
+ NodeID new_controller) {
+ byte[] payload = new byte[]{CMD_CONTROLLER, SUBCMD_CONTROLLER_CHANGE, 0, 1, 2, 3, 4, 5, 6};
+ System.arraycopy(new_controller.getContents(), 0, payload, 3, 6);
+ return new TractionControlRequestMessage(source, dest, payload);
+ }
+
+ public byte getCmd() throws ArrayIndexOutOfBoundsException {
+ return payload[0];
+ }
+
+ // Valid for messages that contain a subcommand.
+ public byte getSubCmd() throws ArrayIndexOutOfBoundsException {
+ return payload[1];
+ }
+
+ // Valid for SetSpeed message
+ public Float16 getSpeed() throws ArrayIndexOutOfBoundsException {
+ return new Float16((((int)payload[1]) << 8) | (payload[2] & 0xff));
+ }
+
@Override
public void applyTo(MessageDecoder decoder, Connection sender) {
decoder.handleTractionControlRequest(this, sender);
Modified: trunk/prototypes/java/test/org/openlcb/PackageTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/PackageTest.java 2016-01-01 20:05:59 UTC (rev 3961)
+++ trunk/prototypes/java/test/org/openlcb/PackageTest.java 2016-01-01 20:06:18 UTC (rev 3962)
@@ -81,6 +81,7 @@
// test implementation classes
suite.addTest(org.openlcb.implementations.PackageTest.suite());
+ suite.addTest(org.openlcb.messages.PackageTest.suite());
suite.addTest(org.openlcb.swing.PackageTest.suite());
suite.addTest(org.openlcb.cdi.PackageTest.suite());
Added: trunk/prototypes/java/test/org/openlcb/messages/PackageTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/messages/PackageTest.java (rev 0)
+++ trunk/prototypes/java/test/org/openlcb/messages/PackageTest.java 2016-01-01 20:06:18 UTC (rev 3962)
@@ -0,0 +1,48 @@
+package org.openlcb.messages;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.openlcb.implementations.BlueGoldEngineTest;
+import org.openlcb.implementations.DatagramMeteringBufferTest;
+import org.openlcb.implementations.DatagramReceiverTest;
+import org.openlcb.implementations.DatagramServiceTest;
+import org.openlcb.implementations.DatagramTransmitterTest;
+import org.openlcb.implementations.EventFilterGatewayTest;
+import org.openlcb.implementations.MemoryConfigurationServiceTest;
+import org.openlcb.implementations.ScatterGatherTest;
+import org.openlcb.implementations.SingleConsumerNodeTest;
+import org.openlcb.implementations.SingleProducerNodeTest;
+import org.openlcb.implementations.StreamReceiverTest;
+import org.openlcb.implementations.StreamTransmitterTest;
+
+/**
+ * @author Bob Jacobsen Copyright 2009, 2012
+ * @version $Revision$
+ */
+public class PackageTest extends TestCase {
+ public void testStart() {
+ }
+
+ // from here down is testing infrastructure
+
+ public PackageTest(String s) {
+ super(s);
+ }
+
+ // Main entry point
+ static public void main(String[] args) {
+ String[] testCaseName = {PackageTest.class.getName()};
+ junit.swingui.TestRunner.main(testCaseName);
+ }
+
+ // test suite from all defined tests
+ public static Test suite() {
+ TestSuite suite = new TestSuite(PackageTest.class);
+
+ suite.addTest(TractionControlRequestMessageTest.suite());
+
+ return suite;
+ }
+}
Added: trunk/prototypes/java/test/org/openlcb/messages/TractionControlRequestMessageTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/messages/TractionControlRequestMessageTest.java (rev 0)
+++ trunk/prototypes/java/test/org/openlcb/messages/TractionControlRequestMessageTest.java 2016-01-01 20:06:18 UTC (rev 3962)
@@ -0,0 +1,54 @@
+package org.openlcb.messages;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.openlcb.NodeID;
+import org.openlcb.Utilities;
+import org.openlcb.implementations.throttle.Float16;
+
+/**
+ * Created by bracz on 12/30/15.
+ */
+public class TractionControlRequestMessageTest extends TestCase {
+ protected NodeID src = new NodeID(new byte[]{6,5,5,4,4,3});
+ protected NodeID dst = new NodeID(new byte[]{2,2,2,4,4,4});
+
+ public void testGetSpeed() throws Exception {
+ double speed = 13.5;
+ TractionControlRequestMessage msg = TractionControlRequestMessage.createSetSpeed(src,
+ dst, true, speed);
+ assertEquals(0, msg.getCmd());
+ Float16 sp = msg.getSpeed();
+ assertEquals(13.5, sp.getFloat(), 0.01);
+ }
+
+ public void testAssignController() throws Exception {
+ TractionControlRequestMessage msg = TractionControlRequestMessage.createAssignController
+ (src,
+ dst);
+ byte[] payload = msg.getPayload();
+ assertEquals("20 01 00 06 05 05 04 04 03", Utilities.toHexSpaceString(payload));
+ assertEquals(src, msg.getSourceNodeID());
+ assertEquals(dst, msg.getDestNodeID());
+ }
+
+ // from here down is testing infrastructure
+
+ public TractionControlRequestMessageTest(String s) {
+ super(s);
+ }
+
+ // Main entry point
+ static public void main(String[] args) {
+ String[] testCaseName = {TractionControlRequestMessageTest.class.getName()};
+ junit.swingui.TestRunner.main(testCaseName);
+ }
+
+ // test suite from all defined tests
+ public static Test suite() {
+ TestSuite suite = new TestSuite(TractionControlRequestMessageTest.class);
+ return suite;
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dph...@us...> - 2016-01-06 22:42:07
|
Revision: 3977
http://sourceforge.net/p/openlcb/svn/3977
Author: dpharris
Date: 2016-01-06 22:42:04 +0000 (Wed, 06 Jan 2016)
Log Message:
-----------
Fix Stream tests
Modified Paths:
--------------
trunk/prototypes/java/src/org/openlcb/can/MessageBuilder.java
trunk/prototypes/java/test/org/openlcb/can/MessageBuilderTest.java
trunk/prototypes/java/test/org/openlcb/implementations/StreamTransmitterTest.java
Modified: trunk/prototypes/java/src/org/openlcb/can/MessageBuilder.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/can/MessageBuilder.java 2016-01-03 13:30:08 UTC (rev 3976)
+++ trunk/prototypes/java/src/org/openlcb/can/MessageBuilder.java 2016-01-06 22:42:04 UTC (rev 3977)
@@ -252,7 +252,7 @@
retlist.add(new StreamInitiateRequestMessage(source,dest,content[2]<<8+content[3],content[4], content[5]));
return retlist;
case StreamInitiateReply:
- retlist.add(new StreamInitiateRequestMessage(source,dest,content[2]<<8+content[3],content[4], content[5]));
+ retlist.add(new StreamInitiateReplyMessage(source,dest,content[0]<<8+content[1],content[2], content[3]));
return retlist;
// case StreamData is Format 7
case StreamDataProceed:
Modified: trunk/prototypes/java/test/org/openlcb/can/MessageBuilderTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/can/MessageBuilderTest.java 2016-01-03 13:30:08 UTC (rev 3976)
+++ trunk/prototypes/java/test/org/openlcb/can/MessageBuilderTest.java 2016-01-06 22:42:04 UTC (rev 3977)
@@ -574,17 +574,17 @@
Assert.assertEquals("source", source, msg.getSourceNodeID());
Assert.assertEquals("destination", high, ((StreamInitiateRequestMessage)msg).getDestNodeID());
- Assert.assertEquals("max buffer ",6,f.getElement(0));
- Assert.assertEquals("flags ",0,f.getElement(1));
- Assert.assertEquals("sourceStreamID ",4,f.getElement(2));
+ Assert.assertEquals("max buffer ",6,(f.getElement(2)<<8)+f.getElement(3));
+ Assert.assertEquals("flags ",0,(f.getElement(4)<<8)+f.getElement(5));
+ Assert.assertEquals("sourceStreamID ",4,f.getElement(6));
}
public void testStreamInitiateReplyMessage() {
NodeID high = new NodeID(new byte[]{11,12,13,14,15,16});
map.insert(0x0FFF, high);
OpenLcbCanFrame f = new OpenLcbCanFrame(0x123);
f.setHeader(0x19868123);
- // dest(2), flags(2),sourceStream, destinationStream
- f.setData(new byte[]{(byte)0x0F, (byte)0xFF, 0, 0, 4, 6});
+ // dest(2), bufferesize(2), flags(2),sourceStream, destinationStream
+ f.setData(new byte[]{(byte)0x0F, (byte)0xFF, 0, 64, 0, 0, 4, 6});
MessageBuilder b = new MessageBuilder(map);
@@ -594,14 +594,15 @@
Message msg = list.get(0);
Assert.assertTrue(msg instanceof StreamInitiateReplyMessage);
- int[] data = ((DatagramMessage)msg).getData();
+ //int[] data = ((DatagramMessage)msg).getData();
Assert.assertEquals("source", source, msg.getSourceNodeID());
Assert.assertEquals("destination", high, ((StreamInitiateReplyMessage)msg).getDestNodeID());
- Assert.assertEquals("max buffer ",64,data[2]<<8+data[3]);
- Assert.assertEquals("flags ",0,data[4]<<8+data[5]);
- Assert.assertEquals("sourceStreamID ",4,data[6]);
- Assert.assertEquals("destinationStreamID ",6,data[7]);
+ Assert.assertEquals("max buffer ",64,(f.getElement(2)<<8)+f.getElement(3));
+ Assert.assertEquals("flags ",0,(f.getElement(4)<<8)+f.getElement(5));
+ Assert.assertEquals("sourceStreamID ",4,f.getElement(6));
+ Assert.assertEquals("destinationStreamID ",6,f.getElement(7));
}
+/*
public void testTwoStreamData() {
OpenLcbCanFrame frame = new OpenLcbCanFrame(0x123);
frame.setHeader(0x1F321123);
@@ -635,6 +636,7 @@
Assert.assertEquals(14,data[8]);
Assert.assertEquals(15,data[9]);
}
+ */
public void testStreamDataProceedMessage() {
NodeID high = new NodeID(new byte[]{11,12,13,14,15,16});
map.insert(0x0FFF, high);
@@ -651,12 +653,11 @@
Message msg = list.get(0);
Assert.assertTrue(msg instanceof StreamDataProceedMessage);
- int[] data = ((DatagramMessage)msg).getData();
Assert.assertEquals("source", source, msg.getSourceNodeID());
Assert.assertEquals("destination", high, ((StreamDataProceedMessage)msg).getDestNodeID());
- Assert.assertEquals("sourceStreamID ",data[2],4);
- Assert.assertEquals("destinationStreamID ",data[3],6);
- Assert.assertEquals("flags ",data[4]<<8+data[5],0);
+ Assert.assertEquals("sourceStreamID ",frame.getElement(2),4);
+ Assert.assertEquals("destinationStreamID ",frame.getElement(3),6);
+ Assert.assertEquals("flags ",(frame.getElement(4)<<8)+frame.getElement(5),0);
}
public void testStreamDataCompleteMessage() {
NodeID high = new NodeID(new byte[]{11,12,13,14,15,16});
@@ -674,12 +675,11 @@
Message msg = list.get(0);
Assert.assertTrue(msg instanceof StreamDataCompleteMessage);
- int[] data = ((DatagramMessage)msg).getData();
Assert.assertEquals("source", source, msg.getSourceNodeID());
Assert.assertEquals("destination", high, ((StreamDataCompleteMessage)msg).getDestNodeID());
- Assert.assertEquals("sourceStreamID ",data[2],4);
- Assert.assertEquals("destinationStreamID ",data[3],6);
- Assert.assertEquals("flags ",data[4]<<8+data[5],0);
+ Assert.assertEquals("sourceStreamID ",frame.getElement(2),4);
+ Assert.assertEquals("destinationStreamID ",frame.getElement(3),6);
+ Assert.assertEquals("flags ",(frame.getElement(4)<<8)+frame.getElement(5),0);
}
Modified: trunk/prototypes/java/test/org/openlcb/implementations/StreamTransmitterTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/StreamTransmitterTest.java 2016-01-03 13:30:08 UTC (rev 3976)
+++ trunk/prototypes/java/test/org/openlcb/implementations/StreamTransmitterTest.java 2016-01-06 22:42:04 UTC (rev 3977)
@@ -34,7 +34,7 @@
Assert.assertTrue(messagesReceived.size() == 1); // startup message
Assert.assertTrue(messagesReceived.get(0)
- .equals(new StreamInitiateRequestMessage(hereID, farID, 64, (byte)0, (byte)0)));
+ .equals(new StreamInitiateRequestMessage(hereID, farID, 64, (byte)4, (byte)0)));
}
public void testShortStream() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2016-01-09 04:06:56
|
Revision: 3986
http://sourceforge.net/p/openlcb/svn/3986
Author: bracz
Date: 2016-01-09 04:06:53 +0000 (Sat, 09 Jan 2016)
Log Message:
-----------
Adds differentiation of various producer identified and consumer identified messages by the Event State.
Updates unit tests as well.
Modified Paths:
--------------
trunk/prototypes/java/src/org/openlcb/ConsumerIdentifiedMessage.java
trunk/prototypes/java/src/org/openlcb/ProducerIdentifiedMessage.java
trunk/prototypes/java/src/org/openlcb/can/MessageBuilder.java
trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java
trunk/prototypes/java/src/org/openlcb/implementations/SingleConsumerNode.java
trunk/prototypes/java/src/org/openlcb/implementations/SingleProducerNode.java
trunk/prototypes/java/test/org/openlcb/ConsumerIdentifiedMessageTest.java
trunk/prototypes/java/test/org/openlcb/MimicNodeStoreTest.java
trunk/prototypes/java/test/org/openlcb/ProducerIdentifiedMessageTest.java
trunk/prototypes/java/test/org/openlcb/implementations/EventFilterGatewayTest.java
trunk/prototypes/java/test/org/openlcb/implementations/SingleConsumerNodeTest.java
trunk/prototypes/java/test/org/openlcb/implementations/SingleProducerNodeTest.java
trunk/prototypes/java/test/org/openlcb/implementations/throttle/RemoteTrainNodeCacheTest.java
trunk/prototypes/java/test/org/openlcb/swing/networktree/TreePaneTest.java
Added Paths:
-----------
trunk/prototypes/java/src/org/openlcb/EventState.java
Modified: trunk/prototypes/java/src/org/openlcb/ConsumerIdentifiedMessage.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/ConsumerIdentifiedMessage.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/src/org/openlcb/ConsumerIdentifiedMessage.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -14,21 +14,25 @@
@ThreadSafe
public class ConsumerIdentifiedMessage extends Message {
- public ConsumerIdentifiedMessage(NodeID source, EventID eventID) {
+ public ConsumerIdentifiedMessage(NodeID source, EventID eventID, EventState eventState) {
super(source);
if (eventID == null)
throw new IllegalArgumentException("EventID cannot be null");
this.eventID = eventID;
+ this.eventState = eventState;
}
@SuppressWarnings("JCIP_FIELD_ISNT_FINAL_IN_IMMUTABLE_CLASS")
EventID eventID;
+ private final EventState eventState;
// because EventID is immutable, can directly return object
public EventID getEventID() {
return eventID;
}
-
+
+ public EventState getEventState() { return eventState; }
+
/**
* Implement message-type-specific
* processing when this message
@@ -58,8 +62,7 @@
@Override
public String toString() {
- return super.toString()
- +" Consumer Identified for "+eventID.toString();
+ return super.toString() + " Consumer Identified " + eventState.toString() + " for "+eventID.toString();
}
public int getMTI() { return MTI_CONSUMER_IDENTIFIED; }
Added: trunk/prototypes/java/src/org/openlcb/EventState.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/EventState.java (rev 0)
+++ trunk/prototypes/java/src/org/openlcb/EventState.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -0,0 +1,43 @@
+package org.openlcb;
+
+/**
+ * Created by bracz on 1/6/16.
+ */
+public enum EventState {
+ Valid (0),
+ Invalid (1),
+ Unknown (3),
+ Reserved (2);
+
+ private final int modifier;
+
+ EventState(int modifier) {
+ this.modifier = modifier;
+ }
+
+ public int getModifier() {
+ return modifier;
+ }
+
+ public MessageTypeIdentifier getProducerIdentifierMti() {
+ int rawMti = MessageTypeIdentifier.ProducerIdentifiedValid.mti();
+ rawMti &= ~3;
+ rawMti |= modifier;
+ return MessageTypeIdentifier.get(rawMti);
+ }
+
+ public MessageTypeIdentifier getConsumerIdentifierMti() {
+ int rawMti = MessageTypeIdentifier.ConsumerIdentifiedValid.mti();
+ rawMti &= ~3;
+ rawMti |= modifier;
+ return MessageTypeIdentifier.get(rawMti);
+ }
+
+ public EventState inverted() {
+ switch(this) {
+ case Valid: return Invalid;
+ case Invalid: return Valid;
+ default: return this;
+ }
+ }
+}
Modified: trunk/prototypes/java/src/org/openlcb/ProducerIdentifiedMessage.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/ProducerIdentifiedMessage.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/src/org/openlcb/ProducerIdentifiedMessage.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -13,21 +13,25 @@
@Immutable
@ThreadSafe
public class ProducerIdentifiedMessage extends Message {
-
- public ProducerIdentifiedMessage(NodeID source, EventID eventID) {
+
+ public ProducerIdentifiedMessage(NodeID source, EventID eventID, EventState eventState) {
super(source);
if (eventID == null)
throw new IllegalArgumentException("EventID cannot be null");
this.eventID = eventID;
+ this.eventState = eventState;
}
- EventID eventID;
+ private final EventID eventID;
+ private final EventState eventState;
// because EventID is immutable, can directly return object
public EventID getEventID() {
return eventID;
}
-
+
+ public EventState getEventState() { return eventState; }
+
/**
* Implement message-type-specific
* processing when this message
@@ -43,12 +47,12 @@
public boolean equals(Object o) {
if (!super.equals(o)) return false;
ProducerIdentifiedMessage p = (ProducerIdentifiedMessage) o;
- return eventID.equals(p.eventID);
+ if (!eventID.equals(p.eventID)) return false;
+ return eventState == p.eventState;
}
public String toString() {
- return super.toString()
- +" Producer Identified for "+eventID.toString();
+ return super.toString() + " Producer Identified " + eventState.toString() + " for " + eventID.toString();
}
public int getMTI() { return MTI_PRODUCER_IDENTIFIED; }
Modified: trunk/prototypes/java/src/org/openlcb/can/MessageBuilder.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/can/MessageBuilder.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/src/org/openlcb/can/MessageBuilder.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -214,18 +214,26 @@
retlist.add(new IdentifyConsumersMessage(source, getEventID(f)));
return retlist;
case ConsumerIdentifiedUnknown:
- case ConsumerIdentifiedValid:
- case ConsumerIdentifiedInvalid:
- retlist.add(new ConsumerIdentifiedMessage(source, getEventID(f)));
+ retlist.add(new ConsumerIdentifiedMessage(source, getEventID(f), EventState.Unknown));
return retlist;
+ case ConsumerIdentifiedValid:
+ retlist.add(new ConsumerIdentifiedMessage(source, getEventID(f), EventState.Valid));
+ return retlist;
+ case ConsumerIdentifiedInvalid:
+ retlist.add(new ConsumerIdentifiedMessage(source, getEventID(f), EventState.Invalid));
+ return retlist;
case IdentifyProducer:
retlist.add(new IdentifyProducersMessage(source, getEventID(f)));
return retlist;
- case ProducerIdentifiedUnknown:
- case ProducerIdentifiedValid:
- case ProducerIdentifiedInvalid:
- retlist.add(new ProducerIdentifiedMessage(source, getEventID(f)));
+ case ProducerIdentifiedUnknown:
+ retlist.add(new ProducerIdentifiedMessage(source, getEventID(f), EventState.Unknown));
return retlist;
+ case ProducerIdentifiedValid:
+ retlist.add(new ProducerIdentifiedMessage(source, getEventID(f), EventState.Valid));
+ return retlist;
+ case ProducerIdentifiedInvalid:
+ retlist.add(new ProducerIdentifiedMessage(source, getEventID(f), EventState.Invalid));
+ return retlist;
case ProducerConsumerEventReport:
retlist.add(new ProducerConsumerEventReportMessage(source, getEventID(f)));
return retlist;
Modified: trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -1,8 +1,11 @@
package org.openlcb.implementations;
-import org.openlcb.AbstractConnection;
import org.openlcb.Connection;
+import org.openlcb.ConsumerIdentifiedMessage;
import org.openlcb.EventID;
+import org.openlcb.EventState;
+import org.openlcb.IdentifyConsumersMessage;
+import org.openlcb.IdentifyProducersMessage;
import org.openlcb.Message;
import org.openlcb.MessageDecoder;
import org.openlcb.OlcbInterface;
@@ -10,13 +13,14 @@
/**
* Maintains a bit represented by two event IDs: one off, one on.
- *
+ * <p/>
* Created by bracz on 1/6/16.
*/
public class BitProducerConsumer extends MessageDecoder {
private final EventID eventOn;
private final EventID eventOff;
private final OlcbInterface iface;
+ private VersionedValue<Boolean> value = null;
public BitProducerConsumer(OlcbInterface iface, EventID eventOn, EventID eventOff) {
this.iface = iface;
@@ -31,12 +35,36 @@
});
}
+ private EventState getOnEventState() {
+ if (value == null) return EventState.Unknown;
+ if (value.getLatestData()) return EventState.Valid;
+ return EventState.Invalid;
+ }
+
+ private EventState getOffEventState() {
+ return getOnEventState().inverted();
+ }
+
private void sendIdentifiedMessages(boolean queryState) {
Message msg;
- msg = new ProducerIdentifiedMessage(iface.getNodeId(), eventOn);
-
+ msg = new ProducerIdentifiedMessage(iface.getNodeId(), eventOn, getOnEventState());
+ iface.getOutputConnection().put(msg, this);
+ msg = new ProducerIdentifiedMessage(iface.getNodeId(), eventOff, getOffEventState());
+ iface.getOutputConnection().put(msg, this);
+ msg = new ConsumerIdentifiedMessage(iface.getNodeId(), eventOn, getOnEventState());
+ iface.getOutputConnection().put(msg, this);
+ msg = new ConsumerIdentifiedMessage(iface.getNodeId(), eventOff, getOffEventState());
+ iface.getOutputConnection().put(msg, this);
+ if (queryState) {
+ msg = new IdentifyProducersMessage(iface.getNodeId(), eventOn);
+ iface.getOutputConnection().put(msg, this);
+ msg = new IdentifyConsumersMessage(iface.getNodeId(), eventOn);
+ iface.getOutputConnection().put(msg, this);
+ }
}
+
+
public void release() {
iface.unRegisterMessageListener(this);
}
Modified: trunk/prototypes/java/src/org/openlcb/implementations/SingleConsumerNode.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/SingleConsumerNode.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/src/org/openlcb/implementations/SingleConsumerNode.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -34,7 +34,7 @@
public void initialize() {
super.initialize();
// announce which event is being sent
- connection.put(new ConsumerIdentifiedMessage(nodeID, eventID), this);
+ connection.put(new ConsumerIdentifiedMessage(nodeID, eventID, EventState.Unknown), this);
}
/**
Modified: trunk/prototypes/java/src/org/openlcb/implementations/SingleProducerNode.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/SingleProducerNode.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/src/org/openlcb/implementations/SingleProducerNode.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -30,7 +30,7 @@
public void initialize() {
super.initialize();
// announce which event is being sent
- connection.put(new ProducerIdentifiedMessage(nodeID, eventID), this);
+ connection.put(new ProducerIdentifiedMessage(nodeID, eventID, EventState.Unknown), this);
}
/**
Modified: trunk/prototypes/java/test/org/openlcb/ConsumerIdentifiedMessageTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/ConsumerIdentifiedMessageTest.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/test/org/openlcb/ConsumerIdentifiedMessageTest.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -20,32 +20,40 @@
public void testEqualsSame() {
Message m1 = new ConsumerIdentifiedMessage(
- nodeID1, eventID1 );
+ nodeID1, eventID1, EventState.Valid);
Message m2 = new ConsumerIdentifiedMessage(
- nodeID1, eventID1 );
+ nodeID1, eventID1, EventState.Valid);
Assert.assertTrue(m1.equals(m2));
}
public void testNotEqualsDifferentNode() {
Message m1 = new ConsumerIdentifiedMessage(
- nodeID1, eventID1 );
+ nodeID1, eventID1, EventState.Valid);
Message m2 = new ConsumerIdentifiedMessage(
- nodeID2, eventID1 );
+ nodeID2, eventID1, EventState.Valid);
Assert.assertTrue( ! m1.equals(m2));
}
public void testNotEqualsDifferentEvent() {
Message m1 = new ConsumerIdentifiedMessage(
- nodeID1, eventID1 );
+ nodeID1, eventID1, EventState.Valid);
Message m2 = new ConsumerIdentifiedMessage(
- nodeID1, eventID2 );
+ nodeID1, eventID2, EventState.Valid);
Assert.assertTrue( ! m1.equals(m2));
}
+ public void testNotEqualsDifferentState() {
+ Message m1 = new ConsumerIdentifiedMessage(
+ nodeID1, eventID1, EventState.Valid);
+ Message m2 = new ConsumerIdentifiedMessage(
+ nodeID1, eventID2, EventState.Unknown);
+ Assert.assertTrue( ! m1.equals(m2));
+ }
+
public void testHandling() {
result = false;
Node n = new Node(){
@@ -56,7 +64,7 @@
};
Message m = new ConsumerIdentifiedMessage(
new NodeID(new byte[]{1,2,3,4,5,6}),
- eventID1 );
+ eventID1, EventState.Unknown);
n.put(m, null);
Modified: trunk/prototypes/java/test/org/openlcb/MimicNodeStoreTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/MimicNodeStoreTest.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/test/org/openlcb/MimicNodeStoreTest.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -19,10 +19,10 @@
NodeID nid2 = new NodeID(new byte[]{2,3,3,4,5,6});
ProducerIdentifiedMessage pim1 = new ProducerIdentifiedMessage(nid1,
- new EventID(new byte[]{1,0,0,0,0,0,1,0}));
+ new EventID(new byte[]{1,0,0,0,0,0,1,0}), EventState.Unknown);
ProducerIdentifiedMessage pim2 = new ProducerIdentifiedMessage(nid2,
- new EventID(new byte[]{1,0,0,0,0,0,1,0}));
+ new EventID(new byte[]{1,0,0,0,0,0,1,0}), EventState.Unknown);
SimpleNodeIdentInfoReplyMessage snii1 = new SimpleNodeIdentInfoReplyMessage(nid1, nid2,
new byte[]{1,'a','b','c'});
Modified: trunk/prototypes/java/test/org/openlcb/ProducerIdentifiedMessageTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/ProducerIdentifiedMessageTest.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/test/org/openlcb/ProducerIdentifiedMessageTest.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -20,32 +20,40 @@
public void testEqualsSame() {
Message m1 = new ProducerIdentifiedMessage(
- nodeID1, eventID1 );
+ nodeID1, eventID1, EventState.Valid);
Message m2 = new ProducerIdentifiedMessage(
- nodeID1, eventID1 );
+ nodeID1, eventID1, EventState.Valid);
Assert.assertTrue(m1.equals(m2));
}
public void testNotEqualsDifferentNode() {
Message m1 = new ProducerIdentifiedMessage(
- nodeID1, eventID1 );
+ nodeID1, eventID1, EventState.Valid );
Message m2 = new ProducerIdentifiedMessage(
- nodeID2, eventID1 );
+ nodeID2, eventID1, EventState.Valid );
Assert.assertTrue( ! m1.equals(m2));
}
public void testNotEqualsDifferentEvent() {
Message m1 = new ProducerIdentifiedMessage(
- nodeID1, eventID1 );
+ nodeID1, eventID1, EventState.Valid );
Message m2 = new ProducerIdentifiedMessage(
- nodeID1, eventID2 );
+ nodeID1, eventID2, EventState.Valid );
Assert.assertTrue( ! m1.equals(m2));
}
+ public void testNotEqualsDifferentState() {
+ Message m1 = new ProducerIdentifiedMessage(
+ nodeID1, eventID1, EventState.Valid );
+ Message m2 = new ProducerIdentifiedMessage(
+ nodeID1, eventID1, EventState.Unknown );
+ Assert.assertTrue( ! m1.equals(m2));
+ }
+
public void testHandling() {
result = false;
Node n = new Node(){
@@ -54,7 +62,7 @@
result = true;
}
};
- Message m = new ProducerIdentifiedMessage(nodeID1, eventID1);
+ Message m = new ProducerIdentifiedMessage(nodeID1, eventID1, EventState.Valid);
n.put(m, null);
Modified: trunk/prototypes/java/test/org/openlcb/implementations/EventFilterGatewayTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/EventFilterGatewayTest.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/test/org/openlcb/implementations/EventFilterGatewayTest.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -54,7 +54,7 @@
public void testReqEventPassesEtoW() {
buildGateway();
- Message m1 = new ConsumerIdentifiedMessage(node2, eventA);
+ Message m1 = new ConsumerIdentifiedMessage(node2, eventA, EventState.Unknown);
cW.put(m1, tW);
checkMovedWestToEastOnly();
@@ -66,7 +66,7 @@
public void testReqEventPassesWtoE() {
buildGateway();
- Message m1 = new ConsumerIdentifiedMessage(node2, eventA);
+ Message m1 = new ConsumerIdentifiedMessage(node2, eventA, EventState.Unknown);
cE.put(m1, tE);
checkMovedEastToWestOnly();
Modified: trunk/prototypes/java/test/org/openlcb/implementations/SingleConsumerNodeTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/SingleConsumerNodeTest.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/test/org/openlcb/implementations/SingleConsumerNodeTest.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -41,7 +41,7 @@
Assert.assertTrue(messagesReceived.get(0)
.equals(new InitializationCompleteMessage(nodeID)));
Assert.assertTrue(messagesReceived.get(1)
- .equals(new ConsumerIdentifiedMessage(nodeID, eventID)));
+ .equals(new ConsumerIdentifiedMessage(nodeID, eventID, EventState.Unknown)));
}
public void testConsumeRight() {
Modified: trunk/prototypes/java/test/org/openlcb/implementations/SingleProducerNodeTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/SingleProducerNodeTest.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/test/org/openlcb/implementations/SingleProducerNodeTest.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -39,7 +39,7 @@
Assert.assertTrue(messagesReceived.get(0)
.equals(new InitializationCompleteMessage(nodeID)));
Assert.assertTrue(messagesReceived.get(1)
- .equals(new ProducerIdentifiedMessage(nodeID, eventID)));
+ .equals(new ProducerIdentifiedMessage(nodeID, eventID, EventState.Unknown)));
}
public void testSend() {
@@ -60,7 +60,7 @@
Assert.assertTrue(messagesReceived.get(0)
.equals(new InitializationCompleteMessage(nodeID)));
Assert.assertTrue(messagesReceived.get(1)
- .equals(new ProducerIdentifiedMessage(nodeID, eventID)));
+ .equals(new ProducerIdentifiedMessage(nodeID, eventID, EventState.Unknown)));
node.send();
Assert.assertTrue(messagesReceived.get(2)
.equals(new ProducerConsumerEventReportMessage(nodeID, eventID)));
Modified: trunk/prototypes/java/test/org/openlcb/implementations/throttle/RemoteTrainNodeCacheTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/throttle/RemoteTrainNodeCacheTest.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/test/org/openlcb/implementations/throttle/RemoteTrainNodeCacheTest.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -7,6 +7,7 @@
import org.openlcb.CommonIdentifiers;
import org.openlcb.EventID;
+import org.openlcb.EventState;
import org.openlcb.FakeOlcbInterface;
import org.openlcb.Message;
import org.openlcb.NodeID;
@@ -90,13 +91,13 @@
Assert.assertEquals(1, cache.getList().size());
m = new ProducerIdentifiedMessage(new NodeID(new byte[]{1, 1, 0, 0, 4, 4}),
- CommonIdentifiers.IS_TRAIN);
+ CommonIdentifiers.IS_TRAIN, EventState.Unknown);
cache.put(m, null);
Assert.assertEquals(1, cache.getList().size());
m = new ProducerIdentifiedMessage(new NodeID(new byte[]{1, 1, 0, 0, 4, 5}), new EventID
- ("01.01.00.00.00.00.03.03"));
+ ("01.01.00.00.00.00.03.03"), EventState.Unknown);
cache.put(m, null);
Assert.assertEquals(2, cache.getList().size());
Modified: trunk/prototypes/java/test/org/openlcb/swing/networktree/TreePaneTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/swing/networktree/TreePaneTest.java 2016-01-09 04:06:32 UTC (rev 3985)
+++ trunk/prototypes/java/test/org/openlcb/swing/networktree/TreePaneTest.java 2016-01-09 04:06:53 UTC (rev 3986)
@@ -52,7 +52,7 @@
public void setUp() throws Exception {
store = new MimicNodeStore(connection, nid1);
- Message msg = new ProducerIdentifiedMessage(nid1, eventA);
+ Message msg = new ProducerIdentifiedMessage(nid1, eventA, EventState.Unknown);
store.put(msg, null);
// Test is really popping a window before doing all else
@@ -87,14 +87,14 @@
public void testAfterMessage() {
frame.setTitle("After Message");
- Message msg = new ProducerIdentifiedMessage(nid2, eventA);
+ Message msg = new ProducerIdentifiedMessage(nid2, eventA, EventState.Unknown);
store.put(msg, null);
}
public void testWithProtocolID() {
frame.setTitle("2nd has protocol id");
Message msg;
- msg = new ProducerIdentifiedMessage(nid2, eventA);
+ msg = new ProducerIdentifiedMessage(nid2, eventA, EventState.Unknown);
store.put(msg, null);
store.put(pipmsg, null);
}
@@ -102,7 +102,7 @@
public void testWith1stSNII() {
frame.setTitle("3rd has PIP && 1st SNII");
Message msg;
- msg = new ProducerIdentifiedMessage(nid2, eventA);
+ msg = new ProducerIdentifiedMessage(nid2, eventA, EventState.Unknown);
store.put(msg, null);
store.put(pipmsg, null);
@@ -132,7 +132,7 @@
}
});
Message msg;
- msg = new ProducerIdentifiedMessage(nid2, eventA);
+ msg = new ProducerIdentifiedMessage(nid2, eventA, EventState.Unknown);
store.put(msg, null);
store.put(pipmsg, null);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2016-01-09 04:07:31
|
Revision: 3988
http://sourceforge.net/p/openlcb/svn/3988
Author: bracz
Date: 2016-01-09 04:07:29 +0000 (Sat, 09 Jan 2016)
Log Message:
-----------
Adds a gridconnect parser, formatter to the CAN package and tests for them.
Modified Paths:
--------------
trunk/prototypes/java/test/org/openlcb/can/PackageTest.java
Added Paths:
-----------
trunk/prototypes/java/src/org/openlcb/can/GridConnect.java
trunk/prototypes/java/test/org/openlcb/can/GridConnectTest.java
Added: trunk/prototypes/java/src/org/openlcb/can/GridConnect.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/can/GridConnect.java (rev 0)
+++ trunk/prototypes/java/src/org/openlcb/can/GridConnect.java 2016-01-09 04:07:29 UTC (rev 3988)
@@ -0,0 +1,230 @@
+package org.openlcb.can;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+/**
+ * Created by bracz on 1/8/16.
+ */
+public class GridConnect {
+ private static Logger logger = Logger.getLogger(new Object() {
+ }.getClass().getSuperclass()
+ .getName());
+
+ public static String format(CanFrame frame) {
+ StringBuilder b = new StringBuilder();
+ if (frame.isExtended()) {
+ b.append(String.format(":X%08X", frame.getHeader()));
+ } else {
+ b.append(String.format(":S%03X", frame.getHeader()));
+ }
+ if (frame.isRtr()) {
+ b.append('R');
+ } else {
+ b.append('N');
+ }
+ if (frame.getNumDataElements() > 8) {
+ logger.warning("Output frame with too many data elements: " + Integer.toString(frame
+ .getNumDataElements()));
+ }
+ for (int i = 0; i < frame.getNumDataElements(); ++i) {
+ b.append(String.format("%02X", frame.getElement(i) & 0xff));
+ }
+ b.append(';');
+ return b.toString();
+ }
+
+ public static List<CanFrame> parse(String data) {
+ final List<CanFrame> l = new ArrayList<>();
+ Input parser = new Input() {
+ @Override
+ public void onFrame(CanFrame f) {
+ l.add(f);
+ }
+ };
+ parser.send(data);
+ return l;
+ }
+
+ enum InputState {
+ NOPACKET,
+ EXTENDED,
+ HEADER,
+ REMOTE,
+ BODYHI_OR_END,
+ BODYLO
+ }
+
+ public static abstract class Input {
+ private boolean isExtended;
+ private int header;
+ private boolean isRtr;
+ private InputState state = InputState.NOPACKET;
+ private ArrayList<Byte> data = new ArrayList<>(8);
+
+ private byte currData;
+
+ public void send(String data) {
+ for (int i = 0; i < data.length(); ++i) {
+ send(data.charAt(i));
+ }
+ }
+
+ public void send(char c) {
+ while (true) {
+ switch (state) {
+ case NOPACKET: {
+ if (c == ':') {
+ state = InputState.EXTENDED;
+ }
+ return;
+ }
+ case EXTENDED: {
+ if (c == 'X') {
+ isExtended = true;
+ } else if (c == 'S') {
+ isExtended = false;
+ } else {
+ // Unknown message type character.
+ logger.fine("Unknown gridconnect type character: " + c);
+ state = InputState.NOPACKET;
+ return;
+ }
+ state = InputState.HEADER;
+ header = 0;
+ return;
+ }
+ case HEADER: {
+ int dvalue = Character.digit(c, 16);
+ if (dvalue >= 0) {
+ header <<= 4;
+ header |= dvalue;
+ return;
+ } else {
+ state = InputState.REMOTE;
+ continue;
+ }
+ }
+ case REMOTE: {
+ if (c == 'N') {
+ isRtr = false;
+ } else if (c == 'R') {
+ isRtr = true;
+ } else {
+ // Unknown message format.
+ logger.fine("Unknown gridconnect remote character: " + c);
+ state = InputState.NOPACKET;
+ continue;
+ }
+ state = InputState.BODYHI_OR_END;
+ data.clear();
+ return;
+ }
+ case BODYHI_OR_END: {
+ if (c == ';') {
+ // End of frame.
+ onFrame(new RawCanFrame(isExtended, header, isRtr, data));
+ state = InputState.NOPACKET;
+ return;
+ }
+ int dvalue = Character.digit(c, 16);
+ if (dvalue < 0) {
+ logger.fine("Unknown gridconnect data character: " + c);
+ state = InputState.NOPACKET;
+ continue;
+ }
+ currData = (byte) (dvalue << 4);
+ state = InputState.BODYLO;
+ return;
+ }
+ case BODYLO: {
+ int dvalue = Character.digit(c, 16);
+ if (dvalue < 0) {
+ logger.fine("Unknown gridconnect data character: " + c);
+ state = InputState.NOPACKET;
+ continue;
+ }
+ currData |= (dvalue & 0xf);
+ data.add(currData);
+ state = InputState.BODYHI_OR_END;
+ return;
+ }
+ }
+ }
+ }
+
+ public abstract void onFrame(CanFrame f);
+ }
+
+ static class RawCanFrame implements CanFrame {
+
+ private boolean isExtended;
+ private boolean isRtr;
+ private int header;
+ private int len;
+ private byte[] data;
+
+ public RawCanFrame(boolean isExtended, int header, boolean isRtr, ArrayList<Byte> data) {
+ this.isExtended = isExtended;
+ this.header = header;
+ this.isRtr = isRtr;
+ this.len = data.size();
+ this.data = new byte[this.len];
+ for (int i = 0; i < len; ++i) {
+ this.data[i] = data.get(i);
+ }
+ }
+
+ @Override
+ public int getHeader() {
+ return header;
+ }
+
+ @Override
+ public boolean isExtended() {
+ return this.isExtended;
+ }
+
+ @Override
+ public boolean isRtr() {
+ return this.isRtr;
+ }
+
+ @Override
+ public int getNumDataElements() {
+ return len;
+ }
+
+ @Override
+ public int getElement(int n) {
+ return data[n];
+ }
+
+ @Override
+ public long bodyAsLong() {
+ long retval = 0;
+ for (int i = 0; i < data.length; i++) {
+ retval = retval << 8 | (data[i] & 0xFF);
+ }
+ return retval;
+ }
+
+ @Override
+ public long dataAsLong() {
+ long retval = 0;
+ for (int i = 2; i < data.length; i++) {
+ retval = retval << 8 | (data[i] & 0xFF);
+ }
+ return retval;
+ }
+
+ @Override
+ public byte[] getData() {
+ byte[] b = new byte[len];
+ System.arraycopy(data, 0, b, 0, len);
+ return b;
+ }
+ }
+
+}
Added: trunk/prototypes/java/test/org/openlcb/can/GridConnectTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/can/GridConnectTest.java (rev 0)
+++ trunk/prototypes/java/test/org/openlcb/can/GridConnectTest.java 2016-01-09 04:07:29 UTC (rev 3988)
@@ -0,0 +1,56 @@
+package org.openlcb.can;
+
+import junit.framework.TestCase;
+
+import org.openlcb.Utilities;
+
+import java.util.List;
+
+/**
+ * Created by bracz on 1/8/16.
+ */
+public class GridConnectTest extends TestCase {
+
+ public void testFormat() throws Exception {
+ assertEquals(":X195B4123N01020304;", getCanonical(":X195B4123N01020304;"));
+ assertEquals(":X195B4123N;", getCanonical(":X195B4123N;"));
+ assertEquals(":X00000123N;", getCanonical(":X123N;"));
+ assertEquals(":S123NFFFEFD80;", getCanonical(":S123NFFFEFD80;"));
+ assertEquals(":X195B4123N0102030405060708;", getCanonical(":X195b4123N0102030405060708;"));
+ }
+
+ private void assertFrame(CanFrame f, int header, boolean isExtended, boolean isRtr, byte[]
+ data) {
+ assertEquals("isExtended", isExtended, f.isExtended());
+ assertEquals("isRtr", isRtr, f.isRtr());
+ assertEquals("header", header, f.getHeader());
+ assertEquals(data.length, f.getNumDataElements());
+ assertEquals(Utilities.toHexSpaceString(data), Utilities.toHexSpaceString(f.getData()));
+ for (int i = 0; i < data.length; ++i) {
+ assertEquals(data[i], f.getElement(i));
+ }
+ }
+
+ private void assertParse(String fmt, int header, boolean isExtended, boolean isRtr, byte[]
+ data) {
+ List<CanFrame> l = GridConnect.parse(fmt);
+ assertEquals(1, l.size());
+ CanFrame f = l.get(0);
+ assertFrame(f, header, isExtended, isRtr, data);
+ }
+
+ private String getCanonical(String orig) {
+ List<CanFrame> l = GridConnect.parse(orig);
+ assertEquals(1, l.size());
+ CanFrame f = l.get(0);
+ return GridConnect.format(f);
+ }
+
+ public void testParse() throws Exception {
+ assertParse(":X195B4123N01020304;", 0x195b4123, true, false, new byte[]{1, 2, 3, 4});
+ assertParse(":X195B4123N;", 0x195b4123, true, false, new byte[0]);
+ assertParse(":S121Nffffff;", 0x121, false, false, new byte[]{(byte) 255, (byte) 255,
+ (byte) 255});
+ assertParse(":S121Nffffff;", 0x121, false, false, new byte[]{-1, -1, -1});
+ }
+}
\ No newline at end of file
Modified: trunk/prototypes/java/test/org/openlcb/can/PackageTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/can/PackageTest.java 2016-01-09 04:07:11 UTC (rev 3987)
+++ trunk/prototypes/java/test/org/openlcb/can/PackageTest.java 2016-01-09 04:07:29 UTC (rev 3988)
@@ -34,6 +34,7 @@
suite.addTest(NIDaTest.suite());
suite.addTest(NIDaAlgorithmTest.suite());
suite.addTest(AliasMapTest.suite());
+ suite.addTest(new TestSuite(GridConnectTest.class));
return suite;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2016-01-09 04:07:49
|
Revision: 3989
http://sourceforge.net/p/openlcb/svn/3989
Author: bracz
Date: 2016-01-09 04:07:47 +0000 (Sat, 09 Jan 2016)
Log Message:
-----------
Finishes implementation of BitProducerConsumer and adds empty test.
Modified Paths:
--------------
trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java
Added Paths:
-----------
trunk/prototypes/java/test/org/openlcb/implementations/BitProducerConsumerTest.java
Modified: trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java 2016-01-09 04:07:29 UTC (rev 3988)
+++ trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java 2016-01-09 04:07:47 UTC (rev 3989)
@@ -5,10 +5,12 @@
import org.openlcb.EventID;
import org.openlcb.EventState;
import org.openlcb.IdentifyConsumersMessage;
+import org.openlcb.IdentifyEventsMessage;
import org.openlcb.IdentifyProducersMessage;
import org.openlcb.Message;
import org.openlcb.MessageDecoder;
import org.openlcb.OlcbInterface;
+import org.openlcb.ProducerConsumerEventReportMessage;
import org.openlcb.ProducerIdentifiedMessage;
/**
@@ -21,6 +23,7 @@
private final EventID eventOff;
private final OlcbInterface iface;
private VersionedValue<Boolean> value = null;
+ private VersionedValueListener<Boolean> valueListener = null;
public BitProducerConsumer(OlcbInterface iface, EventID eventOn, EventID eventOff) {
this.iface = iface;
@@ -45,6 +48,12 @@
return getOnEventState().inverted();
}
+ private EventState getEventState(EventID event) {
+ if (event.equals(eventOn)) return getOnEventState();
+ if (event.equals(eventOff)) return getOffEventState();
+ return null;
+ }
+
private void sendIdentifiedMessages(boolean queryState) {
Message msg;
msg = new ProducerIdentifiedMessage(iface.getNodeId(), eventOn, getOnEventState());
@@ -63,11 +72,98 @@
}
}
-
-
public void release() {
iface.unRegisterMessageListener(this);
}
+ @Override
+ public void handleIdentifyConsumers(IdentifyConsumersMessage msg, Connection sender) {
+ EventState st = getEventState(msg.getEventID());
+ if (st != null) {
+ Message m = new ConsumerIdentifiedMessage(iface.getNodeId(), msg.getEventID(), st);
+ iface.getOutputConnection().put(m, this);
+ }
+ }
+ @Override
+ public void handleIdentifyProducers(IdentifyProducersMessage msg, Connection sender) {
+ EventState st = getEventState(msg.getEventID());
+ if (st != null) {
+ Message m = new ProducerIdentifiedMessage(iface.getNodeId(), msg.getEventID(), st);
+ iface.getOutputConnection().put(m, this);
+ }
+ }
+
+ @Override
+ public void handleProducerIdentified(ProducerIdentifiedMessage msg, Connection sender) {
+ boolean isOn;
+ if (msg.getEventID().equals(eventOn)) {
+ isOn = true;
+ } else if (msg.getEventID().equals(eventOff)) {
+ isOn = false;
+ } else {
+ return;
+ }
+ if (msg.getEventState().equals(EventState.Valid)) {
+ setValueFromNetwork(isOn);
+ } else if (msg.getEventState().equals(EventState.Invalid)) {
+ setValueFromNetwork(!isOn);
+ }
+ }
+
+ @Override
+ public void handleConsumerIdentified(ConsumerIdentifiedMessage msg, Connection sender) {
+ boolean isOn;
+ if (msg.getEventID().equals(eventOn)) {
+ isOn = true;
+ } else if (msg.getEventID().equals(eventOff)) {
+ isOn = false;
+ } else {
+ return;
+ }
+ if (msg.getEventState().equals(EventState.Valid)) {
+ setValueFromNetwork(isOn);
+ } else if (msg.getEventState().equals(EventState.Invalid)) {
+ setValueFromNetwork(!isOn);
+ }
+ }
+
+ @Override
+ public void handleProducerConsumerEventReport(ProducerConsumerEventReportMessage msg,
+ Connection sender) {
+ boolean isOn;
+ if (msg.getEventID().equals(eventOn)) {
+ isOn = true;
+ } else if (msg.getEventID().equals(eventOff)) {
+ isOn = false;
+ } else {
+ return;
+ }
+ setValueFromNetwork(isOn);
+ }
+
+ @Override
+ public void handleIdentifyEvents(IdentifyEventsMessage msg, Connection sender) {
+ if (msg.getDestNodeID().equals(iface.getNodeId())) {
+ sendIdentifiedMessages(false);
+ }
+ }
+
+ private void setValueFromNetwork(boolean isOn) {
+ synchronized (this) {
+ if (value == null) {
+ value = new VersionedValue<>(isOn);
+ valueListener = new VersionedValueListener<Boolean>(value) {
+ @Override
+ public void update(Boolean newValue) {
+ Message msg = new ProducerConsumerEventReportMessage(iface.getNodeId(),
+ newValue ? eventOn : eventOff);
+ iface.getOutputConnection().put(msg, BitProducerConsumer.this);
+ }
+ };
+ return;
+ }
+ }
+ valueListener.setFromOwner(isOn);
+ }
}
Added: trunk/prototypes/java/test/org/openlcb/implementations/BitProducerConsumerTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/BitProducerConsumerTest.java (rev 0)
+++ trunk/prototypes/java/test/org/openlcb/implementations/BitProducerConsumerTest.java 2016-01-09 04:07:47 UTC (rev 3989)
@@ -0,0 +1,77 @@
+package org.openlcb.implementations;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.openlcb.AbstractConnection;
+import org.openlcb.Connection;
+import org.openlcb.EventID;
+import org.openlcb.FakeOlcbInterface;
+import org.openlcb.Message;
+
+import java.util.List;
+
+/**
+ * Created by bracz on 1/8/16.
+ */
+public class BitProducerConsumerTest extends TestCase {
+
+ public static final EventID onEvent = new EventID(new byte[]{5, 4, 3, 2, 1, 0, 7, 8});
+ public static final EventID offEvent = new EventID(new byte[]{5, 4, 3, 2, 1, 0, 7, 9});
+ FakeOlcbInterface iface = new FakeOlcbInterface();
+
+ public BitProducerConsumerTest(String s) {
+ super(s);
+ }
+
+ // Main entry point
+ static public void main(String[] args) {
+ String[] testCaseName = {BitProducerConsumerTest.class.getName()};
+ junit.swingui.TestRunner.main(testCaseName);
+ }
+
+ // test suite from all defined tests
+ public static Test suite() {
+ TestSuite suite = new TestSuite(BitProducerConsumerTest.class);
+ return suite;
+ }
+
+ public void testHandleIdentifyConsumers() throws Exception {
+
+ }
+
+ public void testHandleIdentifyProducers() throws Exception {
+
+ }
+
+ public void testHandleProducerIdentified() throws Exception {
+
+ }
+
+ public void testHandleConsumerIdentified() throws Exception {
+
+ }
+
+ public void testHandleProducerConsumerEventReport() throws Exception {
+
+ }
+
+ public void testHandleIdentifyEvents() throws Exception {
+
+ }
+
+ BitProducerConsumer pc;
+
+ private List<Message> sentMessages() {
+ return iface.fakeOutputConnection.history;
+ }
+
+ @Override
+ public void setUp() {
+ iface.fakeOutputConnection.history.clear();
+ pc = new BitProducerConsumer(iface, onEvent, offEvent);
+ assertEquals("init-size", 8, sentMessages().size());
+
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2016-01-09 04:08:11
|
Revision: 3990
http://sourceforge.net/p/openlcb/svn/3990
Author: bracz
Date: 2016-01-09 04:08:07 +0000 (Sat, 09 Jan 2016)
Log Message:
-----------
Adds mockito as test runner library dependency.
Modified Paths:
--------------
trunk/prototypes/java/build.xml
trunk/prototypes/java/lib/README
Added Paths:
-----------
trunk/prototypes/java/lib/mockito-all-1.10.19-javadoc.jar
trunk/prototypes/java/lib/mockito-all-1.10.19.jar
Modified: trunk/prototypes/java/build.xml
===================================================================
--- trunk/prototypes/java/build.xml 2016-01-09 04:07:47 UTC (rev 3989)
+++ trunk/prototypes/java/build.xml 2016-01-09 04:08:07 UTC (rev 3990)
@@ -35,6 +35,8 @@
<pathelement location="." />
<pathelement location="lib/junit.jar" />
<pathelement location="lib/xercesImpl.jar" /> <!-- only needed for tests compile and run -->
+ <pathelement location="lib/mockito-all-1.10.19-javadoc.jar" /> <!-- only needed for tests compile and run -->
+ <pathelement location="lib/mockito-all-1.10.19.jar" /> <!-- only needed for tests compile and run -->
<pathelement location="lib/jdom-2.0.5.jar" />
<pathelement location="lib/jdom.jar" />
<pathelement location="lib/jlfgr-1_0.jar" />
Modified: trunk/prototypes/java/lib/README
===================================================================
--- trunk/prototypes/java/lib/README 2016-01-09 04:07:47 UTC (rev 3989)
+++ trunk/prototypes/java/lib/README 2016-01-09 04:08:07 UTC (rev 3990)
@@ -25,4 +25,8 @@
Needed to build and run tests
version Xerces-J 2.9.1
from http://www.apache.org/dist/xerces/j/
-
\ No newline at end of file
+
+mockito-all-1.10.19.jar
+ Needed to build and run tests
+ version 1.10.19
+ downloaded from http://jcenter.bintray.com/org/mockito/mockito-core/1.10.19/
Added: trunk/prototypes/java/lib/mockito-all-1.10.19-javadoc.jar
===================================================================
--- trunk/prototypes/java/lib/mockito-all-1.10.19-javadoc.jar (rev 0)
+++ trunk/prototypes/java/lib/mockito-all-1.10.19-javadoc.jar 2016-01-09 04:08:07 UTC (rev 3990)
@@ -0,0 +1,20693 @@
+PK
++++Z\xA4mbiѐhg\xB3\x87\xFD\xEF7I\x89/\xC9ҽ\x80\xA2[\xE4p8\xEFuw\x8B\xFE\x86/\x98\x88 U\xF2\x8DST (\x95\xE8\xF6\xEE\xE6\xEE\xF6\xE6\xBB -1\xE7f\xCFGZH
+r\x93[A\xDEЏ7>[\x9Cڗ\xE2\\x90i.\xB8(\xB3w\xBB\xFA\xF3\Ϛ\xA1\xD5z\xB5Y\xAD\xF4\xD0Nr\xBA\xC3G\xC6߲?\x97 \xF3 \xFA\x86\xF2 \x95,\xC7TᢚV\xB4d;\xBAb_h\xF6\xF8\xF0=t\xC4\xE5\x9E\xD9\xFC\xF9\xE6\xEB
+\xCE8+>M\xCE.\xACb\x92C\x95\xA4\x9F\xE5\x94\xD0\\x94X2Qd\x85(\xA8G\xD1}\xFE\xB0\xDD<j\x8C* ;`\xB4\x8Aa\xBB}\xC4K\xAC1\xE0\\xB2 \xFD{\xFF\xBB\xC0G\xFA \xB30V3\xAD \x8A\xBD]~*-I\xAD\xB3=\xAA\xC9\xC3"1\xB71s\xCB\xC4\xDC\xDA̭s\xF7f\xEE\xBEg\xBFubni\xE6 s =w\xE6f\x8E\xB3
+\xE6\x94N\xE5ۉf\x84U\xB9\xC8\xA1$e7z"\x91\xEA\x90x \xA6/K$ \xBA\xACA\xCAX\xF9s\xB6/2)N
+Iu>E\x8Bfzp\xA6\xBFZ'\x92L\xC2f\xB8 \xE8E\x9C\xDEJ\xB6?Ǫ\x94g\xCDrN\xB1\xD5u\xFD;\xDB
+y\xD0 \xA8\x82\xCE\xE6\xA7\xCF\xFAY\x99Ŏ\x8B\xD7\xEC\xC0\xA1\x85\xDAi\x86\xB7\xE2,?\xE2b\xC6\xFB\x86 .\xB0\xCC\xEA\xAD\xF4\xC2&\x84{\x85 -\x9DC\xF7\xC6\xF2\xFAe\xCA
+B?g\xCB\xF9\xDC\xF5\xBE)0\x9DM \xD5Jؓ\xD3=\xE6\x8A\xB3\x9F\x81\xE1t'3k7\xB3-\xB0\xAE\xBF\x8Dۚ\xE3\xBBͳ\xE7NƬ?ԟ\xE7 \xB0{X6O\xAESG\xAE;\xD5w\xB2\xF9\xFC\xE1\xC1n\xE9̲#H6;\x97\xFC\x8F%\xADĹ\xCCiuW+\xF6\x9B\xED\xD9\xEEOъ\x93+**\x84\xF9\xE5y\xB4P\xAD\xE66Vi\xAF\x8C\xC8C\xB6\xB6\xFA\xAAu\xF8\xAA\xEDd+81\xD6\xF7-\xBE\xB0}-,\xA4\xA4\xE2\xD8۶\xB1\xB6+,\xB6\xD3i&
+ \xFAk\xFA\xF9\xB9Ky\x96ecHYR\xE1\xB5&g\xAC \x9F\xA5x\xBE\xBB5O:6\xC1\x81W\xDAEnR\x98\x81\x84\x81\xE1ߗ-\xEDcJ\xC1\x81\x8B\xB9jZ\xCC\xE7&\x89i\xD7v\\xD2\xF0\xB9l\xE5`0Ԯ\xB6\xE8\xF5y\x88R [\x96 m\xFE ȡ:o\x93z7dJW\xF4\xC9p&JB˩\x96\!U\x823\x82\xDE=QL\xF2y\x9A\x97\x90\xF8 \xBBxA\xBCE\xD2) 4Gk\xA0\xE3A\xD53\x9F\xF8\xF2\x92\xDE\xC1o\x8DV=z1\xBDEc +j篣D\xEB\xEBI\xA2d_Ԯ\x8E\xC1u_\xEF1\x9F=\xD9~X\xED\xE8\xD7\xCE\xE9u\xE0{\xB7K\xD8|\xBC\xBC\x87+\xF4}Ab\xE1\xB7#\xE4\xDE.\xAAb4\x91\xB4\xBD-\x92\x826AI0\xF0N\xCBJ\xE3\xBF\xF4ʭV\xE0n\xA9\xAB[P ro\xD0;z7\x8E\xBA\xF7\xD8\xDC\xCA\xC49K/T\xB7\xAEa5\xA8\x86\xEA5ߟ\xB7\xA6\x91\xFB\xA2 \xAD\xABՈ\x87\x8Fq@\xCCe/\xF0;\xAA>\xBB\xB6\xAF\xFD\xB0\xF6@\x920+\x99\xB0(9Ҙ\xA4kG2mB\xBDՄ\xF4\xDE
+î{\xADe\xFF\xCD+
+^
+\xE7\xD6 A\x98\xDE\xF5 \xEC7i\xF7\x8Ef\xAAI\xBA6\xB4\xBB#6\x96\xBBc\xCDm\x9B;h\xB2\x80S \xF8옏ю8\x{DC07}\xB5>\xB0\xF9H͐\x8F\xD3 (ͨ\xBD\xA9\xEB1\x8E\xE6\xE6\xB0\xA6\xB9J\xEC\x85jo&{\xC1ܻ\xC2T\xEFͫ\xB9 3\xF4O.\xB6ٗ<\xAF%\x91\xC5\xEB\xB1s*6Xu\xF5\x95<\x82;\xA5]\xE3 \xDB \xAB\xA3 \xB7{\xBCs\xB3n8\xE3N"\xF0\xA5\x99q\\xBD\x8Bf\xBEG+ \xAC\x97k\xF3\x9E@p\x809B-\xC6iKt%\xC7\xD0<rǻۛ \x80\xDD\xF6\x82{\x92n\xDF\xF4\xFB_L\xE6\xAC\xDC\xE2\xE8k\xAF:\x97\xA7D\xE4\x96\xF4\xE86\xA9\xA6I\xB5\x99\xB1\x94\xEAJ\x92\xEEv4\xF7\xA8\xD3\xE9\xFC#\xF8з\xC2+,\xF7%\x8DjZ\xB4\x9A\xDB\xF7 \xD4K\x8E3]\xF8\x9Ae\xCAG\xB7\x8C3\xF9\xE6\xC4\xC9*\xD9y\xEEɾ¦2S\xD0 vj5#\x86\x95w'\\xC9R++\x9D\x95\x9B\\x96\xF8\xADUUtI\xB4\xF7\xB5\xE07#\x9D\xC71S\x8F<\xA6wr\xE5\x86
+>.0\xAB^\xB3\xE0]\xAB8\xA5\x{DA9F}\xEFtmn{\x8BLq\xEE\xF0\xCF\xF0kw \xF2T\xF1\x80\xFCr!n\xC1Y9\xBAc\x991\xCB\x8B"\xB7\xE0\x82~7`k\xC2y\xCE\xD4)\x8F\xA2\xF1\x8E\x8A$Ct@~ 5\x95\xCD\xE62\xCF^b\xFCȑo\xD4
+\x8FOJ\xDB\xB0\xF1Ff \xB2W\x9C\x8C\x90\xC1
+*,\xE3I\xC6\xF45\xCC\xF3%9R\xAEE\xB2$Pe\x8E\x96
+\xBF\xE7\xB46X1\xFFF]\xADX\xCB5G4 \xF4E\xF1%\x8BЇ\x8Cԍ-\xF4\x81+%\x95Qz\x8D \x83'\xBD\xD8:\xD3\xC8Űy<W#G\xCB\xA4\x9Fl'Y\x9Etx z\x99\x9D;\xF6\x89\xC96\x97\xEDs\xCE\xF2L,6\x90F\xF9R$\xB0@r>\xFE+\xE7j %c\xA0X\xAD1X\xCFE6σk G\xAF#\xA6t U\xC2#\x91k\xCDߠ\xD9\xC8E C\xEE\xB7\xF9\xB9=8\xD5 \xE9\xB3F\xF1\xE9\xD5s\xA6\xF9\xBB7/a}\xFF\xA3\xF6\xF5jt䍽G?\xF2\xFB\xCF\xEA\xA8\xCB`\xB2\xEFv\xA0U0\xE9Ώ\xBF\x97#\xCA \xB1H\xBC\x8F\xC6M\xFFWt\x9E\xC4\xD5\xE21\xDA\xC6\xFB\xA7\xC5\xE2 \xD34\x8D6\x85
+\xE2 @2\x87o\xFD95_E\xE1\xC59
+r\xC1"͟\xB5\xA0\xC4b\xF0\xC0+"k\xAC\x87o\xBE\xA10\xAF\xF9E\x92զ\x9C
+ \xC21|\xD8\xC4K\xC9\xE2\xD9\xC16ޯ*\xA8z\xA9>\xC2\xC2L$\xB2A \x90\xA1\xC6 \x9EB\xFF<\x88D\xAAy\xD8 6W9fL\xFD~\xEDS.\xE9\xFF\xD6\xF5\xF9p\x8B\xD6BZE\xAD\x806\xE7<\xA9\xDF k\xDD\xC3[$\x9E\xE21\x86\xC3i\x96)1\xCF3tt\x94r\x9E\xA4\x98A7π\xF9?\xCBU\x82, \xEDq\xACw\xAE\xB0Ա\xFA.\xBC\x98\xA5\x83\xA3 V\x9B\x8B\x8CǻѕD\x98G\x81\xA8mui\xED&I\xC4K\xA2\xC5б\xF0\x81岛\xCC!\xDCE)\xEEQ\xB3e\xECK\xA9\xED \xFFܩ\xDCw\xEB\x83\1 M+\xC4\xD8 s\xFD\xA1ٚԷ\xAC\x80F\x89\~W7O\xA3N\xED\xCCֆV\xBE{u\x8E\x88\xDFayI=\xEC\xCAY;\xB7!\xE6\xF9\xE6" \xEC \xD7\xE8 k\x82\xB0\xBC\x99Lp\xAC\x88aMԞ\xE9{=l\xFE҈mp\xA3\xDE \xFB\xD5k\xD3C\x92\xCDp\xACa\xF6\\x98Ȅ\x97\xEB\xB6zOg]EO\xD6\xEE\xE7\xB6[?\xB7\xA0\xD9i\x9E_\x9Eu\xF7\x99 \x9D\xA6usj1.\xBBOro\xECY\xE4
+\xCC0\x89\x92WÙ-\h\xB8RK\x96\x88?\xA8MZ\x8D\xB7\x9CafW\x97+T!\x85\xE1k%\x97h1\xFAX\xCBq\xB5`?,+\xA6\xB1\xD0[b9\x81\x85\xBC\xE2:\x95Ih\x9Ai\xFAJ\xB4Db~\xD4Z\xD0BNr\x9Ccs\x8EH2\x8A\xB0H\xF4v\xFB\xAD;9\xC5?L$V\x95\xB5W\xCE\xD89\xBC:\xAA\xF5\xB0\xF8\xE3\xE08E\xB69|I\xE3k\xB8\xA5\xA6\x8E8\xC2\xDEe`F\xB0\x82\xCE
+ \x96\xD2aI\xA9\x92kR\xFBԺ \xDA\\xD1\xC0\xB9\xA8\xCA\xC0\xEDh\xD2>%m\xAC.
+\xF2+ \xA2\xC5<\x9EciZ[\xD0V\x8Ea \xA9_q\x85\xBAI\xBB`A*\xF1\x9E \x85\x94\xC1\xDB| \xB4\x95Ey\xE6\x9F q\x8A\xB3\x95\xFDt\ĩM\xC4֖\xD6O\xB7XĽ\x94\xD1\xE9m@%[\xAD\x94ZF5\x96ŷVN\xB6\x82G\xE1\xF60\x86+,f\xF3 C\x93ߚ|ų\x95l/jnjў
+tcm\xCF9\xA4\x8Da\x8B\xD3Ya\xA1b \xFE[z\xB2 ht\x92\x88\x96C\x916\xE0\xF6\xECƜMP\x8F6\xE4\xC5&\x98(\x92\xD6Q \x8A\x8Ac\xE0JWl\xCE3L)F\x82\xE2ىӮp\xF9B*\xEA\x83\xF0\xDBX\x9Arj턖\xB9B\xEA\xE8Ģ\x88 \x98z0Fs\xCBE$\x97\xB4,\x95\xCCS\xB4
+\xA89\xB4g\x81}\xBD9\xD8'\xA0\xD4e6s\xBCO|l\x85\x85\xA6g\xB3j\x92j\xA0\xDD^kC\xA1\x91\xB5\xC9xd\xBE\x85\xA7\xB6|\xA9\xB5a\xB7o\xB5\x8D\xFFy\xC3\xCF\xD1\xEBBpEֶ%^\xA5\xF6ne7D1\xD1aWwI\x8EbpS\ G\xFE/2"\xD4݂q3 \xD203ƃX'\xA3\x8D\xE9?\xC1\xAE9\xF1\xAEs[\xD4\xA8+\xB5~Q̪\xAE\xD2\xEC\Wwt\xD7%\x9C]YX"\x81h#e\xA832\xAEؚn\x8CP,F\xA6\xB5_\xBD\x80\xB4\x8BC\xB3t\xE201\x8AlKsM !\xCBa\xCEɩEL}\x96\xC9P\xAEhe\xB8\x85ج\xE5\xE6:7\xABL\xC4\xF3\xA0I\xBB\x86\x98\xD1\xCD\xD8C(\x8A̰ȍ\x95\x8A\xA2\xDA4\xFE\xBEoG\xE5\xAE\xBBd\xB9\xF3f\xB2\xE6xI\xADtj\xF4\x8Ee\xB4\xAF\xB7X\xF5PY\xCBU\xE8߷
+T|\xED\xDB3\xAF\x8Ap\xCD\xED 4\xB6ל.ҋ@\x9A \xA0\xC9\xB8J\xC8\w\xB48\xA5\x99#\x98\xE2\xB3i\xD0\xE8>\xF4\xD8s.\xBFv\xE2\xD5A\x96^\xC9\xC3\xEA
+[mC\x98y:bΰ0.\xC1\xD4\xF8沨Hטҩ\xBF\xB1A颿2ϊ{\x84\xF5S\xB1.%\xEF{\x9Ef\xD3
+\xF1\xA0\xEB\xFAmu\xD1\xC0M\xEF\x8AN\x91\x8C4bP4\x8B\x94\xF7%\xFA-\x86J\xEC\x99)&\xBF\x90\xAAU\x96i7idCi\xC2=\xE5p#6N٣\x80ֱ\xE5j\xDB ؼ_\xCB\xE8\xAEV \xBAql\x81\x84.S\xB2BF\xA5\xF8\xA8t6c\xC9p<\xE4k ɔ\xF2~u\xED\x8CN\xEB\xC1\x{38A3C19}3\x91\xB7d顱]*\x96<\xB36ܢUY)P\x9D\xA4+yU%[\x97[\xE2\xEC\xDB\xE27G6\xBD\xA2r- \xC5Rߞ\x8A++R\xDB\xFE̢|\x97\xDDt\xB46@E\xCDЍ\xA0\xAFM{e\x8Dk!\xA8 \xA8\xA9\xE7\x84\x87\xB3N\xB4M1<\xB6g\x88tp\x8D\xCBP'\x8C\xA9'\x93\x8Dc1+\xE8e\xF9Ҫ\xD2'\xD12h\xC43\xAFq\x92_;3\xAD\xDE\xE6<\xBF\x9Aͮ^5\x8FM\xB7\xCEL\xE72\xCBd\xDC\xF9@\xC7N\xED\xFBF\xC7A\xFF\x89g:v\xE5\xFDK\x9D\xFB\x97:\xF7/u\x9Awx\xF7/u\xEE_\xEA\xB4?\xF7/u\xEE_\xEAܿԹ\xA9\xD3M\xDA\xFDK\x9D/&\xF5\xFE\xA5\xCE_\xF8\xA5Nգ\xFCU \xEB8\x8A\xFFR\xEFuvv\x82 Ov\x8A;]ݧk?}\xF7_j\xCC\xFFH:9\xF8/PK
++\xEB\xF6ƚId\x91\xD8\xE5>\xFB\x86]\xE4\xFEW'\x97\xC7\xD7\xFF\xBA:\x85 \xAF>\x87\xAB\xF7G\xE7g\xC7\xD0h\xBB\xEE\xAF/\x8E]\xF7\xE4\xFAĞx\xE9<\xEF\xC0u\xCCB%\xB4\x88B&]\xF7\xF4\xA2\x8D@\xEB\xD1kםL&\xCE\xE4\x85\xC5\xF7\xFA\xAD\xE8\xA1|\xE9\xCA(R\xDC\xF1\xB5\xDF8x\xB2\xFFU\xBB
+|r\xC5 \xDAm<@c@\xB2p\xD0m\xF0\x90F\x9C\xF9\xE9\xC0 x\xC8c\xA6\xB9\xBD)ܰ1\xF3#Zc +\xBC4t\x9CW\xCE\xF3\xAF\xF6v+ !\x9B\xCEs\xA7\xF3 ^\x9D\xED\xEC\xBBvԓ\xFD!\xD7 B6\xE4݆\x8F4\xC0\x8BB\xCDC\xDDm\xC7vg\xAF\xFD\xA2C\xD2J\xDEB\xCCe\xB7\xA1\xF4Trp\xAE\xA0\xA7#$\xD4\xFC\x93v=\xA5ļ_ ᘣ\xE6Z\xDD\xC6;:L\xBC\xDCz/\xF2\xA7\xF8\xA5\xBCX\x8Ct\x91\xA9\xC0 m \x90\x82\x9E+#\x99 D}\xE7\xE6\x9F \x8F\xA7Џ\xA3!P\x8EV\x98\xA4{B\xF7\xEF\xD3\xE5i\xC9b\xE5EqȥH\x94\xE2\xA1k\xD8L\xA3\xBE\xF9\xDC]\xC4swR*\x8C\xA4\xCFէ\x82#\xA6\xF8\xFB\xB7\xE7Ѕ\xA6\xE3\xDE(W\xED=\xA7\xE3\xBC\xF8\xFB\x9E\xDB|S\xE4\x9Dg\x91u\xAF*\xF6\xBA
+\xC3\xF4\xE6#\xE1lӜ0\xA1sctk~\x8E\xD5\xC5e\xFFu\xD1^f\xBC\xB1f\xDCo\xE0p4\x92\xD3\xCCf\xC2\xE6o\x88\xFA@j\x87o\xDCUK_J\xFF\xECu\xD9gR\xF17 \xA3D\xBF\xF5\xD4ɒ\xEAP ϞQ\x86W\xFC,ԅS\xA9\xEE\xC0>|\xB73ϗ\xE6\x897O\x96\xF9~5U\x9C>f\x9F\xA7s\xCA\xC2IH\xE8V\xD98 _ rx
+\xCDSO\x8A\x91\xE2\xCD\xDD\xD2a\xBD8\xC1\xC9R\xBD\x86ߚ4\x8D4/\xF5ygI\xD6L[Y\x99\x80n\x97S\xB3t\xAC\x8D\xA7 :1 bZ<\xD4:\xBDDc\xAC\xA3\x96\x93\xD0#ô\xCA1N\xFD:\x89C\x84$\x94Ù\xB4ұ\xE2U\x9E:C6j \xB3㻳\x8B ͇\xAB\xD9\xE5B\xD00\x87rѢ[\xB5\xB5Z$1 \x90,F\x8E\x95\x9FZ\x94\xE5b\xEE\xC2}\x92\xE25
+j\xB6\xC0\xAAJ[~\xFCs\xA9q\x9F\xDEo
+E\xDF79 \x9E\xE5^\x83)\xD8\xE6h\x93EJ猎\xF3\xEDrhfWjj߹\x98My\x91T#v\xF7~o\xEE,\xF8\x86\x99w\x81KN5\xD7ݞb3\xD6\xDFd\x9B\x8Cb\x95β\xC1\xEBc\xDD\xD7Zi\x94v_\xFBf\xD6\{\xE6\xC1\xE2\xD8?@(d\xFBV\xD3L\xC3\xCD\xDDfq~N\xF8x\xE2\xEE)\xEF\xDB\xE6\xCE
+\xE1\xEE\xC7Vp\xA0f\xAA\xE4f%_1F?\x96 \xBBHF0\xE4J\xC1D\xE8\xA0`\xE7Wwؙ\xEAs8\x80\x80+q\x8D?`\x8D0A\x85G\x93n\x8Fe9m\x9E\xB5cZ`\xFB\xC0\x91dS\xBCP\xA3\x87\xAD\xEB\xADi'ɇ8\xD64k\x86Q\xC8s\xBA\xA564\xF5\xB6\xAC=[l햻\xC0\x94`\xBE\xE9<\xBD8)o9K\x9ANBf\xA3\x937\xA2\xEE\xA8\xE5\xA0Sp#,\xB9\xD3\xF0s\xD3,\x90\xF3X
+\xEF\x96& \xC59\xF0Ol8\x92֬\x94\xA4 왉-\xFDW\\xE9r\xC51~1Z\xC145\xDFـ̝\xDFYon@/\x8A@\xB7\xF1\xBC f\xF3\xF3}A\xAB2/\xECo̲\x9E\xF9\x8D\xE7\xD3\xE86\xD2\xDES\x81a\xBD \xD4R7\x926FX \xB0Ч\x96\x89B\xBB\x85y\xEB\xB1\xFD\x89s\xE6E\xAC\xE6\xA79\x98\xAB\x90\xF5NC\xBFq\xF0,\xEC\xA9ћl\x84\x9B1@P1\xFD\xCCp\xCB\xEF\xA9G!\xBD\x88| 4f=\xB2G\x9F\xB3\xC5\xC1'ܺ\xF2O \{\x91t]F\xC7y*Q\xC12\xB2\xCA\xF5\x97D(7z\xAA\x9B\xF94r\x80#\x9Ct\x84\xF5G\xED/25\x92\xCE[\xD9FO>u\x9B.\x97\xB8\xA0!z1\xA3\xBE\x8FZ@ xh\xAF\xCArs\x92\xFE%
+噭\xC1\x98+\xA7\x90s\xA8\xD88T\x87\x8AN\xD8\x83$6v\xBF \xB837~s5̱l\xAF\xA4Ђ\xDC\xEB.\x80ْ\xF2\xB8q\xB5\xBA\xD9\xE0\xEA\xD0N3ZS\xD8\xD0\xCA\xF9A 8Z\xDB\xC3/U\x87 ({\xD8\xCBW\x82\xEAEu\xBC\xB4f+\xB2\x93\xB3\xB8|V\xE5\xD6n\xBB$\x9BF\xBF+\x8F\xCB)\xE2F\xBE\xA4\x80\xF1\xF2\x8Ax\x9DVN\x95+\xE1\xB6$\xDB/\xFC\x9A,\x90\xAFj\xCF\xCF;\xB5Z;\xC5\\xB5"M\xE96\xEC(s\xF4D^\xC4^
+\xFAv\xE6\xCERl\xD8\xCDFM\xB4\xA1\xAC\xEF\xCE\xE520\xAAIE\x87\xCE睔v\x83Tn \x8DQ
+7\xFETJ9d\x9F\xF7Y"\xF56\xC8\xE7Yl\xE0\xDC\xCBU\xE3[\xB3\x8D\xF7&\x93Z6+\xE4j\xA8ś\xAE!2\xCF\xC6n\x9DF5hpp:\xD5W\xB2&\xD1:\xDA+\x8A
+\xB1\xC6\xE6\xA0\xD9\xC5=\xBB\x85j,\x88\x8Dȕ{#\xF5\xC36 F\xF0YmXY\xFAi\xF5\xA0\x98Ѯ\xBB/i;#Uܥ\x90\xFD\x82{\xEA\x9F\xC9\xE6@\xB2\x91\xD8(\xB6'\xA2:\xD8\xEB@\xA8|q[Q"}\xBA/ \x8D\xB8ݤ`w\xA4D\xA1\xC7\xE7+\xD5ë3ڬ\x83;\xB3}
+\xD0st\x90/\xB0\xB4\x952\x9DT\xC5\xF2f^g \x8C\xB6*\xED3&\x90q\xADu \x9CS\xF5\xA5\xB7\x8B\x819Ed \xAA+`\xCE-flj\xF0\x84J\x8B\x9C\x9B\xAFm^廰\xF2uMڙV\xE0\xF8ō\xBA\xEED\xB4\xEDԳ\x91\xE2\xAB,y\xAD\xB9\xD2u\x87ڳ^Ѩ^\x8C9\xE9\x9E \xA5\xF22\xF6u$d\xFA^!}\xFF\xD1X\xAF\xC4Z\x9B"\xEEڤ\x942\xA0\xA2 x\x89\xD2\xD1P\xFC'\xBC\xB3\xC76Q-Xib\xE3 \xBB/\xEB\xEBkHR\xFA\xED\xCD\xDB\xEC\xD3\xF4\xAD\xF9\xEA\xE2\xFD\x97\x8C\xB3A\xBF]\xAD\xCD\xFE\xF2QS\xB1z\\xBFh,\xD5\xCD \xAFpͳ$\xF9C-\x85Grfo\x818\xBA\xBC\xBE\xBE\xFCy\xFE\xA9\x9C\xA5Grz\x91\xC6\xD8+}\x84=\xB5\xEE\xDB \xD2\xD1\xBC\xC2R>\xBE\xE2\xF1\x9D9 \xDF \xF1\xF8N\x88\xC7wB\xCC \xDF \xF1\xF8N\x88\xC7wB<\xBE\xA2\\xB4\xC7wBT\xF5\xF1\x9D\xFFG\xB5+\x95\xD7B\xA4\xFF\xA5\xDE \xB1\xB2),y9D\xF6n\x88\xB2F4\xEDDݬ\xA1%\xA3 <\xF9 PK
+++ -\x83\x88h\xADsM\xFFz
+i\xEE\xFC\xFC\xD0$A\xD5\xF8 &ot+\xAA\xBF1\xA0ɚ\xD0\xEB(\xF5\xFD\xA5q\xF3\xEF&\xB9\xB1\x87\xDC<͛c\xF4 '\xD1&?~\xF8\xE0ϯ+\xF9p\xDBA\xB4\xFCF\x97\x9AO\xC5U'RD\x8A\xCDb\x92O\xBB\xBD\xA9\x84\x99\xD9G\x94N\xCF5`*\xA6\xBE\xE8r\x89p\xA3\xD4\xD4R]\x9ALӅ!*''E\xF1D\xC0 \xC1M/\xA9"\x81\xA0X\xF6\x84\xC8\xE8W\x84܆&\xB7\xF9M\xD32\xC5Ӣ\xCA+7\xB3Lb\xCAr\xD7\xF3`\xDBg\x89\xD1
+\xCEȟ\x88;0\x8E\xF8\xA3I\xD9c\xB0\x90\x9Er|p\xB7aZW\xE4`\xCFe*8)\xCA\xDDW\xDD\xC7\xFC\xF6:8\xFBPK
++\xB3 N7jyhɏU\x87ﺘ/\x91Y\x90\xB7Ѣ!'\xE8;A\xD8\xBFF88\xB6\xD9J\xDCeȱm\xB9\xE3Ȍ\x8FQ\x97\xCE\xE6\xE8\x86\xA0 \xB5h@\xDAP"\x90Nܳl\xCB\xF8\xE2\xDBmv\xC1\xC9r j|\xD4p\x95\xE6\xB1BB5\xD1 \x86}y\xEF-\xC3a<=c\xC1&
+R.\xA9\xB6\xF56\xF8\xCB,\xB1\xD5\xD1']\xF4\xCE#(x\xF2\xF4ǚ\xEE\xE5:ܱ7\~\xC1\xE8<\xDEl(\xE3\xBF8\xD0m
+Ѓ\xE0\xEFe\xA1iN$*\x9E\xACՎ\xAF\xB1f\xD9nϕ P3\xEB6\xBCʗ\xD4˄\xC1 \x80S\x83\x84S܌\x91\xC3\xE5K\x928\xD4V\xD5\xDD\x80 \x9Au\x96(D\xF9\xCA?\xF1\x90~\x8C\xA3\xF8H \xB4
+\xB9(n(\xC9]\x86\xB3UIp+\xB7\x82\xB8\xF4}\xF2.\xCC|\xDE\xC5y\x99 r3""Pb\xB0}\xCB\xE2\xA8\xC2z\x8A\x8Bg-\xF43\xA1kd\xC1\xF0$\xB4\xE9o\xE2\xFD \xFE}\x9A \xC4 \xF6c\xDA\xC7s\xA0g\xF3\xF8I\xD4\xEBM8gw\xBFFfo\xA3\x86(\x93\xBD\x86 \xC4D\xFA\xAF侴\xF2\xF2+\x96\xEDZ3\xC2s\xDF\xE288T{5.G\xB6ȡ4[\xE7\xA3O\xB2\xC8=y\xF1A\xEA \xF6\xB1Qꢀ\xC6 \xA3\xCA \xDD&\xF1j:\xFFs\xE3\x96+\xE2\xD3~\x82T\xF8\x97\xF5?\xAF\xD3uRF\xAD\xA3\xFBDX
+\xB5\xC0\xF5Izoo^\xC54\x89N\xEEM\x9C\xF6k\xFAi\xD2CȾ\xBB\x95w\x96\xEDc\xCFmJ
+Ǜ\xCEus_\x9B{'\xF2Q \xA5n\xF3'gC
+G5D\xF7i`A\x89iт:J\xFCH\xF3,yqΛ &^M\xC7\xF6\x82 Wn\xAB\xAD<{W8\xDEt\xFCB9D+M*푆V\xB3\xD63\xAF \xAC\xB6v\xCA-a\xC0\xE3C\xF6n\xA9p\xD0\x9F\xAE\xE2\xE3~\xC0\xCA\xC2\xE3>z\xCDw\xAEW(AޓW\x917\xBDc\xA5ݚ+\xD8fE\xDC\xF0\xC5]$=\x81\xA2Z*D#\x8F(\xB5\xB4\xD7\xD9\xF8.
+\xCCt\xBB\xF1r\xCFji\xBF7\x80q2:/\xE0aXIȟv?\xC0\xC3@A
+ \xF5\xE7t\x9DY\x8A띞.Ɖ\xBA.\x98\xE3[\x82ԂT\x80\xB6\xD9\xE9\xB5\xF8'/#\xDDD\xF1\xE9\xF7\xFC\x81ɿ\xE1fbă2s\ { \xA8N\xA5\x88\xB3\x97~\xE7Z \x90\xD7_\x8B\xD5oז>\xEC\xE8\xF9ۡ\xBCv"\x9A\x8Av\xB7q.beZ\xC8%X\xBB!\xE87 \xBC\xF8މ\x90AN\x85\xDA}\x9F\xDEq\xCES\xB8.\xBA\xB2\xED8\xB2\x95Y5\xB0{\x98B:lݤD\xF4@\x93x\xE2:\x86oڧ\xB7Yr\xD3\xCCͪAȀ\xF9â\x8D\xA3\xA9\xC3["'҇\x856\xEA\xB7⨊\xC4ϊ\xE4\xD13\xEC\x83,\xC5ϖB\xEF\xE0:"z\xA4\xA1`\xAB\xC4W+ \xCC|\xC5l\xC6,|\xA6\xE9\x8A\xE7JL\xE7pEĩ Ё3\x852>\xEF\xC38#\xE8G3LAt\xEDr\xF3\xA0~\xF7
+lv\xB0Bq\xC2R\xB7+\xED\xB6 \xCBEAXA\xA3\xA0$;\x98\xE0\xFD\xE1.\xD0\xC3V\xB71\xC3ST\xA1\xFB7\xE6mm&\xF8\xC3,
+q\x81\xD6\xA4\xEC\xDC\xF8\xD7Ȯ\xFA\xAFp*N\xAC\xBE\xEAښFn\xAEpO
+\xD7ؤ\xB4\xC8\xFBY\x99&\xE0\xDB؝Nm\xC0\xFC\x85\xC9i\xC3?\xCF)\x93\xC6<cN\5A\xE0\xB4$
+ \xACS\xFD\xCD\xC8 \xF5\xF7^\x8E\x81B@\xC4 \x86\xBAF\x80\xB9X\xE3\xEA\xDBs/%9v$\xF1\xB1\xC6\x90G\xC8т\x84 \xABȑ` Sȋ\xAF\x{18D520}\xDCrhX\xED\xE9RM\xD5ۛ\xBAX\xBDU\xEA\xD0h\xB3\x9Fi\x93G=\xA9㦡\xE5i \xB7 mO\xEC\xF7\xBC\xF0\x9A\x80\xDA8S@7\xF1.v^\xCA\xDA\xAF\x97]\xE8#\xA1\xDC\xC6\xD8^\xC3\xD1m#HWu
+Gt\x8E\x88\xC2 r\xA5\x81\x85\xCE~\xD4;\xA9\x82\xE2+\xE1\x8F8Q\xE7>v\xBBL\xC3t\xE4hL\xA0\xFE\xDC\xE4\xA2\xE6O\xDBt5{\xA0i\x8E\xBA\x96\P֖\xB8\xCEshYwC]\xF6\xC1 \x88퓒k\xFFjNY\x8AGv\x86\x92k\xBAC\x95\x8B\x86\xC5~\xEE\xC8ε\xF3\xC5Ϧ1!\x87\x8E\xF1a\xE8*نvj\xE9\x90\xC76\xEE[\x9C\xD7\xD0p mX\xAEy ظ[\xA3$t\xE8\xBBi\xAB\x90uQP\xC3\x93aP5
+\xCD*8\xC1#M\l\xBDa\x88\xA16<҈\xEE(\xFF\xF5\x89pѧ\xB2ߝ2\xAF\xA5\xB3\xFA̮E\xF7\x90*\xF5\xA2\xF6\xE2g\xC1C\xEF6\xDCe\xB7\xDC\xF3\xD0\xF1\xDB },\xFFݶ\xBB,\xFD\xCC(\x8DĭWv\xA5\xEF2\xD01\xCEvG\x9A "}f.y!T\x85\xB7\x9F\xDC\xC2EG9 \xEFx\xB9lP;\xDB?\x8A}Uwe\x82L}S¸\x86\xF1\xAD\xBA5i %\xA5\xB8~\x9B\xF7'\x89\xEE7a\x86\xCB b+ \xA9\xB9\xA4\x8Dr\xBF\x92\x87p\xAB\xEB\xA5>\x97\xAC\x84+=\x88\x80V\x8B\x8A\xD2Wa\xEF7\xD9s\xEE\xB4+CT\xF0\x87\xA4pW\xF2٧\x87\xB8e osi\x94\xA2\xBDG\xA6\xA7\xDD{]\xAB}߇\xEA'ްn\x9Ca\x85\xF0\xBB+\x89\xC5k\xCC \xE1z\xEB\xE2\xF0P\x97f΅"\xF5\xB8Y+:Ҕ5\xDCt\xBAVQG@*\xD0&\xA2}\xF1 \xFC\x94o\xB6\x91v\xB4H\x9EGz\xC0GG\xF5^\xEF\xBBU?\xDA[`\x98\xBB#\xF4\xA1c\x84XG\xEA{%/RUT1\xEC\x9E\xF20<2\xE2\xAA]0t+\xBE\x9C\xF3Ā \x9Fw1ы\x8F\xC3=\xA7;\xD3\\x91d Z\xEF)@\xC4 \xE9.{\xA1W1ˋ`řJ\x81t+\xA7@B\xA9\x8B\xF8^\x80\xBC\xD4AJ- \x8A\\xA7\x9A\x9B\x9DS\xBA6Y\x98r\x9F]\xD0\xBDx\x99Py? \xAC\xC0\xC8`/\xB6p\x8B܇S*\xAE/\xF4r\xB7/\xF0jo\xA7^\xA9\x90\xACp\xF3\x83Ҕ\x80A 2\xFAF=ځHz\xB1#L\x86\x93\x82\xF2mQ \xA8 <\xBAQcڌ*\xA0ڶG$7I+ Q\xA4\xDD\xE0B\x83\x84* \xD7\xC1kl\xF8)Q\xF4F\x9F\x92\xC7o\xF0i+\xE5 ,\xF9\x97H$\xEA\xD2K\xFBm輩\xABS0\xE7'\xE4\xA8\xD9+\xA8\xF8\xEA\x91(a,$1\xE9\x96e' (\xA6\xE92\xDEѬt I\x9B֧\x92+y!\x87\xD0\xEER \xED(i\x8F\xB4D)\xEEa\xFE/\xB3\xEC&.x\xB3\xEB\xA2$ \xECV\xADA\xFBՏ\xEA-I\xA1\x89Z1\xE6\xF0\x88\xFBv\xDE:\xF3x\xA8
+d\xCA\xDCW\xDEZ\xE7\xCF4\xAA\x93`\xBCs\xE6\x8E@z\x93\xD4 $j\x85E.\xDC_\xD32\xAF ݳ\xDAleI#\x8C\xB0\xED\x8C\xEC\x8BRX\xA6^\xC5\xE5\xECX \xB4\xAClN\xA4\x8D\xBAf\xFE8( \xAB,\x976\x80V$ ^Ҏ\x85 A \xD4Pb\xF4 \xC2A\xE4\xDF\xC8\xF18\xAD\xA6\x8D\x99U\xE35\xE8'\xB0$<\x84 5-\xF4\xB9}\xB1)D\xBC\x84\xB8 \xA3\xEB\xA5D\xD8\xD1<\x9CqP\xD46B\xC9\xEF9\xE4}\xAA&\xB2\xF71:\xF6\x9Ct\xEF\x87\xA5\x9A4\x97\xC4tA\xBDXv\xC1\xFC.\x8A\xB1\xA1\xED@\xD0m?\xC0~ u/\xD0+x97@\xC6Q?k\xBB \xE5\x86rC\xA4 \xC0rK\xD2e\xF0\xEE\xB3 T }\xDAFw\xA8\x96\xE9P!\xFAcMwR?i\xE9k
+.?ct?>R\xC6\xFF\xE1P\x85#\x9E\x8B*g\xE2A\xFA\xCF}\xA1\xA9O%j\xD8
+\xED\xAF
+k\x9Emw|\xA1\xEE0C\xB6\x97ޗ\xE8-˄Q4\xCF \xB71F\xE7\xFFٓ\xC4\xC1\xE8qނ\x8E\xA0`\x83u\x9D%\xCA\xC0T\xE4\xBE\xF2OAܤ\x9D\xAA\xC1\xF4p\x94\xD8\xE8\xE5쬸\xA4$w\x992\xC6\xCB«E\x93\xE2ݲ\xFE.{\xB6Z\xC4\xF9\x9A\xD1 I\xD7 u\xA71\xB3+\xCC^ƚ\xA0`\xE4\xFF\xEFz\xBF]Qv\xF3\xA8ه\xF3\xF2;\xE3V\xA6G𨕻Ho\xB7~Z \x9B\xF2=f\xC6U~bL\x94e\xF2\x91\xE4tYYk\xC4LHGu\xA0\xF5q\xB1P\xAET\xAC\xBE{D\x80\x89\xBF n\xD2MƉ\x9A\x9B\xC1\xA6\xE1Z\xF5\xD9tGŶ\x89\xD2\xC2p\xD3f\x87Z\xCA &' \xBBzO \x9BMa\xA2K\x95
+\xD7H \x8C\xCC\xFDM\xC35\x8B@\xF3ut\xA4$\xE5Zю\xB2ⰤЙ\xE4\xE4\xE6\xEE\x8A@\xAF\x95s\x92\xC0\xF4\x9B\xE1\xA5RBz\xF9p$\xC2 %Iy\xF4+\xD9\xC6zP\x9CWE\xBE\x89\xBE=\xFC\x9B49\x88I\x9E}W\x86e\x93\x87\x88\xD4i\xA7\x89\xEE\xEC \xAA\x87eӹ^\x96?z\xC1Qf\x95\x83\xAB\xDD*i
+\xBC=\xA3\xB9\xB2ظ\x98l{T\xB9F8;\xEC]]kS\xB1[\xE4P\xEA\xFDFc\x97x\x91{r\xE5\xC1\xD9\xC5\xE8J\xB3\x8D ό*S`\x93ī\xD9\\xFC_̿+T\xF6+\xA0\xA9\xB2m\xA0\x83\xF7Si\x80\xEDn \x89\xE51\xF3\xD6-)\x9E.3<\x82t\x99\xEFMt\xE4,\xE7=\x92l\xE5~\xC0\xE9r\xED\xE0\x9E\xF1\xA9p\xDCߐǦGT\xF7\xAE(\xBF\x8D?\xC9R\xEB\xB2\xEF7@\xC8&q^\x88`β\xF4\xEE\xCC\xC54\xA0\x91\xE4 \xA65\x90\x85b \xB7I"\x95\x8E\xB0\x80 \x90\x86\xEAC\xEB\xDE\xC1r\xBAw1LkB\x9A\x94d\xFD]ĻP\xCE.\xADb(\x96\xE2S9\xB8?\xC5 P\x8B\xD7t\xA2#\xB8\x8D\xBCU"j*q\xBC\x9C\xAE\xF9j\xF8<\x82\xD3\xC1+\xC4F\xB7\x89 >^\xD0 \xE3\xDB\xB7\xA7Q\x91\xC3\xF1\xC8V\xCE\xCAE\xBD\xB6,h\xBEf\xF1J\x9F,\xCE\xEAРs\xD6+GGx\x95\xE2"`dt\x85\x88\xA7\xD0\\x82Ǥ\xB5\xA8\x88\x86\xE5\xCB`ABs\xAA\x81\x91\x9B\xD9y\xF5\xEBE\xBAN\xF6\xD1ѹ\xF1@X
+\xB5\x88\x86\x8CAax\xBD\xFESL\x93h\xF0\x8Co\xD8 u\xBBRc\x93\xE6\x81 q\xE7\xD9. !\xF4@\xC3\xF6\xA6x\x91\xC6Ȩ\xE7e\xF5\xEF\xE4z<a\x93\xA4p\xF4\xC7jfM@P\xB2\x9A'\xA9: \xB9\xA3y\x96<;\xDFςU\xA6\xEA\x8E \x82 n'5g\xF7~)\xB1\xBD)\x86w\x96\xB0\x88](\xCF\xE9\xA8<[R\xBCi\x8Fl\xA5a\x87\xF0\xCF?ʣ ΘI\xEC[s\x92F\xE2 \xE2\x94\xC9⪟\x96"l\xB51\xCBEi%\xE2\xB2l8UD\xA0AhDt\xB5\xDFl\x84\xAE-J\x8A\x8D\xFFR\x9D\xACBW\xB1\xA9g\xFDjJ@\xDF<m]\xA8\xFC\x94\xB1¢ \xE9\x82ݮ4\xC8\\xEA\x98L\xCE= \xF9\x92\xB1\xEF_s\xB2\xA1\xA8˖
+\xAFǽh\x82 q\xFB\xC4b\x9AF\xC9\xE1\x8En\xE5 \xEFZ\x8D \xE3f⳺\xC9 \xF1\xFA\x8A\xE4c\xACo
+\xF44iAx?\x91\xE5~7\x8ABg3\xF1\x8Fٞwa$N\x8B\xC6R\x8B\x86%\xFB*C \xFAa\xD6*\x8E\xD6O\xC9#T\xEF!\xE6F
+_\xEB~B\xFD \xA2\xF1j\xC3\xE7$[\x91z$1C
+B\xECk%lr\xA8\x80id\xCA\xFFps\xB3 D\xE95\x9Fe\xEC\xBBa\x81\x83\xA7\x9A\xB8>\xD4\xEE\x9Fh$8\xF1\xA0\xA8 \xE1_\xB8.y\xD0S[\x84\xBBށ\xF6\xBA\xD2\xF9\x85\xE4O\xF3,\xA2giT:\xBE\x84&\xFC\xC0\xC8n\x87\xD8X/y\xF6I [\x8D%y\xA4\xDCDy\x85*(I^\xF4/"n\xED\xC7\xF2\xEAJx\xC68\xF8$\xFAb\xF8 ں\xF7\xBB\xB9\xFC\x8C \xF7\xF8\x8Bt\xBD_\xC90\xAF\x8BG\xFC\xBE\xA4b\xD2\xCDȁV9N\xCD%ʊ\xF6\xCE=۫\xC6 a\xFF\xE7k"\xEC \x9D\xFC(\x84\xE9\xAF\xD0k\xA2D:5\xA3\xBC\x93\xEBy\xC7N\xA1@\xB5\xD9f\xFE\x8E]\\xB1\xE1\\xF4GU˛ ;v\xF1]%Ƌu
+\x9A$e8Ƣ\x8B\xA1\xAAJi\xF52\xF1\xCAѢ0[\xB2sKa7`\xCD\xEAh8.\x83
+t\x94\x92X!\xDC<\x86\xD3\x8F\x98~\xBE*ֶ\\xCB.hx\xAFQNꆀd\x87A7\xD6r\xEDу\x91\x91\xA1\xA9FΘx"Xk7\xC4\xC0֡\xF2\xB19 \x95?;q{ڳ
+y\xA9\xBD\x88\xE9\xB3\xF0C~\xCD\xF9D\xA8\xB2l\x8E\xE2I\xEC\x8B(#\x90\xA3\xB3v !ꔸ\xD0Y5\x97e\x90\x92/t;\xEF\xE7k\x80\x8CQ=\xA2AYuف\xDE\xF1\xEAܱ(\xF0\xACf\xE0\xD2\\xA3\xAB\xB1\x874\xC6ƻ" x=ֽ\xF9J\xEC+\xD1k\x97\xAA"j\xE7\xDC$*\xE40\xF4L\xC1a\x8Ea\x83L\xB9В\xD5\x8E\x91X\x97\\xE9\x9E \xAF\xD8@\xF8U\x8D\x89xU\xE9\xE0\xB9x\xDA\xC80\xF92\xB8I^!\xFA\xF5 \xC6`t\xE8@\x80\xB5h$&\x9AmFOn
+d\xD4S\xFD\xBF\xA0\xEB̐zx\x9A\xDE^o p\xECa\xDF\xF7d+\xC7\xEA\xEC<5\x83N\xA4\x98\x8Bu\xA4\xBE\xBD\x90~]\xEF\xC0\xF4\xDEw\xDE
+\xECB7\xA0\xE3\xE7rd
+N\xC8@*\xCFxUAy4\xEB@\xA6\xE7tWGr_\x85;\xE8Ū\xD0 "\xBD\xF1
+<\x8B8 8\xB6\x8Ac\xB8\x80\xA9e· <ߵ6\x96\xD0e\xBC\x8D\x9D\xB7\xF3\xE3LJ/\xD5EG\xB9bsns\xB7Cۡ\xE5\xAA\xCAm\x8E\x8E}S8\xA6 \x8D\xC3 \xBD 5>:\x8A]o\xCC\x8Ak?`'W\xC3\xEEҴ\x9A Gލ\x89\xB3V~=\xF3\xF6H\xA7\x9C\xB5\xD0pu}\xB5_RvL}u\x91\xE7\xD0'\xA9\x97\xFD\xAE+,\xB4\xDFQ\x86j\xFD\xEE\xC6
+1\xE4\xF5E\x81\xFBZ\xF75Y\x8E\xFA!̩\xDCۗX?r\xBD\x88\xE9 \xD0~\xEDψ\xDBFF
+7L\xF4\x93\x9D4\xE2i\xE0\x84C\x8C\\xF1\xD0i\xF4\xCAY\xB2lr=\xC2-\xAF)\xFF\xE7ᬢ\x8F\xFBB \xF8}w\x8A\x92=\xD5n\xE2C:\xBB\xCDH\xCA\xF0\xB188g\x83 \xF4\xE9\xDEuvŭH 0\xEC\xB1^\xDF\xFF\xFD:K?3J\xA3\xC3\xCFz\x91ٝ+\x8Aמ\xC3\xEAb\xB59\xDC \xF7\xBD\xF1H
+\\xF9@n˟x\xA3\xA6\xD7)\xA2\xD0>\x99\xB2\xC4\xF2%\xE6\xE4\x96\xD1!\xE1\xEE,^\x9A9'Z \xF2\xEF \xC1@\xF7#\xEB\xE7F@d\xEAxmGJn\xB7Lx\xAA\xE3g\xF8MW \x95\xD8I"\xE0]\\x8B\xA7\x9B\xEA11~\xBA\xE0\xD0%S\xEBA\x86y\xABo\xA8u\xDC\xFB\xE6-\xCBv\x94\x87\xB3T% ?>\xC5.yҠ=\x95f{#
+r\xE20\xF8N ,\xFAi\xB01RodG\x84B\x97m\xB7bh\xDFշ6\xF1O\xC2L\x90f\xEEm9\xE8\xCD\xD6\xE1m\xB7\xE1F ށe[\xDFvC\xF8\xBE\xEF\xE86{\xA6\x9Fb\x96\x97\xC0L\x82\xF6Ŭ
+[\xD1Jc8ȦSAy\xDD\xC0)Ӡ\x8E\xF0*\xBAA\xEEL=\xE6q\xF2V\x80h E\xA0\xB72+\xD0\xA5;\xA1玗~\xBF-(Dk\x9F'T\xBEcK\xF4j\xED\xA3\x88\xD5\xE4\xC3s<z\xAE\x83\xE1|\xBB+\xF0LƘ᠉
+X\xE1\x9D\xBA\x944\xA3\xAF\xD8\xF2-q+\xB2\xDC&]\x97\xA3\xD7\xE1(Ɂ\xBE=A7\xF8`\xB4\x99\x90\xA8\x87\xAB+T\x94\x98l\xAC嚦\x84\xC5⚷\xE6|\xB77X 崤\x84\xAD\xC5;\x9Es\x81~\x99A_/s\x88q2\x89@\xDD
+Z\xD2\xFF\xECi\xBA\xA6\xA5S;ܵ\xA0&.\xD2ެ\xA3\x91V \xF5y\x90\xDBF\xB1\x8D\xEEc\xD4(ٹnJ\xD3\xFD\xD6=̨\x8D\xE5\x95c\x86\x9B\xF9#\xE4H\xA8`Z˘/\x8E\xF4\xAA\xFC\x9B)zk\x80Ѷ\xF5\x92Ϡ\x84\x9A\xECް\xEEm\xBB \x8F\x80\x8EZa\xB8\xCD$\xE4i\xA4{\x9B \x9C\xCBN\xC2!\xF1\x8F\x9D\xEB@l\xB9k)*\xC0K;\xBC<\xDE-\xC8 \xB7_A|\xC7 !\x84\x93\xC3ޤ\xEA\xF8-*\xDFz4\xDE^\xE8Ŵ\x8B\x84͝\xBC \xEB\xEF\xE3Z\xDFl)~\xBD\xBF\xCEJ\xDC\xEFjj\xB3\xE6\x88f\xD5;R U\xC5\xEA\xE8\xA6Sެ'\xA2\xCFq\xAC\xF8P\x95v\xA8\x91\xE1q~\x80\x86n\x8B\xC1)\xBA\xE2Jm\xE0\xD7ӏ\x98\xF0\xBD\xB3\xE0\xCB\xD8\xE6\x9FY7\x8D6z\xD3\xD4Qֱ<7\xD67.D
+\xB6\xFEj\x9B\x88\xAB\xAA\xC4p\x9D \x83\xFB
+}\xA0\xAFʇ=\xC8\xD7@a\xA9&D\xC1nʧ [x\xF0fH\x85\xE8qy\xA5\x82\x9D\xD7\\xC7E\x9B\xE7\xF74\xAF\xC2g\xE0Y\xA5\x87-\xF4<ʂ\xBB\xE7_"\x91x\xCBK\xEAĶ|>ƜU\x84\x97ߛ\xA3f/\xA0\x80^\x90d\xA5\xD9=:c)Łv\xC3,\xB8\x8F\xB74ۻ \xD9 k\xFE
+ \xBC\x81\x89r\x81v. \x856\xF0D\xE9\xC0a\xE3\xD2\xC3l\xBBϲ˸\xE0T\xCE\xD6Ş$\xB0עAv\x9B]\x92 \xFD+\x92 ^\x83\xBCQN\xC0F\xF1\x9E\xEBϸ\x91b\x93\x8B K\xFE\xCA\xA4q\xFED\xA3*\xB8o\x94\xB8\xE4 1\xDE\xC4\xF5\xC4j#\x937\x8AB*/_\xD3}^6\xC7\xAFNt\xC0Q\x96\xCD7\xC28\xF6\x9C슽\xB0++P\x93\xBE\xF7\xB3\xF7\xEC\xCB\xCF{]_>äc\x90\xE7}\xD2\xFF\xE9勽\x97\xFD?\x93\x8F\xC3#\xB2\xF7\xAC\xFF\xC2"\xD2\G\xEC\xE0\x98\xA5\x92\xE6;\xAE4\xE9\xBC\xC1\xD7\xA0\xF5\x9Fy\xFD_\xC8\xE1\xC5iw߷\x93w\xF6c\xA6)Ih\xCC\xAD\xB5H \xCD=h!\xE0^\xAF\xF7\xBC\x8FDG<\xB9"\x92E\x83\x96ҋ\x88\xA9)c\xBAE\xF4"\x85\x85\x9A}\xD3~\xA0T\x8BL%Wgxf\xD4\xE0\xB4>\xE00\xC2\xF2\x9DF"\\xC0?*\x90<\xD5UX( ;\xDA:@9\xED\xF8\xF01\xE9D8\xD1x\x88\xC8\xE3IȾ\x9D\x8F;m\xAEz\xB0\x8CIح\x81\x96kw\xC9`@z\xFD.\xF9\xB7Y\x8A\x9F\x94J`\xCBg1^8\xA2\xB6W\xEB\x95\xF3\xFB\x8E\xEFI\xFB\x968\xB8JDq\xF2\xD9\xC1\xAF@\xF8\xCBW$䊎"\x80 ۷\x99$#)\xE6\x8AIo\xDF\xC7\xC9+I\xEC"\x9F\xE2$\xBBI\x8F\xD5O{\x95\xA9\xC56\xC18+\xBA\xF0"ۢ#J\x83\xC2\xFC\xFAr\xD9\xC3+\xF7\xBB\xC5\xE2\xFF\x89 \xA6i\xB4\xC87\x8C['NĘ\xA0\xCCɟ\xFC9\x9Am>\x8F\xC2\xD3\xE4\x98F\x8A\xBDZ\x9A\xC5ǝ'^\xEERc\xC5y\xFAݼb\xA7\x89\xAE\xDCr:\xD8%\xFB\xE4\x97n .\x8BW;\xABp \x95\xB3\xAA1\xA4\xFC<\xA9 "ם\xA6y5f\xE4%i\x9FOk\xEF6N\xC9 "\xA6zI\xFE\xD1\xC6 \xD2\xFEgì+\xB4\xE6\xD2\xCAS\xD09gI\xEDƹ\xD6<\xBCq\xE2I\x83 <\xD4Z\xF2Q\xA6\xC1\xD0A\xCAY\xE0\xC6t\x9Ay&\xFFu&`\x89+\x8F\xD1`ڹv\x85\xA5\x8EV\xB1<\xF1b\x9Av \x8Cr|\xB7D\xCE5\x8B׃+\x88\xC0i :\xA2e\xB5\xA8Jk=I<\x9E -\x86\x8E\xB5\x9FX.\x9B\xC9\xDC%\xD7Q
+8*b\xB6\x8Cݔ\xDA\xE6\xF1\xDF7\xF7\xC9\xF5\xFB\x81\xA6\x86Ɓ\x93\xA7\x85ր\xFF\xB5ڸ\xD0_]\xC0\xE8{?\xAD\x9Af\x8E\xA9\xADC\xEF\xAC \x8D\xFFD\xA4R\x9A \xF6\xFE\xD9\xEE.\xE9\x86 \x8A\xBB\x84E \xAF͚b=\xE4\xE2\xB87\xF9\x8Au2\xCB'{t \xC9_g\xED>+\xA6\xECMZR\x8F\xC7 \xEE\xCB1
+\xEA@O\xF3\xD1u
+\xFD\xD8\xD0S[\xB3\xAAL\xB5,\xC9\xE2\xDA\xFCX;\x9B&\x89\xD0&\xAB\xFD\x82\xFAW縸G\x86po-\x8C\x98\xE9\xA9kKߛ\xA1\xF5L\x89bVh!묕\xE3\xABƲ\xEA\x9B\\xCBeOy\x82;[hSEܛ\xCA{\xA3ڥSj \xD6\xD8 !#!Aw\xADg\xA0"FS\x86 [c\xCF\xEDwo\x81\xF9\xF7]\xA0\xA6[\xE5Fo\x97\xA0\xB0tY\xA4 \xF25\x9A\x84X²o`LI\xD1ph\x8A\x97\x90@8]\xA7H枙Qh3 \x9D$\xB0CO\x93\x91J_\xE53\xFC \xF0(\xF1ϴlt\xA6K\xA0\xDED\x9F_\xB1%\xE00Ҏ\x99\xB5cX\xC7%ka\xB8ޘ\x96E\xFD \xC1E ĵ:\x86Jo*\\xF0|\xF6-`\xB4\xF2/$v\x9Å \x9Au\xEA\xD6 \x99\x81\xF4+Y8\xE8 \xFEo$I\xE9l4\xBD\xF35\x87"s;a\xE6\xAB+\xC0\x85\xC0c\xF0\x9E\xC6\xB1o4\xD0ѢWz$\xCF\xC9\x9C\xED\x98O2\xC0\x93\xB43+CYB\xB2\xC4\xE8\x8A\xF1f\xB9Q\xE5K\xE1\xF6Ȩ&\xDElVOǧQK\x93+Bg\x82\x87\xAE\x8Dm97\xA7 \xF1+/Ns\xC7\xC2iN\x8D\xBD\xF31\x90Bp'1轮\xC7Vw\xBE \x83\xA37b\xA5 \x88\xC3O\xCB\xF4K\xA9\x8C)ȹ4\xE5\xD1k \xF6\x9E\xFF\xB9u`F \n\xCA\xC1oU$\xAESm\xED\xA5\xF4\x98'\xC9\x94\xD1J \xECzзBVZͥ7\xF6ʅ\xD8z.\xA7+\xB8\x9E\x98m4\xF1\xBE,\xF2\xD8C.\xA39\xAAQl\x844a\xBA\xFAЦ\xB3\xD1\xC86A[t\xB7
+\xA4\xA5\x9D\xBF#\x86\x9A\xE14\xB2\xB2>B\xDF\xCC]l&\xDDI\xD8V\\x9D\xC23\xAC\xA5si~\xAD\xE5R<"\xFE\xA0Y\xAA^\xE6\xB5\xEF\x91w\x8C\xCEl\xC0\xC4\xC1\xB4s\x8AC\xD7+\xCC\xE7>\x86ũ^\x90 \x84Ҷ\xCD&̓ \xF7$\xD8Ԣ4Y\xCC\xE9"o{ 9͡\x93UR\x8B\xE6\xFB \xEB9v\xA5\xF2\xCD;qg\xA7\xEC^\xD7\xCF#\xD4\xEBa,\x85\xC9|\xBA0\xA7\xAC\xF3\x8D\x99\xD3j\xBA\xE3<\x8C"\xCCvr\xDD+~\xD1a7a\xE9\xB12l{\xD3#e\xD5\xC0,Rq+-\xBF\xFE D
+\xD2F آ\xC3x+_z\xDB\xE5
+Ee\xE5q\xF9\xFE\xF0`\xE5\x89\xF9\x96~\xC6+\xF0\xD0ɡy( \x88\x9D\xAE]\x80\xA7פ>\xF9
+"\x9B\xEA\xB4~Ӥ\xB5[\xA0\xC6Z\xC5$9\xD8\xE0\xF2 \x84]W\xC8 8\xBD \xBD\xE1\xA8\xC4\xE3\xE5\xD1eMn>q\xED\x8D(l\xE8 mAq\xD1:\xFA?8!\xF1xex\xDDɃ\x9B\x9D\x8D\xE8\x94k\xF7_ \xAC\xF2\xB69J\xAD\xFEХ|\xAF\xF3\xE1\xF0\xFC}\xFD\xB7.+?t \xADE\xDC\xF8r{k\xDB\xF7+\xB8\xD9\xDF\xF1\x8A\xBB\xF2\xE1- oYxx˂\xFB<\xBCe\xE1\xE1- ˟\x87\xB7,<\xBCe\xE1\xE1- oYh&\xED\xE1- 7&\xF5\xE1- \xFFoP\x96*\x94-8\x8A\xFFP\xEFZX[6\xBCn!\xDBBS\xEA\xAAP?/lqSv\xFEPK
+++\xBDh\xF6\xE3\x8E \xC7 {>\xCF\xF8\x8Ep\xE2e\xD8G\xB7k\xF4\xBB\xF7\xC5\xF3\xE3 :\xFA\x82\x93\x94T\x8D\x9E\x8F\xFEc\xF4\xD7\xDF\xFE\xE3\xC51"?~%\x99.\xF0\xFD\xED9z\xFE\xF7\xEF\xBE}\xF1\xDD\xF3G o\xCEы\xBF>\xFF\x96U\x94Y\x88O/# EGo\xE3\xC9\xE7 \x8B \x8D\xE7 =\xFFOt\xF6\xFE\xF2\xF8\x871\xCB\xF2\xE4\x87\xCE<y \xFC\xE3\x81O\xAA?@\x938\xCAp\x94\xFDx+f\xF8k6\x9E\xA4\xE9\x9A'x\xFA\xE3\xC1h\x9C\xE7\xD1tZۏא \xD4Ƽ己\xBF&\xFF\xA4\x93$Xf*5@\x80\xA5 \x9C>O\xF9_0EGa<\xF1@#\xA8j@\xAF\xA6GO\x83\xF4\x84\xC3 \x91ҏY\xB2\xC2O\x8Fя?\xA2\x93\xE7\xC7\xE8\xFF\xA3E\xE1K/!
+`W \xF8\x833\xD5+\x8B\xFEXA\xD9\xC9\xDCK\xD0\xFFKD6\xF724\xF1V)&d"\xF44C<\xF3Bҏ(\xF4T%\x9E"\x9C$qBe\xAF\xF0\x81(\xF0<X\xB0>u\xB1\xE8\xF589\xE1\xBC\xFC\xE1 T(\x9A\x9Dj: \xE9l\xEC\xDBchd\xB9\x959\xEF\xB7\xD8[e\xC1t\x8D\x96\xE1jDhJ\xD8\xF9\xFD\xFF\xACp\xB2F\xD3$^ \xAES2^\xDF\xD9\xEDj\xF2\x99 I0d\x87^\x92N\xE2$\xC2a\xB0JS \x8D)\x99u<\x9D\xC4> \x97\xDB\xD3<@)9\xE1_|\xE9\xFC\xA5\x97\xE2\x8F ޠ \xD1\xD3\xD1\xF8\xF7t\x9C\xCEO^\x8C\x9E\x8F\xFE\xF6\xBD?\xFD^\xA5-\xD3\xFAP\x9AL@u\xD1\xDF\xFF\x80v\x9E\xC0\xF4\xB0\xA2\xD1﴿\xF6\xA67bX\M\xCF 'U\x91\xFFOt\xB6\\x86k!\xB3\x80\x8D\xE5(\x9E"\x80 \xFDϱJ*\xE9\xABп|E\xB0\x9Cza\x8A\xBF/\xE5
+\xA6G\xFF6c\xEC"
+0\xFA\xE6\xEDS|e\xCA'\xAE\x86\xC7\xE8\xF4\x9F\xC7E\xBA0g|\xFF\xA4J\xF7/y.u*\xC9\xFF\xF7o\xB0ȄdG\xBA|tu\x81\xD1w\xE8\xE9\xABI,S\xFC\xF4\x996\xDBm\xB2"g\xFA \xFA\xE7S\x98U\x9E\xFEK\x93뿏+\xBC
+\xB4Ċ\x81\xA8 \xEFLO\xB5yYM\xA3Q\x82dP<˲$\xB8]e\xA4\xAF\x94W\xD1s\xA4o3" \x81l\x95D\xA4IA:\xC2\xDEd~\xD4Z\x82q穵\xFC\xDBh\xE1-\x8F(\x8D<\xFDY^y\x90\xE1E=9\xC9d\xC1XTV \xADz\x96\x82\xC5 x\xA1|...
[truncated message content] |
|
From: <br...@us...> - 2016-01-09 04:09:08
|
Revision: 3993
http://sourceforge.net/p/openlcb/svn/3993
Author: bracz
Date: 2016-01-09 04:09:06 +0000 (Sat, 09 Jan 2016)
Log Message:
-----------
Adds accessor for the value to the BitProducerConsumer.
Adds unit tests.
Modified Paths:
--------------
trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java
trunk/prototypes/java/test/org/openlcb/implementations/BitProducerConsumerTest.java
trunk/prototypes/java/test/org/openlcb/implementations/PackageTest.java
Modified: trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java 2016-01-09 04:08:48 UTC (rev 3992)
+++ trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java 2016-01-09 04:09:06 UTC (rev 3993)
@@ -38,6 +38,17 @@
});
}
+ public synchronized VersionedValue<Boolean> getValue(boolean defaultValue) {
+ if(value == null) {
+ value = new VersionedValue<>(defaultValue);
+ }
+ return value;
+ }
+
+ public VersionedValue<Boolean> getValue() {
+ return value;
+ }
+
private EventState getOnEventState() {
if (value == null) return EventState.Unknown;
if (value.getLatestData()) return EventState.Valid;
Modified: trunk/prototypes/java/test/org/openlcb/implementations/BitProducerConsumerTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/BitProducerConsumerTest.java 2016-01-09 04:08:48 UTC (rev 3992)
+++ trunk/prototypes/java/test/org/openlcb/implementations/BitProducerConsumerTest.java 2016-01-09 04:09:06 UTC (rev 3993)
@@ -1,77 +1,185 @@
package org.openlcb.implementations;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.openlcb.AbstractConnection;
-import org.openlcb.Connection;
import org.openlcb.EventID;
-import org.openlcb.FakeOlcbInterface;
-import org.openlcb.Message;
+import org.openlcb.NodeID;
-import java.util.List;
+import static org.mockito.Mockito.*;
/**
* Created by bracz on 1/8/16.
*/
-public class BitProducerConsumerTest extends TestCase {
+public class BitProducerConsumerTest extends org.openlcb.InterfaceTestBase {
public static final EventID onEvent = new EventID(new byte[]{5, 4, 3, 2, 1, 0, 7, 8});
public static final EventID offEvent = new EventID(new byte[]{5, 4, 3, 2, 1, 0, 7, 9});
- FakeOlcbInterface iface = new FakeOlcbInterface();
+ BitProducerConsumer pc;
- public BitProducerConsumerTest(String s) {
- super(s);
+ public void testHandleIdentifyConsumers() throws Exception {
+ sendFrameAndExpectResult( //
+ ":X198F4444N0504030201000709;",
+ ":X194C7333N0504030201000709;");
+ sendFrameAndExpectResult( //
+ ":X198F4444N0504030201000708;",
+ ":X194C7333N0504030201000708;");
+ // Sets to on.
+ sendFrame(":X195B4444N0504030201000708;");
+
+ sendFrameAndExpectResult( //
+ ":X198F4444N0504030201000709;",
+ ":X194C5333N0504030201000709;");
+ sendFrameAndExpectResult( //
+ ":X198F4444N0504030201000708;",
+ ":X194C4333N0504030201000708;");
+
+ // Sets to off.
+ sendFrame(":X195B4444N0504030201000709;");
+
+ sendFrameAndExpectResult( //
+ ":X198F4444N0504030201000709;",
+ ":X194C4333N0504030201000709;");
+ sendFrameAndExpectResult( //
+ ":X198F4444N0504030201000708;",
+ ":X194C5333N0504030201000708;");
}
- // Main entry point
- static public void main(String[] args) {
- String[] testCaseName = {BitProducerConsumerTest.class.getName()};
- junit.swingui.TestRunner.main(testCaseName);
+ public void testHandleIdentifyProducers() throws Exception {
+ sendFrameAndExpectResult( //
+ ":X19914444N0504030201000708;",
+ ":X19547333N0504030201000708;");
+ sendFrameAndExpectResult( //
+ ":X19914444N0504030201000709;",
+ ":X19547333N0504030201000709;");
+
+ // Sets to on.
+ sendFrame(":X195B4444N0504030201000708;");
+ sendFrameAndExpectResult( //
+ ":X19914444N0504030201000708;",
+ ":X19544333N0504030201000708;");
+ sendFrameAndExpectResult( //
+ ":X19914444N0504030201000709;",
+ ":X19545333N0504030201000709;");
+
+ // Sets to off.
+ sendFrame(":X195B4444N0504030201000709;");
+ sendFrameAndExpectResult( //
+ ":X19914444N0504030201000708;",
+ ":X19545333N0504030201000708;");
+ sendFrameAndExpectResult( //
+ ":X19914444N0504030201000709;",
+ ":X19544333N0504030201000709;");
}
- // test suite from all defined tests
- public static Test suite() {
- TestSuite suite = new TestSuite(BitProducerConsumerTest.class);
- return suite;
+ public void testHandleProducerIdentified() throws Exception {
+ helperInputSetClear(":X19544333N0504030201000708;", ":X19545333N0504030201000708;");
}
- public void testHandleIdentifyConsumers() throws Exception {
+ public void testHandleProducerIdentifiedOff() throws Exception {
+ helperInputSetClear(":X19545333N0504030201000709;", ":X19544333N0504030201000709;");
+ }
+ public void testHandleProducerIdentifiedOnOff() throws Exception {
+ helperInputSetClear(":X19544333N0504030201000708;", ":X19544333N0504030201000709;");
}
- public void testHandleIdentifyProducers() throws Exception {
+ public void helperInputSetClear(String frameOn, String frameOff) {
+ assertNull(pc.getValue());
+ sendFrame(frameOn);
+ assertNotNull(pc.getValue());
+ assertTrue(pc.getValue().getLatestData());
+ sendFrame(frameOff);
+ assertFalse(pc.getValue().getLatestData());
- }
+ MockVersionedValueListener<Boolean> listener = new MockVersionedValueListener<>(pc
+ .getValue());
- public void testHandleProducerIdentified() throws Exception {
+ verifyNoMoreInteractions(listener.stub);
+ reset(listener.stub);
+ sendFrame(frameOn);
+ assertTrue(pc.getValue().getLatestData());
+ verify(listener.stub).update(true);
+ verifyNoMoreInteractions(listener.stub);
+ reset(listener.stub);
+
+ // Sending the same thing again shall not update.
+ sendFrame(frameOn);
+ verifyNoMoreInteractions(listener.stub);
+ reset(listener.stub);
+
+ sendFrame(frameOff);
+ verify(listener.stub).update(false);
+ verifyNoMoreInteractions(listener.stub);
+ reset(listener.stub);
+ assertFalse(pc.getValue().getLatestData());
}
public void testHandleConsumerIdentified() throws Exception {
+ helperInputSetClear(":X194C4333N0504030201000708;", ":X194C5333N0504030201000708;");
+ }
+ public void testHandleConsumerIdentifiedOff() throws Exception {
+ helperInputSetClear(":X194C5333N0504030201000709;", ":X194C4333N0504030201000709;");
}
+ public void testHandleConsumerIdentifiedOnOff() throws Exception {
+ helperInputSetClear(":X194C4333N0504030201000708;", ":X194C4333N0504030201000709;");
+ }
+
public void testHandleProducerConsumerEventReport() throws Exception {
+ helperInputSetClear(":X195B4333N0504030201000708;", ":X195B4333N0504030201000709;");
+ }
+ public void testHandleIdentifyEventsUnknown() throws Exception {
+ sendFrame(":X19968444N0333;");
+ //sendFrame(":X19970444N;");
+ expectFrame(":X19547333N0504030201000708;");
+ expectFrame(":X19547333N0504030201000709;");
+ expectFrame(":X194C7333N0504030201000708;");
+ expectFrame(":X194C7333N0504030201000709;");
}
- public void testHandleIdentifyEvents() throws Exception {
+ public void testHandleIdentifyEventsKnown() throws Exception {
+ sendFrame(":X194C5333N0504030201000709;");
+ sendFrame(":X19968444N0333;");
- }
+ expectFrame(":X19544333N0504030201000708;");
+ expectFrame(":X19545333N0504030201000709;");
+ expectFrame(":X194C4333N0504030201000708;");
+ expectFrame(":X194C5333N0504030201000709;");
- BitProducerConsumer pc;
+ sendFrame(":X194C4333N0504030201000709;");
+ sendFrame(":X19968444N0333;");
- private List<Message> sentMessages() {
- return iface.fakeOutputConnection.history;
+ expectFrame(":X19545333N0504030201000708;");
+ expectFrame(":X19544333N0504030201000709;");
+ expectFrame(":X194C5333N0504030201000708;");
+ expectFrame(":X194C4333N0504030201000709;");
+
+ // Other target
+ sendFrame(":X19968444N0444;");
+ expectNoFrames();
}
@Override
+ protected void tearDown() throws Exception {
+ expectNoFrames();
+ super.tearDown();
+ }
+
+ @Override
public void setUp() {
iface.fakeOutputConnection.history.clear();
+ aliasMap.insert(0x444, new NodeID(new byte[]{1,2,3,1,2,3}));
pc = new BitProducerConsumer(iface, onEvent, offEvent);
- assertEquals("init-size", 8, sentMessages().size());
+ expectFrame(":X19547333N0504030201000708;");
+ expectFrame(":X19547333N0504030201000709;");
+ expectFrame(":X194C7333N0504030201000708;");
+ expectFrame(":X194C7333N0504030201000709;");
+ expectFrame(":X19547333N0504030201000708;");
+ expectFrame(":X19914333N0504030201000708;");
+ expectFrame(":X194C7333N0504030201000708;");
+ expectFrame(":X198F4333N0504030201000708;");
+ expectNoFrames();
}
}
\ No newline at end of file
Modified: trunk/prototypes/java/test/org/openlcb/implementations/PackageTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/PackageTest.java 2016-01-09 04:08:48 UTC (rev 3992)
+++ trunk/prototypes/java/test/org/openlcb/implementations/PackageTest.java 2016-01-09 04:09:06 UTC (rev 3993)
@@ -50,6 +50,7 @@
suite.addTest(MemoryConfigurationServiceTest.suite());
suite.addTest(org.openlcb.implementations.throttle.PackageTest.suite());
+ suite.addTest(new TestSuite(BitProducerConsumerTest.class));
return suite;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2016-01-14 17:43:41
|
Revision: 3997
http://sourceforge.net/p/openlcb/svn/3997
Author: bracz
Date: 2016-01-14 17:43:40 +0000 (Thu, 14 Jan 2016)
Log Message:
-----------
Fixes initialization bug with getValue.
Adds unit tests for sending out event reports to the network.
Modified Paths:
--------------
trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java
trunk/prototypes/java/test/org/openlcb/implementations/BitProducerConsumerTest.java
Modified: trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java 2016-01-10 16:34:08 UTC (rev 3996)
+++ trunk/prototypes/java/src/org/openlcb/implementations/BitProducerConsumer.java 2016-01-14 17:43:40 UTC (rev 3997)
@@ -40,7 +40,7 @@
public synchronized VersionedValue<Boolean> getValue(boolean defaultValue) {
if(value == null) {
- value = new VersionedValue<>(defaultValue);
+ setValueFromNetwork(defaultValue);
}
return value;
}
Modified: trunk/prototypes/java/test/org/openlcb/implementations/BitProducerConsumerTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/BitProducerConsumerTest.java 2016-01-10 16:34:08 UTC (rev 3996)
+++ trunk/prototypes/java/test/org/openlcb/implementations/BitProducerConsumerTest.java 2016-01-14 17:43:40 UTC (rev 3997)
@@ -160,6 +160,29 @@
expectNoFrames();
}
+ public void testGenerateEvents() throws Exception {
+ VersionedValue<Boolean> v = pc.getValue(false);
+ sendFrameAndExpectResult( //
+ ":X19914444N0504030201000708;",
+ ":X19545333N0504030201000708;");
+
+ expectNoFrames();
+
+ v.set(false);
+ expectNoFrames();
+
+ v.set(true);
+ expectFrame(":X195B4333N0504030201000708;");
+ expectNoFrames();
+
+ v.set(true);
+ expectNoFrames();
+
+ v.set(false);
+ expectFrame(":X195B4333N0504030201000709;");
+ expectNoFrames();
+ }
+
@Override
protected void tearDown() throws Exception {
expectNoFrames();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X