Skip to content

Commit 3e8fe33

Browse files
authored
Merge pull request #108 from pabender/master
more new tests
2 parents 184334b + 48493d1 commit 3e8fe33

File tree

6 files changed

+183
-13
lines changed

6 files changed

+183
-13
lines changed

test/org/openlcb/messages/PackageTest.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,7 @@
33
import junit.framework.Test;
44
import junit.framework.TestCase;
55
import junit.framework.TestSuite;
6-
7-
import org.openlcb.implementations.BlueGoldEngineTest;
8-
import org.openlcb.implementations.DatagramMeteringBufferTest;
9-
import org.openlcb.implementations.DatagramReceiverTest;
10-
import org.openlcb.implementations.DatagramServiceTest;
11-
import org.openlcb.implementations.DatagramTransmitterTest;
12-
import org.openlcb.implementations.EventFilterGatewayTest;
13-
import org.openlcb.implementations.MemoryConfigurationServiceTest;
14-
import org.openlcb.implementations.ScatterGatherTest;
15-
import org.openlcb.implementations.SingleConsumerNodeTest;
16-
import org.openlcb.implementations.SingleProducerNodeTest;
17-
import org.openlcb.implementations.StreamReceiverTest;
18-
import org.openlcb.implementations.StreamTransmitterTest;
6+
import junit.framework.JUnit4TestAdapter;
197

