message generation test handling.

.classpath

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="gradle_plugins/src/main/groovy"/>
-	<classpathentry kind="src" path="message_generation/src/test/java"/>
 	<classpathentry kind="src" path="message_generation/src/main/java"/>
 	<classpathentry kind="lib" path="gradle/wrapper/gradle-wrapper.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

build.gradle

@@ -21,6 +21,7 @@ task wrapper(type: Wrapper) {
 project.ext {
   /* the ros plugin defines this, but since we're building the plugin... */
   rosMavenDeploymentPath = "$System.env.ROS_MAVEN_DEPLOYMENT_PATH"
+  rosMavenPath = "$System.env.ROS_MAVEN_PATH".split(':')
 }
 
 allprojects {
@@ -28,12 +29,19 @@ allprojects {
 }
 
 subprojects {
+    /* Have to manually do this below since our gradle plugin is our sub project */
     apply plugin: 'java'
     apply plugin: 'maven'
 
+    sourceCompatibility = 1.6
+    targetCompatibility = 1.6
+
+    def repoURLs = project.rosMavenPath.collect { 'file://' + it }
     repositories {
-        maven {
-            url 'file://' + project.rosMavenDeploymentPath
+        repoURLs.each { p ->
+            maven {
+                url p
+            }
         }
         mavenLocal()
         maven {
@@ -43,7 +51,6 @@ subprojects {
     if ( project.rosMavenDeploymentPath != 'null' && project.rosMavenDeploymentPath != '' ) {
         uploadArchives {
             repositories.mavenDeployer {
-                println("Class: " + repository(url: 'file://' + project.rosMavenDeploymentPath).getClass())
                 repository(url: 'file://' + project.rosMavenDeploymentPath)
             }
         }

message_generation/src/test/resources/test_rospy/msg/TransitiveMsg2.msg

@@ -1 +0,0 @@
-test_ros/Composite data

message_generation_tests/build.gradle

@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+version='0.1.0'
+
+dependencies {
+  compile project(':gradle_plugins')
+  compile project(':rosjava_test_msgs')
+}
+
+jar {
+  manifest {
+    version = project.version
+    symbolicName = 'org.ros.rosjava_bootstrap.message_generation_tests'
+  }
+}
+
+

message_generation/src/test/java/org/ros/internal/message/Md5GeneratorTest.java → message_generation_tests/src/test/java/org/ros/internal/message/Md5GeneratorTest.java

@@ -52,31 +52,31 @@ public class Md5GeneratorTest {
   @Test
   public void testPrimitives() {
     TopicDescription topicDescription =
-        topicDescriptionFactory.newFromType("test_ros/TestPrimitives");
+        topicDescriptionFactory.newFromType("rosjava_test_msgs/TestPrimitives");
     assertEquals("3e70f428a22c0d26ca67f87802c8e00f", topicDescription.getMd5Checksum());
   }
 
   @Test
   public void testString() {
-    TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_ros/TestString");
+    TopicDescription topicDescription = topicDescriptionFactory.newFromType("rosjava_test_msgs/TestString");
     assertEquals("334ff4377be93faa44ebc66d23d40fd3", topicDescription.getMd5Checksum());
   }
 
   @Test
   public void testHeader() {
-    TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_ros/TestHeader");
+    TopicDescription topicDescription = topicDescriptionFactory.newFromType("rosjava_test_msgs/TestHeader");
     assertEquals("4b5a00f536da2f756ba6aebcf795a967", topicDescription.getMd5Checksum());
   }
 
   @Test
   public void testArrays() {
-    TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_ros/TestArrays");
+    TopicDescription topicDescription = topicDescriptionFactory.newFromType("rosjava_test_msgs/TestArrays");
     assertEquals("4cc9b5e2cebe791aa3e994f5bc159eb6", topicDescription.getMd5Checksum());
   }
 
   @Test
   public void testComposite() {
-    TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_ros/Composite");
+    TopicDescription topicDescription = topicDescriptionFactory.newFromType("rosjava_test_msgs/Composite");
     assertEquals("d8fb6eb869ad3956b50e8737d96dc9fa", topicDescription.getMd5Checksum());
   }
 
@@ -95,14 +95,14 @@ public class Md5GeneratorTest {
   @Test
   public void testAddTwoInts() {
     ServiceDescription serviceDescription =
-        serviceDescriptionFactory.newFromType("test_ros/AddTwoInts");
+        serviceDescriptionFactory.newFromType("rosjava_test_msgs/AddTwoInts");
     assertEquals("6a2e34150c00229791cc89ff309fff21", serviceDescription.getMd5Checksum());
   }
 
   @Test
   public void testTransitiveSrv() {
     ServiceDescription serviceDescription =
-        serviceDescriptionFactory.newFromType("test_rospy/TransitiveSrv");
+        serviceDescriptionFactory.newFromType("rosjava_test_msgspy/TransitiveSrv");
     assertEquals("8b7918ee2b81eaf825f4c70de011f6fa", serviceDescription.getMd5Checksum());
   }
 }

message_generation_tests/src/test/resources/test_rospy/msg/TransitiveMsg2.msg

@@ -0,0 +1 @@
+rosjava_test_msgs/Composite data

rosjava_test_msgs/build.gradle

@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+version = '0.1.0'
+
+/* Can't do this since the plugin is in this multi-project now */
+/* project.catkin.packages['rosjava_messages'].generateMessageArtifactInSubFolder(project, 'rosjava_test_msgs') */
+
+dependencies {
+  compile project(':message_generation')
+}
+
+def generatedSourcesDir = "${project.buildDir}/generated-src"
+task generateSources(type: JavaExec) {
+    description "Generate sources for " + project.name
+    outputs.dir file(generatedSourcesDir)
+    args new ArrayList<String>([generatedSourcesDir, name])
+    classpath configurations.runtime
+    main = 'org.ros.internal.message.GenerateInterfaces'
+}
+
+compileJava.source generateSources.outputs.files

rosjava_test_msgs/msg/Composite.msg

@@ -0,0 +1,3 @@
+# composite message. required for testing import calculation in generators
+CompositeA a
+CompositeB b

rosjava_test_msgs/msg/CompositeA.msg

@@ -0,0 +1,6 @@
+# This represents an orientation in free space in quaternion form.
+
+float64 x
+float64 y
+float64 z
+float64 w

rosjava_test_msgs/msg/CompositeB.msg

@@ -0,0 +1,4 @@
+# copy of geometry_msgs/Point for testing
+float64 x
+float64 y
+float64 z

rosjava_test_msgs/msg/TestArrays.msg

@@ -0,0 +1,10 @@
+# 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

rosjava_test_msgs/msg/TestHeader.msg

@@ -0,0 +1,8 @@
+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

rosjava_test_msgs/msg/TestPrimitives.msg

@@ -0,0 +1,21 @@
+# 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
+

rosjava_test_msgs/msg/TestString.msg

@@ -0,0 +1,6 @@
+# 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

rosjava_test_msgs/srv/AddTwoInts.srv

@@ -0,0 +1,4 @@
+int64 a
+int64 b
+---
+int64 sum

settings.gradle

@@ -17,4 +17,6 @@
 /* rootProject.name = 'catkin' */
 
 include 'gradle_plugins'
-include 'message_generation'
+include 'message_generation'
+include 'rosjava_test_msgs'
+include 'message_generation_tests'