From b5f909248804675f2c8f62cd2760dd9c67464840 Mon Sep 17 00:00:00 2001 From: Daniel Stonier <d.stonier@gmail.com> Date: Thu, 12 Sep 2013 16:17:26 +0900 Subject: [PATCH] message tests moved to rosjava_bootstrap/message_generator. --- .../internal/message/Md5GeneratorTest.java | 108 ------- .../message/MessageInterfaceBuilderTest.java | 55 ---- .../org/ros/internal/message/MessageTest.java | 124 -------- .../message/RawMessageSerializationTest.java | 203 ------------- .../org/ros/internal/message/ServiceTest.java | 51 ---- .../message/field/ArrayFieldTest.java | 272 ------------------ .../java/org/ros/message/DurationTest.java | 97 ------- .../test/java/org/ros/message/TimeTest.java | 102 ------- .../resources/geometry_msgs/msg/Point.msg | 4 - .../test/resources/geometry_msgs/msg/Pose.msg | 3 - .../geometry_msgs/msg/PoseWithCovariance.msg | 9 - .../geometry_msgs/msg/Quaternion.msg | 6 - .../resources/geometry_msgs/msg/Twist.msg | 3 - .../geometry_msgs/msg/TwistWithCovariance.msg | 9 - .../resources/geometry_msgs/msg/Vector3.msg | 5 - .../test/resources/nav_msgs/msg/Odometry.msg | 7 - .../src/test/resources/std_msgs/msg/Bool.msg | 1 - .../src/test/resources/std_msgs/msg/Byte.msg | 1 - .../resources/std_msgs/msg/ByteMultiArray.msg | 6 - .../src/test/resources/std_msgs/msg/Char.msg | 1 - .../test/resources/std_msgs/msg/ColorRGBA.msg | 4 - .../test/resources/std_msgs/msg/Duration.msg | 1 - .../src/test/resources/std_msgs/msg/Empty.msg | 0 .../test/resources/std_msgs/msg/Float32.msg | 1 - .../std_msgs/msg/Float32MultiArray.msg | 6 - .../test/resources/std_msgs/msg/Float64.msg | 1 - .../std_msgs/msg/Float64MultiArray.msg | 6 - .../test/resources/std_msgs/msg/Header.msg | 15 - .../src/test/resources/std_msgs/msg/Int16.msg | 1 - .../std_msgs/msg/Int16MultiArray.msg | 6 - .../src/test/resources/std_msgs/msg/Int32.msg | 1 - .../std_msgs/msg/Int32MultiArray.msg | 6 - .../src/test/resources/std_msgs/msg/Int64.msg | 1 - .../std_msgs/msg/Int64MultiArray.msg | 6 - .../src/test/resources/std_msgs/msg/Int8.msg | 1 - .../resources/std_msgs/msg/Int8MultiArray.msg | 6 - .../std_msgs/msg/MultiArrayDimension.msg | 3 - .../std_msgs/msg/MultiArrayLayout.msg | 26 -- .../test/resources/std_msgs/msg/String.msg | 1 - .../src/test/resources/std_msgs/msg/Time.msg | 1 - .../test/resources/std_msgs/msg/UInt16.msg | 1 - .../std_msgs/msg/UInt16MultiArray.msg | 6 - .../test/resources/std_msgs/msg/UInt32.msg | 1 - .../std_msgs/msg/UInt32MultiArray.msg | 6 - .../test/resources/std_msgs/msg/UInt64.msg | 1 - .../std_msgs/msg/UInt64MultiArray.msg | 6 - .../src/test/resources/std_msgs/msg/UInt8.msg | 1 - .../std_msgs/msg/UInt8MultiArray.msg | 6 - .../src/test/resources/std_srvs/srv/Empty.srv | 1 - .../test/resources/test_ros/msg/Composite.msg | 3 - .../resources/test_ros/msg/CompositeA.msg | 6 - .../resources/test_ros/msg/CompositeB.msg | 4 - .../resources/test_ros/msg/TestArrays.msg | 10 - .../resources/test_ros/msg/TestHeader.msg | 8 - .../resources/test_ros/msg/TestPrimitives.msg | 21 -- .../resources/test_ros/msg/TestString.msg | 6 - .../resources/test_ros/srv/AddTwoInts.srv | 4 - .../resources/test_rospy/msg/ArrayVal.msg | 2 - .../resources/test_rospy/msg/EmbedTest.msg | 6 - .../test/resources/test_rospy/msg/Floats.msg | 2 - .../test_rospy/msg/HeaderHeaderVal.msg | 2 - .../resources/test_rospy/msg/HeaderVal.msg | 2 - .../test_rospy/msg/PythonKeyword.msg | 1 - .../test_rospy/msg/TestConstants.msg | 15 - .../test_rospy/msg/TestFixedArray.msg | 16 -- .../test_rospy/msg/TransitiveImport.msg | 2 - .../test_rospy/msg/TransitiveMsg1.msg | 2 - .../test_rospy/msg/TransitiveMsg2.msg | 1 - .../src/test/resources/test_rospy/msg/Val.msg | 1 - .../test_rospy/srv/ConstantsMultiplex.srv | 26 -- .../resources/test_rospy/srv/EmptyReqSrv.srv | 2 - .../resources/test_rospy/srv/EmptyRespSrv.srv | 2 - .../resources/test_rospy/srv/EmptySrv.srv | 1 - .../resources/test_rospy/srv/ListReturn.srv | 7 - .../test_rospy/srv/MultipleAddTwoInts.srv | 8 - .../resources/test_rospy/srv/StringString.srv | 4 - .../test_rospy/srv/TransitiveSrv.srv | 4 - 77 files changed, 1357 deletions(-) delete mode 100644 rosjava_bootstrap/src/test/java/org/ros/internal/message/Md5GeneratorTest.java delete mode 100644 rosjava_bootstrap/src/test/java/org/ros/internal/message/MessageInterfaceBuilderTest.java delete mode 100644 rosjava_bootstrap/src/test/java/org/ros/internal/message/MessageTest.java delete mode 100644 rosjava_bootstrap/src/test/java/org/ros/internal/message/RawMessageSerializationTest.java delete mode 100644 rosjava_bootstrap/src/test/java/org/ros/internal/message/ServiceTest.java delete mode 100644 rosjava_bootstrap/src/test/java/org/ros/internal/message/field/ArrayFieldTest.java delete mode 100644 rosjava_bootstrap/src/test/java/org/ros/message/DurationTest.java delete mode 100644 rosjava_bootstrap/src/test/java/org/ros/message/TimeTest.java delete mode 100644 rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Point.msg delete mode 100644 rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Pose.msg delete mode 100644 rosjava_bootstrap/src/test/resources/geometry_msgs/msg/PoseWithCovariance.msg delete mode 100644 rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Quaternion.msg delete mode 100644 rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Twist.msg delete mode 100644 rosjava_bootstrap/src/test/resources/geometry_msgs/msg/TwistWithCovariance.msg delete mode 100644 rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Vector3.msg delete mode 100644 rosjava_bootstrap/src/test/resources/nav_msgs/msg/Odometry.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Bool.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Byte.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/ByteMultiArray.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Char.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/ColorRGBA.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Duration.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Empty.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Float32.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Float32MultiArray.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Float64.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Float64MultiArray.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Header.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Int16.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Int16MultiArray.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Int32.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Int32MultiArray.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Int64.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Int64MultiArray.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Int8.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Int8MultiArray.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/MultiArrayDimension.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/MultiArrayLayout.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/String.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/Time.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt16.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt16MultiArray.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt32.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt32MultiArray.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt64.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt64MultiArray.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt8.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt8MultiArray.msg delete mode 100644 rosjava_bootstrap/src/test/resources/std_srvs/srv/Empty.srv delete mode 100644 rosjava_bootstrap/src/test/resources/test_ros/msg/Composite.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_ros/msg/CompositeA.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_ros/msg/CompositeB.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_ros/msg/TestArrays.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_ros/msg/TestHeader.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_ros/msg/TestPrimitives.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_ros/msg/TestString.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_ros/srv/AddTwoInts.srv delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/msg/ArrayVal.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/msg/EmbedTest.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/msg/Floats.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/msg/HeaderHeaderVal.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/msg/HeaderVal.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/msg/PythonKeyword.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/msg/TestConstants.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/msg/TestFixedArray.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/msg/TransitiveImport.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/msg/TransitiveMsg1.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/msg/TransitiveMsg2.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/msg/Val.msg delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/srv/ConstantsMultiplex.srv delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/srv/EmptyReqSrv.srv delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/srv/EmptyRespSrv.srv delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/srv/EmptySrv.srv delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/srv/ListReturn.srv delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/srv/MultipleAddTwoInts.srv delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/srv/StringString.srv delete mode 100644 rosjava_bootstrap/src/test/resources/test_rospy/srv/TransitiveSrv.srv diff --git a/rosjava_bootstrap/src/test/java/org/ros/internal/message/Md5GeneratorTest.java b/rosjava_bootstrap/src/test/java/org/ros/internal/message/Md5GeneratorTest.java deleted file mode 100644 index 45a68724..00000000 --- a/rosjava_bootstrap/src/test/java/org/ros/internal/message/Md5GeneratorTest.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2011 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.ros.internal.message; - -import static org.junit.Assert.assertEquals; - -import org.ros.internal.message.definition.MessageDefinitionProviderChain; - -import org.junit.Before; -import org.junit.Test; -import org.ros.internal.message.service.ServiceDefinitionResourceProvider; -import org.ros.internal.message.service.ServiceDescription; -import org.ros.internal.message.service.ServiceDescriptionFactory; -import org.ros.internal.message.topic.TopicDefinitionResourceProvider; -import org.ros.internal.message.topic.TopicDescription; -import org.ros.internal.message.topic.TopicDescriptionFactory; - -/** - * @author damonkohler@google.com (Damon Kohler) - */ -public class Md5GeneratorTest { - - private TopicDescriptionFactory topicDescriptionFactory; - private ServiceDescriptionFactory serviceDescriptionFactory; - - @Before - public void setUp() { - MessageDefinitionProviderChain messageDefinitionProviderChain = - new MessageDefinitionProviderChain(); - messageDefinitionProviderChain - .addMessageDefinitionProvider(new TopicDefinitionResourceProvider()); - messageDefinitionProviderChain - .addMessageDefinitionProvider(new ServiceDefinitionResourceProvider()); - topicDescriptionFactory = new TopicDescriptionFactory(messageDefinitionProviderChain); - serviceDescriptionFactory = new ServiceDescriptionFactory(messageDefinitionProviderChain); - } - - @Test - public void testPrimitives() { - TopicDescription topicDescription = - topicDescriptionFactory.newFromType("test_ros/TestPrimitives"); - assertEquals("3e70f428a22c0d26ca67f87802c8e00f", topicDescription.getMd5Checksum()); - } - - @Test - public void testString() { - TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_ros/TestString"); - assertEquals("334ff4377be93faa44ebc66d23d40fd3", topicDescription.getMd5Checksum()); - } - - @Test - public void testHeader() { - TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_ros/TestHeader"); - assertEquals("4b5a00f536da2f756ba6aebcf795a967", topicDescription.getMd5Checksum()); - } - - @Test - public void testArrays() { - TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_ros/TestArrays"); - assertEquals("4cc9b5e2cebe791aa3e994f5bc159eb6", topicDescription.getMd5Checksum()); - } - - @Test - public void testComposite() { - TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_ros/Composite"); - assertEquals("d8fb6eb869ad3956b50e8737d96dc9fa", topicDescription.getMd5Checksum()); - } - - @Test - public void testOdometry() { - TopicDescription topicDescription = topicDescriptionFactory.newFromType("nav_msgs/Odometry"); - assertEquals("cd5e73d190d741a2f92e81eda573aca7", topicDescription.getMd5Checksum()); - } - - @Test - public void testEmpty() { - ServiceDescription serviceDescription = serviceDescriptionFactory.newFromType("std_srvs/Empty"); - assertEquals("d41d8cd98f00b204e9800998ecf8427e", serviceDescription.getMd5Checksum()); - } - - @Test - public void testAddTwoInts() { - ServiceDescription serviceDescription = - serviceDescriptionFactory.newFromType("test_ros/AddTwoInts"); - assertEquals("6a2e34150c00229791cc89ff309fff21", serviceDescription.getMd5Checksum()); - } - - @Test - public void testTransitiveSrv() { - ServiceDescription serviceDescription = - serviceDescriptionFactory.newFromType("test_rospy/TransitiveSrv"); - assertEquals("8b7918ee2b81eaf825f4c70de011f6fa", serviceDescription.getMd5Checksum()); - } -} diff --git a/rosjava_bootstrap/src/test/java/org/ros/internal/message/MessageInterfaceBuilderTest.java b/rosjava_bootstrap/src/test/java/org/ros/internal/message/MessageInterfaceBuilderTest.java deleted file mode 100644 index 38e53161..00000000 --- a/rosjava_bootstrap/src/test/java/org/ros/internal/message/MessageInterfaceBuilderTest.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.ros.internal.message; - -import static org.junit.Assert.assertEquals; - -import org.junit.Before; -import org.junit.Test; -import org.ros.internal.message.topic.TopicDefinitionResourceProvider; -import org.ros.message.MessageDeclaration; -import org.ros.message.MessageFactory; - -/** - * @author damonkohler@google.com (Damon Kohler) - */ -public class MessageInterfaceBuilderTest { - - private TopicDefinitionResourceProvider topicDefinitionResourceProvider; - private MessageFactory messageFactory; - - @Before - public void before() { - topicDefinitionResourceProvider = new TopicDefinitionResourceProvider(); - messageFactory = new DefaultMessageFactory(topicDefinitionResourceProvider); - } - - @Test - public void testDuplicateFieldNames() { - MessageInterfaceBuilder builder = new MessageInterfaceBuilder(); - builder.setPackageName("foo"); - builder.setInterfaceName("bar"); - builder.setMessageDeclaration(MessageDeclaration.of("foo/bar", "int32 foo\nint32 Foo")); - builder.setAddConstantsAndMethods(true); - String result = builder.build(messageFactory); - assertEquals("package foo;\n\n" - + "public interface bar extends org.ros.internal.message.Message {\n" - + " static final java.lang.String _TYPE = \"foo/bar\";\n" - + " static final java.lang.String _DEFINITION = \"int32 foo\\nint32 Foo\";\n" - + " int getFoo();\n" + " void setFoo(int value);\n" + "}\n", result); - } -} diff --git a/rosjava_bootstrap/src/test/java/org/ros/internal/message/MessageTest.java b/rosjava_bootstrap/src/test/java/org/ros/internal/message/MessageTest.java deleted file mode 100644 index fe80bb48..00000000 --- a/rosjava_bootstrap/src/test/java/org/ros/internal/message/MessageTest.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (C) 2011 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.ros.internal.message; - -import static org.junit.Assert.assertEquals; - -import com.google.common.collect.Lists; - -import org.junit.Before; -import org.junit.Test; -import org.ros.internal.message.topic.TopicDefinitionResourceProvider; -import org.ros.message.MessageFactory; - -/** - * @author damonkohler@google.com (Damon Kohler) - */ -public class MessageTest { - - private TopicDefinitionResourceProvider topicDefinitionResourceProvider; - private MessageFactory messageFactory; - - @Before - public void before() { - topicDefinitionResourceProvider = new TopicDefinitionResourceProvider(); - messageFactory = new DefaultMessageFactory(topicDefinitionResourceProvider); - } - - @Test - public void testCreateEmptyMessage() { - topicDefinitionResourceProvider.add("foo/foo", ""); - messageFactory.newFromType("foo/foo"); - } - - @Test - public void testCreateEmptyMessageWithBlankLines() { - topicDefinitionResourceProvider.add("foo/foo", "\n\n\n\n\n"); - messageFactory.newFromType("foo/foo"); - } - - @Test - public void testString() { - String data = "Hello, ROS!"; - RawMessage rawMessage = messageFactory.newFromType("std_msgs/String"); - rawMessage.setString("data", data); - assertEquals(data, rawMessage.getString("data")); - } - - @Test - public void testStringWithComments() { - topicDefinitionResourceProvider.add("foo/foo", "# foo\nstring data\n # string other data"); - String data = "Hello, ROS!"; - RawMessage rawMessage = messageFactory.newFromType("foo/foo"); - rawMessage.setString("data", data); - assertEquals(data, rawMessage.getString("data")); - } - - @Test - public void testInt8() { - byte data = 42; - RawMessage rawMessage = messageFactory.newFromType("std_msgs/Int8"); - rawMessage.setInt8("data", data); - assertEquals(data, rawMessage.getInt8("data")); - } - - @Test - public void testNestedMessage() { - topicDefinitionResourceProvider.add("foo/foo", "bar data"); - topicDefinitionResourceProvider.add("foo/bar", "int8 data"); - RawMessage fooMessage = messageFactory.newFromType("foo/foo"); - RawMessage barMessage = messageFactory.newFromType("foo/bar"); - fooMessage.setMessage("data", barMessage); - byte data = 42; - barMessage.setInt8("data", data); - assertEquals(data, fooMessage.getMessage("data").toRawMessage().getInt8("data")); - } - - @Test - public void testNestedMessageList() { - topicDefinitionResourceProvider.add("foo/foo", "bar[] data"); - topicDefinitionResourceProvider.add("foo/bar", "int8 data"); - RawMessage fooMessage = messageFactory.newFromType("foo/foo"); - RawMessage barMessage = messageFactory.newFromType("foo/bar"); - fooMessage.setMessageList("data", Lists.<Message>newArrayList(barMessage)); - byte data = 42; - barMessage.toRawMessage().setInt8("data", data); - assertEquals(data, fooMessage.getMessageList("data").get(0).toRawMessage().getInt8("data")); - } - - @Test - public void testConstantInt8() { - topicDefinitionResourceProvider.add("foo/foo", "int8 data=42"); - RawMessage rawMessage = messageFactory.newFromType("foo/foo"); - assertEquals(42, rawMessage.getInt8("data")); - } - - @Test - public void testConstantString() { - topicDefinitionResourceProvider.add("foo/foo", "string data=Hello, ROS! # comment "); - RawMessage rawMessage = messageFactory.newFromType("foo/foo"); - assertEquals("Hello, ROS! # comment", rawMessage.getString("data")); - } - - public void testInt8List() { - topicDefinitionResourceProvider.add("foo/foo", "int8[] data"); - RawMessage rawMessage = messageFactory.newFromType("foo/foo"); - byte[] data = new byte[] { (byte) 1, (byte) 2, (byte) 3 }; - rawMessage.setInt8Array("data", data); - assertEquals(data, rawMessage.getInt8Array("data")); - } -} \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/java/org/ros/internal/message/RawMessageSerializationTest.java b/rosjava_bootstrap/src/test/java/org/ros/internal/message/RawMessageSerializationTest.java deleted file mode 100644 index d5bf1bbc..00000000 --- a/rosjava_bootstrap/src/test/java/org/ros/internal/message/RawMessageSerializationTest.java +++ /dev/null @@ -1,203 +0,0 @@ -/* - * Copyright (C) 2011 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.ros.internal.message; - -import static org.junit.Assert.assertTrue; - -import com.google.common.collect.Lists; - -import org.jboss.netty.buffer.ChannelBuffer; -import org.junit.Before; -import org.junit.Test; -import org.ros.internal.message.topic.TopicDefinitionResourceProvider; -import org.ros.message.Duration; -import org.ros.message.MessageFactory; -import org.ros.message.Time; - -/** - * @author damonkohler@google.com (Damon Kohler) - */ -public class RawMessageSerializationTest { - - private TopicDefinitionResourceProvider topicDefinitionResourceProvider; - private MessageFactory messageFactory; - - @Before - public void before() { - topicDefinitionResourceProvider = new TopicDefinitionResourceProvider(); - messageFactory = new DefaultMessageFactory(topicDefinitionResourceProvider); - } - - private void checkSerializeAndDeserialize(Message message) { - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - DefaultMessageSerializer serializer = new DefaultMessageSerializer(); - serializer.serialize(message, buffer); - DefaultMessageDeserializer<RawMessage> deserializer = - new DefaultMessageDeserializer<RawMessage>(message.toRawMessage().getIdentifier(), - messageFactory); - RawMessage deserializedMessage = deserializer.deserialize(buffer); - assertTrue(message.equals(deserializedMessage)); - } - - @Test - public void testBool() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/Bool"); - rawMessage.setBool("data", true); - checkSerializeAndDeserialize(rawMessage); - rawMessage.setBool("data", false); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testInt8() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/Int8"); - rawMessage.setInt8("data", (byte) 42); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testUint8() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/UInt8"); - rawMessage.setUInt8("data", (byte) 42); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testInt16() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/Int16"); - rawMessage.setInt16("data", (short) 42); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testUInt16() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/UInt16"); - rawMessage.setUInt16("data", (short) 42); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testInt32() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/Int32"); - rawMessage.setInt32("data", 42); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testUInt32() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/UInt32"); - rawMessage.setUInt32("data", 42); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testInt64() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/Int64"); - rawMessage.setInt64("data", 42); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testUInt64() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/UInt64"); - rawMessage.setUInt64("data", 42); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testFloat32() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/Float32"); - rawMessage.setFloat32("data", 42); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testFloat64() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/Float64"); - rawMessage.setFloat64("data", 42); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testString() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/String"); - rawMessage.setString("data", "Hello, ROS!"); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testTime() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/Time"); - rawMessage.setTime("data", new Time()); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testDuration() { - RawMessage rawMessage = messageFactory.newFromType("std_msgs/Duration"); - rawMessage.setDuration("data", new Duration()); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testNestedMessage() { - topicDefinitionResourceProvider.add("foo/foo", "std_msgs/String data"); - RawMessage fooMessage = messageFactory.newFromType("foo/foo"); - RawMessage stringMessage = messageFactory.newFromType("std_msgs/String"); - stringMessage.setString("data", "Hello, ROS!"); - fooMessage.setMessage("data", stringMessage); - checkSerializeAndDeserialize(fooMessage); - } - - @Test - public void testNestedMessageArray() { - topicDefinitionResourceProvider.add("foo/foo", "std_msgs/String[] data"); - RawMessage fooMessage = messageFactory.newFromType("foo/foo"); - RawMessage stringMessageA = messageFactory.newFromType("std_msgs/String"); - stringMessageA.setString("data", "Hello, ROS!"); - RawMessage stringMessageB = messageFactory.newFromType("std_msgs/String"); - stringMessageB.setString("data", "Goodbye, ROS!"); - fooMessage.setMessageList("data", Lists.<Message>newArrayList(stringMessageA, stringMessageB)); - checkSerializeAndDeserialize(fooMessage); - } - - @Test - public void testChannelBuffer() { - topicDefinitionResourceProvider.add("foo/foo", "uint8[] data"); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - buffer.writeBytes(new byte[] { 1, 2, 3, 4, 5 }); - RawMessage rawMessage = messageFactory.newFromType("foo/foo"); - rawMessage.setChannelBuffer("data", buffer); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testInt32Array() { - topicDefinitionResourceProvider.add("foo/foo", "int32[] data"); - RawMessage rawMessage = messageFactory.newFromType("foo/foo"); - rawMessage.setInt32Array("data", new int[] { 1, 2, 3, 4, 5 }); - checkSerializeAndDeserialize(rawMessage); - } - - @Test - public void testFloat64Array() { - topicDefinitionResourceProvider.add("foo/foo", "float64[] data"); - RawMessage rawMessage = messageFactory.newFromType("foo/foo"); - rawMessage.setFloat64Array("data", new double[] { 1, 2, 3, 4, 5 }); - checkSerializeAndDeserialize(rawMessage); - } -} diff --git a/rosjava_bootstrap/src/test/java/org/ros/internal/message/ServiceTest.java b/rosjava_bootstrap/src/test/java/org/ros/internal/message/ServiceTest.java deleted file mode 100644 index decb7c33..00000000 --- a/rosjava_bootstrap/src/test/java/org/ros/internal/message/ServiceTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2011 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.ros.internal.message; - -import org.junit.Before; -import org.junit.Test; -import org.ros.internal.message.service.ServiceDefinitionResourceProvider; -import org.ros.internal.message.service.ServiceRequestMessageFactory; -import org.ros.internal.message.service.ServiceResponseMessageFactory; - -/** - * @author damonkohler@google.com (Damon Kohler) - */ -public class ServiceTest { - - private ServiceDefinitionResourceProvider serviceDefinitionResourceProvider; - private ServiceRequestMessageFactory serviceRequestMessageFactory; - private ServiceResponseMessageFactory serviceResponseMessageFactory; - - @Before - public void setUp() { - serviceDefinitionResourceProvider = new ServiceDefinitionResourceProvider(); - serviceDefinitionResourceProvider.add("foo/Echo", "string data\n---\nstring data"); - serviceRequestMessageFactory = - new ServiceRequestMessageFactory(serviceDefinitionResourceProvider); - serviceResponseMessageFactory = - new ServiceResponseMessageFactory(serviceDefinitionResourceProvider); - } - - @Test - public void testCreateEchoService() { - RawMessage request = serviceRequestMessageFactory.newFromType("foo/Echo"); - RawMessage response = serviceResponseMessageFactory.newFromType("foo/Echo"); - request.setString("data", "Hello, ROS!"); - response.setString("data", "Hello, ROS!"); - } -} diff --git a/rosjava_bootstrap/src/test/java/org/ros/internal/message/field/ArrayFieldTest.java b/rosjava_bootstrap/src/test/java/org/ros/internal/message/field/ArrayFieldTest.java deleted file mode 100644 index 7ebb2648..00000000 --- a/rosjava_bootstrap/src/test/java/org/ros/internal/message/field/ArrayFieldTest.java +++ /dev/null @@ -1,272 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.ros.internal.message.field; - -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; - -import org.ros.internal.message.MessageBuffers; - -import org.jboss.netty.buffer.ChannelBuffer; -import org.junit.Test; - -/** - * The following unit tests were created by inspecting the serialization of - * array fields using the ROS Python client library. - * - * @author damonkohler@google.com (Damon Kohler) - */ -public class ArrayFieldTest { - - @Test - public void testBooleanArrayFieldVariableSize() { - BooleanArrayField field = BooleanArrayField.newVariable("foo", -1); - boolean[] value = new boolean[] { true, false, true, false }; - field.setValue(value); - assertEquals(PrimitiveFieldType.BOOL, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = new byte[] { 4, 0, 0, 0, 1, 0, 1, 0 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } - - @Test - public void testBooleanArrayFieldFixedSize() { - BooleanArrayField field = BooleanArrayField.newVariable("foo", 4); - field.setValue(new boolean[] { true, false, true, false }); - assertEquals(PrimitiveFieldType.BOOL, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = new byte[] { 1, 0, 1, 0 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } - - @SuppressWarnings("deprecation") - @Test - public void testByteArrayFieldVariableSize() { - testByteArrayFieldVariableSize(PrimitiveFieldType.INT8); - testByteArrayFieldVariableSize(PrimitiveFieldType.BYTE); - testByteArrayFieldVariableSize(PrimitiveFieldType.UINT8); - testByteArrayFieldVariableSize(PrimitiveFieldType.CHAR); - } - - private void testByteArrayFieldVariableSize(FieldType type) { - ByteArrayField field = ByteArrayField.newVariable(type, "foo", -1); - field.setValue(new byte[] { 1, 2, 3, 4 }); - assertEquals(type, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = new byte[] { 4, 0, 0, 0, 1, 2, 3, 4 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } - - @SuppressWarnings("deprecation") - @Test - public void testByteArrayFieldFixedSize() { - testByteArrayFieldFixedSize(PrimitiveFieldType.INT8); - testByteArrayFieldFixedSize(PrimitiveFieldType.BYTE); - testByteArrayFieldFixedSize(PrimitiveFieldType.UINT8); - testByteArrayFieldFixedSize(PrimitiveFieldType.CHAR); - } - - private void testByteArrayFieldFixedSize(FieldType type) { - ByteArrayField field = ByteArrayField.newVariable(type, "foo", 4); - field.setValue(new byte[] { 1, 2, 3, 4 }); - assertEquals(type, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = new byte[] { 1, 2, 3, 4 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } - - @Test - public void testDoubleArrayFieldVariableSize() { - DoubleArrayField field = DoubleArrayField.newVariable("foo", -1); - field.setValue(new double[] { 1, 2, 3, 4 }); - assertEquals(PrimitiveFieldType.FLOAT64, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = - new byte[] { 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16, 63, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, - 0, 8, 64, 0, 0, 0, 0, 0, 0, 16, 64 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } - - @Test - public void testDoubleArrayFieldFixedSize() { - DoubleArrayField field = DoubleArrayField.newVariable("foo", 4); - field.setValue(new double[] { 1, 2, 3, 4 }); - assertEquals(PrimitiveFieldType.FLOAT64, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = - new byte[] { 0, 0, 0, 0, 0, 0, -16, 63, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 8, 64, - 0, 0, 0, 0, 0, 0, 16, 64 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } - - @Test - public void testFloatArrayFieldVariableSize() { - FloatArrayField field = FloatArrayField.newVariable("foo", -1); - field.setValue(new float[] { 1, 2, 3, 4 }); - assertEquals(PrimitiveFieldType.FLOAT32, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = - new byte[] { 4, 0, 0, 0, 0, 0, -128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 0, 0, -128, 64 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } - - @Test - public void testFloatArrayFieldFixedSize() { - FloatArrayField field = FloatArrayField.newVariable("foo", 4); - field.setValue(new float[] { 1, 2, 3, 4 }); - assertEquals(PrimitiveFieldType.FLOAT32, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = new byte[] { 0, 0, -128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 0, 0, -128, 64 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } - - @Test - public void testIntegerArrayFieldVariableSize() { - testIntegerArrayFieldVariableSize(PrimitiveFieldType.INT32); - testIntegerArrayFieldVariableSize(PrimitiveFieldType.UINT32); - } - - private void testIntegerArrayFieldVariableSize(FieldType type) { - IntegerArrayField field = IntegerArrayField.newVariable(type, "foo", -1); - field.setValue(new int[] { 1, 2, 3, 4 }); - assertEquals(type, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = new byte[] { 4, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0, 0 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } - - @Test - public void testIntegerArrayFieldFixedSize() { - testIntegerArrayFieldFixedSize(PrimitiveFieldType.INT32); - testIntegerArrayFieldFixedSize(PrimitiveFieldType.UINT32); - } - - private void testIntegerArrayFieldFixedSize(FieldType type) { - IntegerArrayField field = IntegerArrayField.newVariable(type, "foo", 4); - field.setValue(new int[] { 1, 2, 3, 4 }); - assertEquals(type, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = new byte[] { 1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0, 0 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } - - @Test - public void testLongArrayFieldVariableSize() { - testLongArrayFieldVariableSize(PrimitiveFieldType.INT64); - testLongArrayFieldVariableSize(PrimitiveFieldType.UINT64); - } - - private void testLongArrayFieldVariableSize(FieldType type) { - LongArrayField field = LongArrayField.newVariable(type, "foo", -1); - field.setValue(new long[] { 1, 2, 3, 4 }); - assertEquals(type, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = - new byte[] { 4, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 4, 0, 0, 0, 0, 0, 0, 0 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } - - @Test - public void testLongArrayFieldFixedSize() { - testLongArrayFieldFixedSize(PrimitiveFieldType.INT64); - testLongArrayFieldFixedSize(PrimitiveFieldType.UINT64); - } - - private void testLongArrayFieldFixedSize(FieldType type) { - LongArrayField field = LongArrayField.newVariable(type, "foo", 4); - field.setValue(new long[] { 1, 2, 3, 4 }); - assertEquals(type, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = - new byte[] { 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4, 0, - 0, 0, 0, 0, 0, 0 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } - - @Test - public void testShortArrayFieldVariableSize() { - testShortArrayFieldVariableSize(PrimitiveFieldType.INT16); - testShortArrayFieldVariableSize(PrimitiveFieldType.UINT16); - } - - private void testShortArrayFieldVariableSize(FieldType type) { - ShortArrayField field = ShortArrayField.newVariable(type, "foo", -1); - field.setValue(new short[] { 1, 2, 3, 4 }); - assertEquals(type, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = new byte[] { 4, 0, 0, 0, 1, 0, 2, 0, 3, 0, 4, 0 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } - - @Test - public void testShortArrayFieldFixedSize() { - testShortArrayFieldFixedSize(PrimitiveFieldType.INT16); - testShortArrayFieldFixedSize(PrimitiveFieldType.UINT16); - } - - private void testShortArrayFieldFixedSize(FieldType type) { - ShortArrayField field = ShortArrayField.newVariable(type, "foo", 4); - field.setValue(new short[] { 1, 2, 3, 4 }); - assertEquals(type, field.getType()); - ChannelBuffer buffer = MessageBuffers.dynamicBuffer(); - field.serialize(buffer); - byte[] expected = new byte[] { 1, 0, 2, 0, 3, 0, 4, 0 }; - byte[] actual = new byte[buffer.readableBytes()]; - buffer.readBytes(actual); - assertArrayEquals(expected, actual); - } -} diff --git a/rosjava_bootstrap/src/test/java/org/ros/message/DurationTest.java b/rosjava_bootstrap/src/test/java/org/ros/message/DurationTest.java deleted file mode 100644 index fb337eb4..00000000 --- a/rosjava_bootstrap/src/test/java/org/ros/message/DurationTest.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (C) 2011 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.ros.message; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Before; -import org.junit.Test; - -/** - * @author kwc@willowgarage.com (Ken Conley) - */ -public class DurationTest { - - @Before - public void setUp() { - } - - @Test - public void testConstructor() { - // Test no args constructor. - Duration t = new Duration(); - assertEquals(0, t.nsecs); - assertEquals(0, t.secs); - - // Test secs/nsecs constructor with no normalization. - t = new Duration(1, 2); - assertEquals(1, t.secs); - assertEquals(2, t.nsecs); - - // Test secs/nsecs constructor with normalization. - t = new Duration(2, -1); - assertEquals(1, t.secs); - assertEquals(1000000000 - 1, t.nsecs); - - t = new Duration(2, 1000000000 + 2); - assertEquals(3, t.secs); - assertEquals(2, t.nsecs); - } - - @Test - public void testNormalize() { - Duration d = new Duration(0, 0); - d.secs = 1; - d.nsecs = 1000000000; - d.normalize(); - assertEquals(2, d.secs); - assertEquals(0, d.nsecs); - - d.secs = 1; - d.nsecs = -1; - d.normalize(); - assertEquals(0, d.secs); - assertEquals(1000000000-1, d.nsecs); - } - - @Test - public void testIsZero() { - assertTrue(new Duration(0, 0).isZero()); - assertFalse(new Duration(1, 0).isZero()); - assertFalse(new Duration(0, 1).isZero()); - } - - @Test - public void testComparable() { - assertEquals(0, new Duration(0, 0).compareTo(new Duration(0, 0))); - assertEquals(0, new Duration(1, 0).compareTo(new Duration(1, 0))); - - assertTrue(new Duration(0, 0).compareTo(new Duration(0, -1)) > 0); - assertTrue(new Duration(0, -1).compareTo(new Duration(0, 0)) < 0); - - assertTrue(new Duration(0, 0).compareTo(new Duration(-1, 0)) > 0); - assertTrue(new Duration(-1, 0).compareTo(new Duration(0, 0)) < 0); - - assertTrue(new Duration(1, 0).compareTo(new Duration(0, 0)) > 0); - assertTrue(new Duration(0, 0).compareTo(new Duration(1, 0)) < 0); - - assertTrue(new Duration(0, 1).compareTo(new Duration(0, 0)) > 0); - assertTrue(new Duration(0, 0).compareTo(new Duration(0, 1)) < 0); - } -} \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/java/org/ros/message/TimeTest.java b/rosjava_bootstrap/src/test/java/org/ros/message/TimeTest.java deleted file mode 100644 index 5ef0c4d5..00000000 --- a/rosjava_bootstrap/src/test/java/org/ros/message/TimeTest.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2011 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.ros.message; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Before; -import org.junit.Test; - -/** - * @author kwc@willowgarage.com (Ken Conley) - */ -public class TimeTest { - - @Before - public void setUp() { - } - - @Test - public void testConstructor() { - // Test no args constructor. - Time t = new Time(); - assertEquals(0, t.nsecs); - assertEquals(0, t.secs); - - // Test secs/nsecs constructor with no normalization. - t = new Time(1, 2); - assertEquals(1, t.secs); - assertEquals(2, t.nsecs); - - // Test secs/nsecs constructor with normalization. - t = new Time(2, -1); - assertEquals(1, t.secs); - assertEquals(1000000000 - 1, t.nsecs); - - t = new Time(2, 1000000000 + 2); - assertEquals(3, t.secs); - assertEquals(2, t.nsecs); - } - - @Test - public void testFromMillis() { - assertEquals(new Time(0, 0), Time.fromMillis(0)); - assertEquals(new Time(0, 1000000), Time.fromMillis(1)); - assertEquals(new Time(1, 0), Time.fromMillis(1000)); - assertEquals(new Time(10, 0), Time.fromMillis(10000)); - assertEquals(new Time(1, 1000000), Time.fromMillis(1001)); - assertEquals(new Time(1, 11000000), Time.fromMillis(1011)); - } - - @Test - public void testNormalize() { - Time t = new Time(0, 0); - t.secs = 1; - t.nsecs = 1000000000; - t.normalize(); - assertEquals(2, t.secs); - assertEquals(0, t.nsecs); - - t.secs = 1; - t.nsecs = -1; - t.normalize(); - assertEquals(0, t.secs); - assertEquals(1000000000 - 1, t.nsecs); - } - - @Test - public void testIsZero() { - assertTrue(new Time(0, 0).isZero()); - assertFalse(new Time(1, 0).isZero()); - assertFalse(new Time(0, 1).isZero()); - } - - @Test - public void testComparable() { - assertEquals(0, new Time(0, 0).compareTo(new Time(0, 0))); - assertEquals(0, new Time(1, 1).compareTo(new Time(1, 1))); - assertTrue(new Time(0, 1).compareTo(new Time(0, 0)) > 0); - - assertEquals(-1, new Time(0, 0).compareTo(new Time(0, 1))); - assertTrue(new Time(0, 0).compareTo(new Time(0, 1)) < 0); - assertTrue(new Time(1, 0).compareTo(new Time(0, 0)) > 0); - assertTrue(new Time(0, 0).compareTo(new Time(1, 0)) < 0); - - } -} \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Point.msg b/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Point.msg deleted file mode 100644 index f1d3a71a..00000000 --- a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Point.msg +++ /dev/null @@ -1,4 +0,0 @@ -# This contains the position of a point in free space -float64 x -float64 y -float64 z diff --git a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Pose.msg b/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Pose.msg deleted file mode 100644 index b81919c7..00000000 --- a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Pose.msg +++ /dev/null @@ -1,3 +0,0 @@ -# A representation of pose in free space, composed of postion and orientation. -Point position -Quaternion orientation diff --git a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/PoseWithCovariance.msg b/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/PoseWithCovariance.msg deleted file mode 100644 index 86bc45ad..00000000 --- a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/PoseWithCovariance.msg +++ /dev/null @@ -1,9 +0,0 @@ -# This represents a pose in free space with uncertainty. - -Pose pose - -# Row-major representation of the 6x6 covariance matrix -# The orientation parameters use a fixed-axis representation. -# In order, the parameters are: -# (x, y, z, rotation about X axis, rotation about Y axis, rotation about Z axis) -float64[36] covariance diff --git a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Quaternion.msg b/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Quaternion.msg deleted file mode 100644 index 9f4fde2b..00000000 --- a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Quaternion.msg +++ /dev/null @@ -1,6 +0,0 @@ -# This represents an orientation in free space in quaternion form. - -float64 x -float64 y -float64 z -float64 w diff --git a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Twist.msg b/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Twist.msg deleted file mode 100644 index dc27ca14..00000000 --- a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Twist.msg +++ /dev/null @@ -1,3 +0,0 @@ -# This expresses velocity in free space broken into it's linear and angular parts. -Vector3 linear -Vector3 angular diff --git a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/TwistWithCovariance.msg b/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/TwistWithCovariance.msg deleted file mode 100644 index 6d897801..00000000 --- a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/TwistWithCovariance.msg +++ /dev/null @@ -1,9 +0,0 @@ -# This expresses velocity in free space with uncertianty. - -Twist twist - -# Row-major representation of the 6x6 covariance matrix -# The orientation parameters use a fixed-axis representation. -# In order, the parameters are: -# (x, y, z, rotation about X axis, rotation about Y axis, rotation about Z axis) -float64[36] covariance diff --git a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Vector3.msg b/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Vector3.msg deleted file mode 100644 index 00dd4cba..00000000 --- a/rosjava_bootstrap/src/test/resources/geometry_msgs/msg/Vector3.msg +++ /dev/null @@ -1,5 +0,0 @@ -# This represents a vector in free space. - -float64 x -float64 y -float64 z \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/nav_msgs/msg/Odometry.msg b/rosjava_bootstrap/src/test/resources/nav_msgs/msg/Odometry.msg deleted file mode 100644 index 73578ed8..00000000 --- a/rosjava_bootstrap/src/test/resources/nav_msgs/msg/Odometry.msg +++ /dev/null @@ -1,7 +0,0 @@ -# This represents an estimate of a position and velocity in free space. -# The pose in this message should be specified in the coordinate frame given by header.frame_id. -# The twist in this message should be specified in the coordinate frame given by the child_frame_id -Header header -string child_frame_id -geometry_msgs/PoseWithCovariance pose -geometry_msgs/TwistWithCovariance twist diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Bool.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Bool.msg deleted file mode 100644 index f7cabb94..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Bool.msg +++ /dev/null @@ -1 +0,0 @@ -bool data \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Byte.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Byte.msg deleted file mode 100644 index d993b345..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Byte.msg +++ /dev/null @@ -1 +0,0 @@ -byte data diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/ByteMultiArray.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/ByteMultiArray.msg deleted file mode 100644 index bb00bd34..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/ByteMultiArray.msg +++ /dev/null @@ -1,6 +0,0 @@ -# Please look at the MultiArrayLayout message definition for -# documentation on all multiarrays. - -MultiArrayLayout layout # specification of data layout -byte[] data # array of data - diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Char.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Char.msg deleted file mode 100644 index 39a1d46a..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Char.msg +++ /dev/null @@ -1 +0,0 @@ -char data \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/ColorRGBA.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/ColorRGBA.msg deleted file mode 100644 index 182dbc83..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/ColorRGBA.msg +++ /dev/null @@ -1,4 +0,0 @@ -float32 r -float32 g -float32 b -float32 a diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Duration.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Duration.msg deleted file mode 100644 index f13931ec..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Duration.msg +++ /dev/null @@ -1 +0,0 @@ -duration data diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Empty.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Empty.msg deleted file mode 100644 index e69de29b..00000000 diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Float32.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Float32.msg deleted file mode 100644 index e8974053..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Float32.msg +++ /dev/null @@ -1 +0,0 @@ -float32 data \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Float32MultiArray.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Float32MultiArray.msg deleted file mode 100644 index 91583084..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Float32MultiArray.msg +++ /dev/null @@ -1,6 +0,0 @@ -# Please look at the MultiArrayLayout message definition for -# documentation on all multiarrays. - -MultiArrayLayout layout # specification of data layout -float32[] data # array of data - diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Float64.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Float64.msg deleted file mode 100644 index cd09d39b..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Float64.msg +++ /dev/null @@ -1 +0,0 @@ -float64 data \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Float64MultiArray.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Float64MultiArray.msg deleted file mode 100644 index 0a13b928..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Float64MultiArray.msg +++ /dev/null @@ -1,6 +0,0 @@ -# Please look at the MultiArrayLayout message definition for -# documentation on all multiarrays. - -MultiArrayLayout layout # specification of data layout -float64[] data # array of data - diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Header.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Header.msg deleted file mode 100644 index b2f34f6f..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Header.msg +++ /dev/null @@ -1,15 +0,0 @@ -# Standard metadata for higher-level stamped data types. -# This is generally used to communicate timestamped data -# in a particular coordinate frame. -# -# sequence ID: consecutively increasing ID -uint32 seq -#Two-integer timestamp that is expressed as: -# * stamp.secs: seconds (stamp_secs) since epoch -# * stamp.nsecs: nanoseconds since stamp_secs -# time-handling sugar is provided by the client library -time stamp -#Frame this data is associated with -# 0: no frame -# 1: global frame -string frame_id diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int16.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int16.msg deleted file mode 100644 index c4389faf..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int16.msg +++ /dev/null @@ -1 +0,0 @@ -int16 data diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int16MultiArray.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int16MultiArray.msg deleted file mode 100644 index d2ddea1d..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int16MultiArray.msg +++ /dev/null @@ -1,6 +0,0 @@ -# Please look at the MultiArrayLayout message definition for -# documentation on all multiarrays. - -MultiArrayLayout layout # specification of data layout -int16[] data # array of data - diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int32.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int32.msg deleted file mode 100644 index 0ecfe35f..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int32.msg +++ /dev/null @@ -1 +0,0 @@ -int32 data \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int32MultiArray.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int32MultiArray.msg deleted file mode 100644 index af60abda..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int32MultiArray.msg +++ /dev/null @@ -1,6 +0,0 @@ -# Please look at the MultiArrayLayout message definition for -# documentation on all multiarrays. - -MultiArrayLayout layout # specification of data layout -int32[] data # array of data - diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int64.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int64.msg deleted file mode 100644 index 6961e00f..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int64.msg +++ /dev/null @@ -1 +0,0 @@ -int64 data \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int64MultiArray.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int64MultiArray.msg deleted file mode 100644 index f4f35e17..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int64MultiArray.msg +++ /dev/null @@ -1,6 +0,0 @@ -# Please look at the MultiArrayLayout message definition for -# documentation on all multiarrays. - -MultiArrayLayout layout # specification of data layout -int64[] data # array of data - diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int8.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int8.msg deleted file mode 100644 index 1e42e554..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int8.msg +++ /dev/null @@ -1 +0,0 @@ -int8 data diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int8MultiArray.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int8MultiArray.msg deleted file mode 100644 index a59a3725..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Int8MultiArray.msg +++ /dev/null @@ -1,6 +0,0 @@ -# Please look at the MultiArrayLayout message definition for -# documentation on all multiarrays. - -MultiArrayLayout layout # specification of data layout -int8[] data # array of data - diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/MultiArrayDimension.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/MultiArrayDimension.msg deleted file mode 100644 index 08240462..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/MultiArrayDimension.msg +++ /dev/null @@ -1,3 +0,0 @@ -string label # label of given dimension -uint32 size # size of given dimension (in type units) -uint32 stride # stride of given dimension \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/MultiArrayLayout.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/MultiArrayLayout.msg deleted file mode 100644 index 5437f854..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/MultiArrayLayout.msg +++ /dev/null @@ -1,26 +0,0 @@ -# The multiarray declares a generic multi-dimensional array of a -# particular data type. Dimensions are ordered from outer most -# to inner most. - -MultiArrayDimension[] dim # Array of dimension properties -uint32 data_offset # padding bytes at front of data - -# Accessors should ALWAYS be written in terms of dimension stride -# and specified outer-most dimension first. -# -# multiarray(i,j,k) = data[data_offset + dim_stride[1]*i + dim_stride[2]*j + k] -# -# A standard, 3-channel 640x480 image with interleaved color channels -# would be specified as: -# -# dim[0].label = "height" -# dim[0].size = 480 -# dim[0].stride = 3*640*480 = 921600 (note dim[0] stride is just size of image) -# dim[1].label = "width" -# dim[1].size = 640 -# dim[1].stride = 3*640 = 1920 -# dim[2].label = "channel" -# dim[2].size = 3 -# dim[2].stride = 3 -# -# multiarray(i,j,k) refers to the ith row, jth column, and kth channel. \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/String.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/String.msg deleted file mode 100644 index ae721739..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/String.msg +++ /dev/null @@ -1 +0,0 @@ -string data diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Time.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/Time.msg deleted file mode 100644 index 7f8f7217..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/Time.msg +++ /dev/null @@ -1 +0,0 @@ -time data diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt16.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt16.msg deleted file mode 100644 index 87d0c44e..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt16.msg +++ /dev/null @@ -1 +0,0 @@ -uint16 data diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt16MultiArray.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt16MultiArray.msg deleted file mode 100644 index f38970b6..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt16MultiArray.msg +++ /dev/null @@ -1,6 +0,0 @@ -# Please look at the MultiArrayLayout message definition for -# documentation on all multiarrays. - -MultiArrayLayout layout # specification of data layout -uint16[] data # array of data - diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt32.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt32.msg deleted file mode 100644 index b6c696b4..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt32.msg +++ /dev/null @@ -1 +0,0 @@ -uint32 data \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt32MultiArray.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt32MultiArray.msg deleted file mode 100644 index b2bb0771..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt32MultiArray.msg +++ /dev/null @@ -1,6 +0,0 @@ -# Please look at the MultiArrayLayout message definition for -# documentation on all multiarrays. - -MultiArrayLayout layout # specification of data layout -uint32[] data # array of data - diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt64.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt64.msg deleted file mode 100644 index 2eb1afad..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt64.msg +++ /dev/null @@ -1 +0,0 @@ -uint64 data \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt64MultiArray.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt64MultiArray.msg deleted file mode 100644 index 30d0cd92..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt64MultiArray.msg +++ /dev/null @@ -1,6 +0,0 @@ -# Please look at the MultiArrayLayout message definition for -# documentation on all multiarrays. - -MultiArrayLayout layout # specification of data layout -uint64[] data # array of data - diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt8.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt8.msg deleted file mode 100644 index 5eefd870..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt8.msg +++ /dev/null @@ -1 +0,0 @@ -uint8 data diff --git a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt8MultiArray.msg b/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt8MultiArray.msg deleted file mode 100644 index 31f7d6a2..00000000 --- a/rosjava_bootstrap/src/test/resources/std_msgs/msg/UInt8MultiArray.msg +++ /dev/null @@ -1,6 +0,0 @@ -# Please look at the MultiArrayLayout message definition for -# documentation on all multiarrays. - -MultiArrayLayout layout # specification of data layout -uint8[] data # array of data - diff --git a/rosjava_bootstrap/src/test/resources/std_srvs/srv/Empty.srv b/rosjava_bootstrap/src/test/resources/std_srvs/srv/Empty.srv deleted file mode 100644 index 73b314ff..00000000 --- a/rosjava_bootstrap/src/test/resources/std_srvs/srv/Empty.srv +++ /dev/null @@ -1 +0,0 @@ ---- \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/test_ros/msg/Composite.msg b/rosjava_bootstrap/src/test/resources/test_ros/msg/Composite.msg deleted file mode 100644 index 4629d3e5..00000000 --- a/rosjava_bootstrap/src/test/resources/test_ros/msg/Composite.msg +++ /dev/null @@ -1,3 +0,0 @@ -# composite message. required for testing import calculation in generators -CompositeA a -CompositeB b diff --git a/rosjava_bootstrap/src/test/resources/test_ros/msg/CompositeA.msg b/rosjava_bootstrap/src/test/resources/test_ros/msg/CompositeA.msg deleted file mode 100644 index 9f4fde2b..00000000 --- a/rosjava_bootstrap/src/test/resources/test_ros/msg/CompositeA.msg +++ /dev/null @@ -1,6 +0,0 @@ -# This represents an orientation in free space in quaternion form. - -float64 x -float64 y -float64 z -float64 w diff --git a/rosjava_bootstrap/src/test/resources/test_ros/msg/CompositeB.msg b/rosjava_bootstrap/src/test/resources/test_ros/msg/CompositeB.msg deleted file mode 100644 index fb689bc8..00000000 --- a/rosjava_bootstrap/src/test/resources/test_ros/msg/CompositeB.msg +++ /dev/null @@ -1,4 +0,0 @@ -# copy of geometry_msgs/Point for testing -float64 x -float64 y -float64 z diff --git a/rosjava_bootstrap/src/test/resources/test_ros/msg/TestArrays.msg b/rosjava_bootstrap/src/test/resources/test_ros/msg/TestArrays.msg deleted file mode 100644 index 2d7493fe..00000000 --- a/rosjava_bootstrap/src/test/resources/test_ros/msg/TestArrays.msg +++ /dev/null @@ -1,10 +0,0 @@ -# caller_id of most recent node to send this message -string caller_id -# caller_id of the original node to send this message -string orig_caller_id - -int32[] int32_array -float32[] float32_array -time[] time_array -TestString[] test_string_array -# TODO: array of arrays diff --git a/rosjava_bootstrap/src/test/resources/test_ros/msg/TestHeader.msg b/rosjava_bootstrap/src/test/resources/test_ros/msg/TestHeader.msg deleted file mode 100644 index 22897c3b..00000000 --- a/rosjava_bootstrap/src/test/resources/test_ros/msg/TestHeader.msg +++ /dev/null @@ -1,8 +0,0 @@ -Header header - -# caller_id of most recent node to send this message -string caller_id -# caller_id of the original node to send this message -string orig_caller_id - -byte auto_header # autoset header on response diff --git a/rosjava_bootstrap/src/test/resources/test_ros/msg/TestPrimitives.msg b/rosjava_bootstrap/src/test/resources/test_ros/msg/TestPrimitives.msg deleted file mode 100644 index 815dd5b0..00000000 --- a/rosjava_bootstrap/src/test/resources/test_ros/msg/TestPrimitives.msg +++ /dev/null @@ -1,21 +0,0 @@ -# Integration test message of all primitive types - -# caller_id of most recent node to send this message -string caller_id -# caller_id of the original node to send this message -string orig_caller_id - -string str -byte b -int16 int16 -int32 int32 -int64 int64 -char c -uint16 uint16 -uint32 uint32 -uint64 uint64 -float32 float32 -float64 float64 -time t -duration d - diff --git a/rosjava_bootstrap/src/test/resources/test_ros/msg/TestString.msg b/rosjava_bootstrap/src/test/resources/test_ros/msg/TestString.msg deleted file mode 100644 index 4ab04385..00000000 --- a/rosjava_bootstrap/src/test/resources/test_ros/msg/TestString.msg +++ /dev/null @@ -1,6 +0,0 @@ -# Integration test message -# caller_id of most recent node to send this message -string caller_id -# caller_id of the original node to send this message -string orig_caller_id -string data diff --git a/rosjava_bootstrap/src/test/resources/test_ros/srv/AddTwoInts.srv b/rosjava_bootstrap/src/test/resources/test_ros/srv/AddTwoInts.srv deleted file mode 100644 index 3a68808e..00000000 --- a/rosjava_bootstrap/src/test/resources/test_ros/srv/AddTwoInts.srv +++ /dev/null @@ -1,4 +0,0 @@ -int64 a -int64 b ---- -int64 sum diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/msg/ArrayVal.msg b/rosjava_bootstrap/src/test/resources/test_rospy/msg/ArrayVal.msg deleted file mode 100644 index 4a34dd1b..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/msg/ArrayVal.msg +++ /dev/null @@ -1,2 +0,0 @@ -Val[] vals -#Val[10] vals_fixed diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/msg/EmbedTest.msg b/rosjava_bootstrap/src/test/resources/test_rospy/msg/EmbedTest.msg deleted file mode 100644 index e1962cd4..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/msg/EmbedTest.msg +++ /dev/null @@ -1,6 +0,0 @@ -std_msgs/String str1 -std_msgs/Int32 int1 -std_msgs/Int32[] ints -Val val -Val[] vals -ArrayVal[] arrayval diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/msg/Floats.msg b/rosjava_bootstrap/src/test/resources/test_rospy/msg/Floats.msg deleted file mode 100644 index 6bd8052d..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/msg/Floats.msg +++ /dev/null @@ -1,2 +0,0 @@ -# exact copy of rospy_tutorials/Floats, used for testing -float32[] data diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/msg/HeaderHeaderVal.msg b/rosjava_bootstrap/src/test/resources/test_rospy/msg/HeaderHeaderVal.msg deleted file mode 100644 index 6882d7ac..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/msg/HeaderHeaderVal.msg +++ /dev/null @@ -1,2 +0,0 @@ -Header header -HeaderVal val \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/msg/HeaderVal.msg b/rosjava_bootstrap/src/test/resources/test_rospy/msg/HeaderVal.msg deleted file mode 100644 index 91f99b25..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/msg/HeaderVal.msg +++ /dev/null @@ -1,2 +0,0 @@ -Header header -string val \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/msg/PythonKeyword.msg b/rosjava_bootstrap/src/test/resources/test_rospy/msg/PythonKeyword.msg deleted file mode 100644 index 0949ea88..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/msg/PythonKeyword.msg +++ /dev/null @@ -1 +0,0 @@ -int32 yield diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/msg/TestConstants.msg b/rosjava_bootstrap/src/test/resources/test_rospy/msg/TestConstants.msg deleted file mode 100644 index 344afc38..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/msg/TestConstants.msg +++ /dev/null @@ -1,15 +0,0 @@ -float32 A=-123.0 -float32 B=124.0 -float64 C=125.0 -int32 X=123 -int32 Y=-123 -uint32 Z=124 -string FOO=foo -string SINGLEQUOTE='hi -string DOUBLEQUOTE="hello" there -string MULTIQUOTE="hello" 'goodbye' -string EXAMPLE="#comments" are ignored, and leading and trailing whitespace removed -string WHITESPACE= strip -string EMPTY= -bool TRUE=1 -bool FALSE=0 \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/msg/TestFixedArray.msg b/rosjava_bootstrap/src/test/resources/test_rospy/msg/TestFixedArray.msg deleted file mode 100644 index 005aa94a..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/msg/TestFixedArray.msg +++ /dev/null @@ -1,16 +0,0 @@ -float32[1] f32_1 -float32[3] f32_3 -float64[1] f64_1 -float64[3] f64_3 -int8[1] i8_1 -int8[3] i8_3 -uint8[1] u8_1 -uint8[3] u8_3 -int32[1] i32_1 -int32[3] i32_3 -uint32[1] u32_1 -uint32[3] u32_3 -string[1] s_1 -string[3] s_3 -bool[1] b_1 -bool[3] b_3 \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/msg/TransitiveImport.msg b/rosjava_bootstrap/src/test/resources/test_rospy/msg/TransitiveImport.msg deleted file mode 100644 index bf33d172..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/msg/TransitiveImport.msg +++ /dev/null @@ -1,2 +0,0 @@ -# Bug #2133/2139: EmbedTest uses std_msgs, so TransitiveImport needs it as well -EmbedTest data \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/msg/TransitiveMsg1.msg b/rosjava_bootstrap/src/test/resources/test_rospy/msg/TransitiveMsg1.msg deleted file mode 100644 index f41ed0cf..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/msg/TransitiveMsg1.msg +++ /dev/null @@ -1,2 +0,0 @@ -TransitiveMsg2 msg2 - diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/msg/TransitiveMsg2.msg b/rosjava_bootstrap/src/test/resources/test_rospy/msg/TransitiveMsg2.msg deleted file mode 100644 index 378a1c58..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/msg/TransitiveMsg2.msg +++ /dev/null @@ -1 +0,0 @@ -test_ros/Composite data diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/msg/Val.msg b/rosjava_bootstrap/src/test/resources/test_rospy/msg/Val.msg deleted file mode 100644 index c11841ad..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/msg/Val.msg +++ /dev/null @@ -1 +0,0 @@ -string val \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/srv/ConstantsMultiplex.srv b/rosjava_bootstrap/src/test/resources/test_rospy/srv/ConstantsMultiplex.srv deleted file mode 100644 index b9554454..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/srv/ConstantsMultiplex.srv +++ /dev/null @@ -1,26 +0,0 @@ -byte BYTE_X=0 -byte BYTE_Y=15 -byte BYTE_Z=5 -int32 INT32_X=0 -int32 INT32_Y=-12345678 -int32 INT32_Z=12345678 -uint32 UINT32_X=0 -uint32 UINT32_Y=12345678 -uint32 UINT32_Z=1 -float32 FLOAT32_X=0.0 -float32 FLOAT32_Y=-3.14159 -float32 FLOAT32_Z=12345.78 -byte SELECT_X=1 -byte SELECT_Y=2 -byte SELECT_Z=3 -byte selection ---- -# test response constants as well -byte CONFIRM_X=1 -byte CONFIRM_Y=2 -byte CONFIRM_Z=3 -byte select_confirm -byte ret_byte -int32 ret_int32 -uint32 ret_uint32 -float32 ret_float32 \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/srv/EmptyReqSrv.srv b/rosjava_bootstrap/src/test/resources/test_rospy/srv/EmptyReqSrv.srv deleted file mode 100644 index 1f2c1eb6..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/srv/EmptyReqSrv.srv +++ /dev/null @@ -1,2 +0,0 @@ ---- -int32 fake_secret diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/srv/EmptyRespSrv.srv b/rosjava_bootstrap/src/test/resources/test_rospy/srv/EmptyRespSrv.srv deleted file mode 100644 index 6ef29bc8..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/srv/EmptyRespSrv.srv +++ /dev/null @@ -1,2 +0,0 @@ -int32 fake_secret ---- diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/srv/EmptySrv.srv b/rosjava_bootstrap/src/test/resources/test_rospy/srv/EmptySrv.srv deleted file mode 100644 index ed97d539..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/srv/EmptySrv.srv +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/srv/ListReturn.srv b/rosjava_bootstrap/src/test/resources/test_rospy/srv/ListReturn.srv deleted file mode 100644 index 311e8064..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/srv/ListReturn.srv +++ /dev/null @@ -1,7 +0,0 @@ -# test case for having single list return value -int32 a -int32 b -int32 c -int32 d ---- -int32[] abcd diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/srv/MultipleAddTwoInts.srv b/rosjava_bootstrap/src/test/resources/test_rospy/srv/MultipleAddTwoInts.srv deleted file mode 100644 index 522a4826..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/srv/MultipleAddTwoInts.srv +++ /dev/null @@ -1,8 +0,0 @@ -# test case for having multiple return values -int32 a -int32 b -int32 c -int32 d ---- -int32 ab -int32 cd \ No newline at end of file diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/srv/StringString.srv b/rosjava_bootstrap/src/test/resources/test_rospy/srv/StringString.srv deleted file mode 100644 index a9242d41..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/srv/StringString.srv +++ /dev/null @@ -1,4 +0,0 @@ -std_msgs/String str -Val str2 ---- -std_msgs/String str diff --git a/rosjava_bootstrap/src/test/resources/test_rospy/srv/TransitiveSrv.srv b/rosjava_bootstrap/src/test/resources/test_rospy/srv/TransitiveSrv.srv deleted file mode 100644 index 7c62a01e..00000000 --- a/rosjava_bootstrap/src/test/resources/test_rospy/srv/TransitiveSrv.srv +++ /dev/null @@ -1,4 +0,0 @@ -test_rospy/TransitiveMsg1 msg ---- -int32 a - -- GitLab