208
/**
219
* @author Bob Jacobsen Copyright 2009, 2012
@@ -42,6 +30,9 @@ public static Test suite() {
4230
TestSuite suite = new TestSuite(PackageTest.class);
4331

4432
suite.addTest(TractionControlRequestMessageTest.suite());
33+
suite.addTest(new JUnit4TestAdapter(TractionControlReplyMessageTest.class));
34+
suite.addTest(new JUnit4TestAdapter(TractionProxyRequestMessageTest.class));
35+
suite.addTest(new JUnit4TestAdapter(TractionProxyReplyMessageTest.class));
4536

4637
return suite;
4738
}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package org.openlcb.messages;
2+
3+
import org.junit.After;
4+
import org.junit.Assert;
5+
import org.junit.Assume;
6+
import org.junit.Before;
7+
import org.junit.Ignore;
8+
import org.junit.Test;
9+
import org.openlcb.*;
10+
11+
/**
12+
*
13+
* @author Paul Bender Copyright (C) 2017
14+
*/
15+
public class TractionControlReplyMessageTest {
16+
17+
@Test
18+
public void testCTor() {
19+
NodeID src = new NodeID(new byte[]{6,5,5,4,4,3});
20+
NodeID dst = new NodeID(new byte[]{2,2,2,4,4,4});
21+
byte[] payload = new byte[]{0x40,0x01,0x00}; // Traciton Management Reply message
22+
TractionControlReplyMessage t = new TractionControlReplyMessage(src,dst,payload);
23+
Assert.assertNotNull("exists",t);
24+
}
25+
26+
@Test
27+
public void testGetcommand(){
28+
NodeID src = new NodeID(new byte[]{6,5,5,4,4,3});
29+
NodeID dst = new NodeID(new byte[]{2,2,2,4,4,4});
30+
byte[] payload = new byte[]{0x40,0x01,0x00}; // Traciton Management Reply message
31+
TractionControlReplyMessage t = new TractionControlReplyMessage(src,dst,payload);
32+
Assert.assertEquals("command",0x40,t.getCmd());
33+
}
34+
35+
// The minimal setup for log4J
36+
@Before
37+
public void setUp() {
38+
}
39+
40+
@After
41+
public void tearDown() {
42+
}
43+
44+
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package org.openlcb.messages;
2+
3+
import org.junit.After;
4+
import org.junit.Assert;
5+
import org.junit.Assume;
6+
import org.junit.Before;
7+
import org.junit.Ignore;
8+
import org.junit.Test;
9+
import org.openlcb.*;
10+
11+
/**
12+
*
13+
* @author Paul Bender Copyright (C) 2017
14+
*/
15+
public class TractionProxyReplyMessageTest {
16+
17+
@Test
18+
public void testCTor() {
19+
NodeID src = new NodeID(new byte[]{6,5,5,4,4,3});
20+
NodeID dst = new NodeID(new byte[]{2,2,2,4,4,4});
21+
byte[] payload = new byte[]{0x40,0x01,0x00}; // Traciton Management Reply message
22+
TractionProxyReplyMessage t = new TractionProxyReplyMessage(src,dst,payload);
23+
Assert.assertNotNull("exists",t);
24+
}
25+
26+
// The minimal setup for log4J
27+
@Before
28+
public void setUp() {
29+
}
30+
31+
@After
32+
public void tearDown() {
33+
}
34+
35+
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package org.openlcb.messages;
2+
3+
import org.junit.After;
4+
import org.junit.Assert;
5+
import org.junit.Assume;
6+
import org.junit.Before;
7+
import org.junit.Ignore;
8+
import org.junit.Test;
9+
import org.openlcb.*;
10+
11+
/**
12+
*
13+
* @author Paul Bender Copyright (C) 2017
14+
*/
15+
public class TractionProxyRequestMessageTest {
16+
17+
@Test
18+
public void testCTor() {
19+
NodeID src = new NodeID(new byte[]{6,5,5,4,4,3});
20+
NodeID dst = new NodeID(new byte[]{2,2,2,4,4,4});
21+
byte[] payload = new byte[]{0x40,0x01,0x00}; // Traciton Management Reply message
22+
TractionProxyRequestMessage t = new TractionProxyRequestMessage(src,dst,payload);
23+
Assert.assertNotNull("exists",t);
24+
}
25+
26+
// The minimal setup for log4J
27+
@Before
28+
public void setUp() {
29+
}
30+
31+
@After
32+
public void tearDown() {
33+
}
34+
35+
}
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
package org.openlcb.swing.networktree;
2+
3+
import org.junit.After;
4+
import org.junit.Assert;
5+
import org.junit.Assume;
6+
import org.junit.Before;
7+
import org.junit.Ignore;
8+
import org.junit.Test;
9+
import java.awt.GraphicsEnvironment;
10+
import org.openlcb.*;
11+
import java.util.Collection;
12+
import javax.swing.tree.DefaultMutableTreeNode;
13+
import javax.swing.tree.DefaultTreeModel;
14+
15+
/**
16+
*
17+
* @author Paul Bender Copyright (C) 2017
18+
*/
19+
public class NodeTreeRepTest {
20+
21+
@Test
22+
public void testCTor() {
23+
Assume.assumeFalse(GraphicsEnvironment.isHeadless());
24+
MimicNodeStore store = null;
25+
NodeID nid1 = new NodeID(new byte[]{1,3,3,4,5,6});
26+
NodeID nid2 = new NodeID(new byte[]{2,3,3,4,5,6});
27+
28+
ProducerIdentifiedMessage pim1 = new ProducerIdentifiedMessage(nid1,
29+
new EventID(new byte[]{1,0,0,0,0,0,1,0}), EventState.Unknown);
30+
Connection connection = new AbstractConnection() {
31+
public void put(Message msg, Connection sender) {
32+
}
33+
};
34+
store = new MimicNodeStore(connection, nid1);
35+
store.put(pim1,null);
36+
Collection<MimicNodeStore.NodeMemo> list = store.getNodeMemos();
37+
38+
DefaultMutableTreeNode nodes = new DefaultMutableTreeNode("OpenLCB Network");
39+
DefaultTreeModel treeModel = new DefaultTreeModel(nodes);
40+
NodeTreeRep.SelectionKeyLoader loader = new NodeTreeRep.SelectionKeyLoader() {
41+
public NodeTreeRep.SelectionKey cdiKey(String name, NodeID node) {
42+
return new NodeTreeRep.SelectionKey(name, node) {
43+
public void select(DefaultMutableTreeNode rep) {
44+
System.out.println("Making special fuss over: "+rep+" for "+name+" on "+node);
45+
}
46+
};
47+
}
48+
};
49+
50+
NodeTreeRep t = new NodeTreeRep((MimicNodeStore.NodeMemo)list.toArray()[0],store,treeModel,loader);
51+
Assert.assertNotNull("exists",t);
52+
}
53+
54+
// The minimal setup for log4J
55+
@Before
56+
public void setUp() {
57+
}
58+
59+
@After
60+
public void tearDown() {
61+
}
62+
63+
}

test/org/openlcb/swing/networktree/PackageTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import junit.framework.Test;
55
import junit.framework.TestCase;
66
import junit.framework.TestSuite;
7+
import junit.framework.JUnit4TestAdapter;
78

89
import javax.swing.*;
910

@@ -34,6 +35,7 @@ static public void main(String[] args) {
3435
public static Test suite() {
3536
TestSuite suite = new TestSuite(PackageTest.class);
3637
suite.addTest(TreePaneTest.suite());
38+
suite.addTest(new JUnit4TestAdapter(NodeTreeRepTest.class));
3739

3840
return suite;
3941
}

0 commit comments

Comments
 (0)