From 59bfab6a9aee22d597eebd74929e70f0d895f4af Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 19 Oct 2018 10:49:53 -0500 Subject: [PATCH 01/23] :arrow_up: ihmc-ci 1.0.9 --- ihmc-ros2-library/build.gradle | 15 +++------------ ros2-common-interfaces/build.gradle | 8 ++++++-- ros2-msg-to-idl-generator/build.gradle | 13 ++++--------- ros2-msg-to-pubsub-generator/build.gradle | 21 +++------------------ 4 files changed, 16 insertions(+), 41 deletions(-) diff --git a/ihmc-ros2-library/build.gradle b/ihmc-ros2-library/build.gradle index b9208dee..3ca318c6 100644 --- a/ihmc-ros2-library/build.gradle +++ b/ihmc-ros2-library/build.gradle @@ -1,17 +1,8 @@ -buildscript { - repositories { - mavenCentral() - maven { url "http://dl.bintray.com/ihmcrobotics/maven-release" } - maven { url "https://plugins.gradle.org/m2/" } - mavenLocal() - } - dependencies { - classpath "us.ihmc:ihmc-build:0.15.1" - } +plugins { + id("us.ihmc.ihmc-build") version "0.15.1" + id("us.ihmc.ihmc-ci") version "1.0.9" } -apply plugin: "us.ihmc.ihmc-build" - ihmc { loadProductProperties("../group.gradle.properties") diff --git a/ros2-common-interfaces/build.gradle b/ros2-common-interfaces/build.gradle index e8afcdac..afc86425 100644 --- a/ros2-common-interfaces/build.gradle +++ b/ros2-common-interfaces/build.gradle @@ -8,12 +8,16 @@ buildscript { jcenter() } dependencies { - classpath "us.ihmc:ihmc-build:0.15.1" classpath "us.ihmc:ros2-msg-to-pubsub-generator:0.13.0" classpath "org.ajoberstar:grgit:2.1.0" } } -apply plugin: "us.ihmc.ihmc-build" + +plugins { + id("us.ihmc.ihmc-build") version "0.15.1" + id("us.ihmc.ihmc-ci") version "1.0.9" +} + apply plugin: "org.ajoberstar.grgit" def rclInterfacesPath = "src/main/vendor/rcl_interfaces" diff --git a/ros2-msg-to-idl-generator/build.gradle b/ros2-msg-to-idl-generator/build.gradle index 5b0f873d..0d6165ac 100644 --- a/ros2-msg-to-idl-generator/build.gradle +++ b/ros2-msg-to-idl-generator/build.gradle @@ -1,13 +1,8 @@ -buildscript { - repositories { - maven { url "https://plugins.gradle.org/m2/" } - mavenLocal() - } - dependencies { - classpath "us.ihmc:ihmc-build:0.15.1" - } +plugins { + id("us.ihmc.ihmc-build") version "0.15.1" + id("us.ihmc.ihmc-ci") version "1.0.9" } -apply plugin: "us.ihmc.ihmc-build" + apply plugin: "application" ihmc { diff --git a/ros2-msg-to-pubsub-generator/build.gradle b/ros2-msg-to-pubsub-generator/build.gradle index be81f479..276566d3 100644 --- a/ros2-msg-to-pubsub-generator/build.gradle +++ b/ros2-msg-to-pubsub-generator/build.gradle @@ -1,14 +1,7 @@ -buildscript { - repositories { - maven { url "https://plugins.gradle.org/m2/" } - mavenLocal() - } - dependencies { - classpath "us.ihmc:ihmc-build:0.15.1" - } +plugins { + id("us.ihmc.ihmc-build") version "0.15.1" + id("us.ihmc.ihmc-ci") version "1.0.9" } -apply plugin: "us.ihmc.ihmc-build" -//apply plugin: "application" ihmc { loadProductProperties("../group.gradle.properties") @@ -37,11 +30,3 @@ mainDependencies { testDependencies { compile pubsub } - -task show() { - doLast { - project.gradle.includedBuilds.each { println it } - buildscript.configurations.classpath.each { println "Buildscript: " + it } - configurations.compile.each { println "Compile: " + it } - } -} \ No newline at end of file From 71779a267a7972a39f2ed9c056970701012b91be Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 19 Oct 2018 11:06:29 -0500 Subject: [PATCH 02/23] :arrow_up: ihmc-ci 1.1.0 --- ihmc-ros2-library/build.gradle | 2 +- ros2-common-interfaces/build.gradle | 2 +- ros2-msg-to-idl-generator/build.gradle | 2 +- ros2-msg-to-pubsub-generator/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ihmc-ros2-library/build.gradle b/ihmc-ros2-library/build.gradle index 3ca318c6..f66c88e7 100644 --- a/ihmc-ros2-library/build.gradle +++ b/ihmc-ros2-library/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.0.9" + id("us.ihmc.ihmc-ci") version "1.1.0" } ihmc { diff --git a/ros2-common-interfaces/build.gradle b/ros2-common-interfaces/build.gradle index afc86425..f884658a 100644 --- a/ros2-common-interfaces/build.gradle +++ b/ros2-common-interfaces/build.gradle @@ -15,7 +15,7 @@ buildscript { plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.0.9" + id("us.ihmc.ihmc-ci") version "1.1.0" } apply plugin: "org.ajoberstar.grgit" diff --git a/ros2-msg-to-idl-generator/build.gradle b/ros2-msg-to-idl-generator/build.gradle index 0d6165ac..98512e69 100644 --- a/ros2-msg-to-idl-generator/build.gradle +++ b/ros2-msg-to-idl-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.0.9" + id("us.ihmc.ihmc-ci") version "1.1.0" } apply plugin: "application" diff --git a/ros2-msg-to-pubsub-generator/build.gradle b/ros2-msg-to-pubsub-generator/build.gradle index 276566d3..44c4bed4 100644 --- a/ros2-msg-to-pubsub-generator/build.gradle +++ b/ros2-msg-to-pubsub-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.0.9" + id("us.ihmc.ihmc-ci") version "1.1.0" } ihmc { From 2c056c2c4e603d5e66299dc1838c9e3e282c608c Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 19 Oct 2018 11:38:45 -0500 Subject: [PATCH 03/23] :arrow_up: ihmc-ci 1.1.2 --- ihmc-ros2-library/build.gradle | 2 +- ros2-common-interfaces/build.gradle | 2 +- ros2-msg-to-idl-generator/build.gradle | 2 +- ros2-msg-to-pubsub-generator/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ihmc-ros2-library/build.gradle b/ihmc-ros2-library/build.gradle index f66c88e7..4df0d37b 100644 --- a/ihmc-ros2-library/build.gradle +++ b/ihmc-ros2-library/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.0" + id("us.ihmc.ihmc-ci") version "1.1.2" } ihmc { diff --git a/ros2-common-interfaces/build.gradle b/ros2-common-interfaces/build.gradle index f884658a..afb6a24c 100644 --- a/ros2-common-interfaces/build.gradle +++ b/ros2-common-interfaces/build.gradle @@ -15,7 +15,7 @@ buildscript { plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.0" + id("us.ihmc.ihmc-ci") version "1.1.2" } apply plugin: "org.ajoberstar.grgit" diff --git a/ros2-msg-to-idl-generator/build.gradle b/ros2-msg-to-idl-generator/build.gradle index 98512e69..65c62ae6 100644 --- a/ros2-msg-to-idl-generator/build.gradle +++ b/ros2-msg-to-idl-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.0" + id("us.ihmc.ihmc-ci") version "1.1.2" } apply plugin: "application" diff --git a/ros2-msg-to-pubsub-generator/build.gradle b/ros2-msg-to-pubsub-generator/build.gradle index 44c4bed4..7a570d5a 100644 --- a/ros2-msg-to-pubsub-generator/build.gradle +++ b/ros2-msg-to-pubsub-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.0" + id("us.ihmc.ihmc-ci") version "1.1.2" } ihmc { From 6978ee22ea77b47a51d36e06ba8bacff77928d60 Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 19 Oct 2018 12:01:28 -0500 Subject: [PATCH 04/23] :arrow_up: ihmc-ci 1.1.3 --- ihmc-ros2-library/build.gradle | 2 +- ros2-common-interfaces/build.gradle | 2 +- ros2-msg-to-idl-generator/build.gradle | 2 +- ros2-msg-to-pubsub-generator/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ihmc-ros2-library/build.gradle b/ihmc-ros2-library/build.gradle index 4df0d37b..cfe5e3d6 100644 --- a/ihmc-ros2-library/build.gradle +++ b/ihmc-ros2-library/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.2" + id("us.ihmc.ihmc-ci") version "1.1.3" } ihmc { diff --git a/ros2-common-interfaces/build.gradle b/ros2-common-interfaces/build.gradle index afb6a24c..fe1d0cc7 100644 --- a/ros2-common-interfaces/build.gradle +++ b/ros2-common-interfaces/build.gradle @@ -15,7 +15,7 @@ buildscript { plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.2" + id("us.ihmc.ihmc-ci") version "1.1.3" } apply plugin: "org.ajoberstar.grgit" diff --git a/ros2-msg-to-idl-generator/build.gradle b/ros2-msg-to-idl-generator/build.gradle index 65c62ae6..c12941f1 100644 --- a/ros2-msg-to-idl-generator/build.gradle +++ b/ros2-msg-to-idl-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.2" + id("us.ihmc.ihmc-ci") version "1.1.3" } apply plugin: "application" diff --git a/ros2-msg-to-pubsub-generator/build.gradle b/ros2-msg-to-pubsub-generator/build.gradle index 7a570d5a..00974b9d 100644 --- a/ros2-msg-to-pubsub-generator/build.gradle +++ b/ros2-msg-to-pubsub-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.2" + id("us.ihmc.ihmc-ci") version "1.1.3" } ihmc { From 49700a08e00743997027d23e8d0f3b74ef164afc Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 19 Oct 2018 12:22:44 -0500 Subject: [PATCH 05/23] Fix test path. --- .../src/test/java/us/ihmc/MessageGenerationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java b/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java index 6ad6dbe2..faf5e338 100644 --- a/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java +++ b/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java @@ -14,7 +14,7 @@ public class MessageGenerationTest public void testMessageGeneration() throws IOException { Path startingPath; - startingPath = Paths.get("ros2-msg-to-pubsub-generator/src/test"); + startingPath = Paths.get("test"); FileTools.deleteQuietly(startingPath.resolve("generated-java")); FileTools.deleteQuietly(startingPath.resolve("generated-idl")); From 1be4e7f67a31be751a6b7752a27810652710f5ee Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 19 Oct 2018 12:23:20 -0500 Subject: [PATCH 06/23] Add working dir message. --- .../src/test/java/us/ihmc/MessageGenerationTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java b/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java index faf5e338..010cdba9 100644 --- a/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java +++ b/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java @@ -1,6 +1,7 @@ package us.ihmc; import org.junit.Test; +import us.ihmc.commons.LogTools; import us.ihmc.commons.nio.FileTools; import us.ihmc.ros2.rosidl.RosInterfaceGenerator; @@ -14,6 +15,7 @@ public class MessageGenerationTest public void testMessageGeneration() throws IOException { Path startingPath; + LogTools.info("Working dir: " + Paths.get(".").toAbsolutePath()); startingPath = Paths.get("test"); FileTools.deleteQuietly(startingPath.resolve("generated-java")); From e4b6fc092edd81ac5a3aa6f286f85f7e441e2322 Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 19 Oct 2018 13:40:01 -0500 Subject: [PATCH 07/23] :arrow_up: ihmc-ci 1.1.3 --- build.gradle | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index e058cc85..7fe3cf2f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,3 @@ -buildscript { - repositories { - maven { url "https://plugins.gradle.org/m2/" } - mavenLocal() - jcenter() - } - dependencies { - classpath "us.ihmc:ihmc-build:0.15.1" - } +plugins { + id("us.ihmc.ihmc-build") version "0.15.1" } -apply plugin: "us.ihmc.ihmc-build" From 7bd7fc155bad113b50919c6470593ac2fbc009ff Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 19 Oct 2018 14:23:05 -0500 Subject: [PATCH 08/23] :arrow_up: ihmc-commons 0.24.0 --- ros2-msg-to-pubsub-generator/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/ros2-msg-to-pubsub-generator/build.gradle b/ros2-msg-to-pubsub-generator/build.gradle index 00974b9d..08b769b7 100644 --- a/ros2-msg-to-pubsub-generator/build.gradle +++ b/ros2-msg-to-pubsub-generator/build.gradle @@ -29,4 +29,5 @@ mainDependencies { testDependencies { compile pubsub + compile "us.ihmc:ihmc-commons:0.24.0" } From 7c4eda011964acad8d4587ba58bb48ba162c1fc7 Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 19 Oct 2018 14:25:37 -0500 Subject: [PATCH 09/23] Fix LogTools path --- .../src/test/java/us/ihmc/MessageGenerationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java b/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java index 010cdba9..18e9e181 100644 --- a/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java +++ b/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java @@ -1,7 +1,7 @@ package us.ihmc; import org.junit.Test; -import us.ihmc.commons.LogTools; +import us.ihmc.log.LogTools; import us.ihmc.commons.nio.FileTools; import us.ihmc.ros2.rosidl.RosInterfaceGenerator; From 8c7cc4e33295bd3c481b526e389ddbf4a9c08d23 Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 19 Oct 2018 14:30:29 -0500 Subject: [PATCH 10/23] Fix starting path. --- .../src/test/java/us/ihmc/MessageGenerationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java b/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java index 18e9e181..01694606 100644 --- a/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java +++ b/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java @@ -16,7 +16,7 @@ public void testMessageGeneration() throws IOException { Path startingPath; LogTools.info("Working dir: " + Paths.get(".").toAbsolutePath()); - startingPath = Paths.get("test"); + startingPath = Paths.get("."); FileTools.deleteQuietly(startingPath.resolve("generated-java")); FileTools.deleteQuietly(startingPath.resolve("generated-idl")); From 78d506757022d4e33f346aabf211e5d5d58665cf Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 19 Oct 2018 15:52:52 -0500 Subject: [PATCH 11/23] :arrow_up: ihmc-ci 1.1.5 --- ihmc-ros2-library/build.gradle | 2 +- ros2-common-interfaces/build.gradle | 2 +- ros2-msg-to-idl-generator/build.gradle | 2 +- ros2-msg-to-pubsub-generator/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ihmc-ros2-library/build.gradle b/ihmc-ros2-library/build.gradle index cfe5e3d6..4a054e83 100644 --- a/ihmc-ros2-library/build.gradle +++ b/ihmc-ros2-library/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.3" + id("us.ihmc.ihmc-ci") version "1.1.5" } ihmc { diff --git a/ros2-common-interfaces/build.gradle b/ros2-common-interfaces/build.gradle index fe1d0cc7..3657fb7f 100644 --- a/ros2-common-interfaces/build.gradle +++ b/ros2-common-interfaces/build.gradle @@ -15,7 +15,7 @@ buildscript { plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.3" + id("us.ihmc.ihmc-ci") version "1.1.5" } apply plugin: "org.ajoberstar.grgit" diff --git a/ros2-msg-to-idl-generator/build.gradle b/ros2-msg-to-idl-generator/build.gradle index c12941f1..5eba83f9 100644 --- a/ros2-msg-to-idl-generator/build.gradle +++ b/ros2-msg-to-idl-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.3" + id("us.ihmc.ihmc-ci") version "1.1.5" } apply plugin: "application" diff --git a/ros2-msg-to-pubsub-generator/build.gradle b/ros2-msg-to-pubsub-generator/build.gradle index 08b769b7..435af579 100644 --- a/ros2-msg-to-pubsub-generator/build.gradle +++ b/ros2-msg-to-pubsub-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.3" + id("us.ihmc.ihmc-ci") version "1.1.5" } ihmc { From 2df941fb63ce9d5000d3f85d286d0172f1793677 Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 19 Oct 2018 15:59:05 -0500 Subject: [PATCH 12/23] :arrow_up: ihmc-ci 1.1.6 --- ihmc-ros2-library/build.gradle | 2 +- ros2-common-interfaces/build.gradle | 2 +- ros2-msg-to-idl-generator/build.gradle | 2 +- ros2-msg-to-pubsub-generator/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ihmc-ros2-library/build.gradle b/ihmc-ros2-library/build.gradle index 4a054e83..e666beae 100644 --- a/ihmc-ros2-library/build.gradle +++ b/ihmc-ros2-library/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.5" + id("us.ihmc.ihmc-ci") version "1.1.6" } ihmc { diff --git a/ros2-common-interfaces/build.gradle b/ros2-common-interfaces/build.gradle index 3657fb7f..c82aa590 100644 --- a/ros2-common-interfaces/build.gradle +++ b/ros2-common-interfaces/build.gradle @@ -15,7 +15,7 @@ buildscript { plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.5" + id("us.ihmc.ihmc-ci") version "1.1.6" } apply plugin: "org.ajoberstar.grgit" diff --git a/ros2-msg-to-idl-generator/build.gradle b/ros2-msg-to-idl-generator/build.gradle index 5eba83f9..efc996c7 100644 --- a/ros2-msg-to-idl-generator/build.gradle +++ b/ros2-msg-to-idl-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.5" + id("us.ihmc.ihmc-ci") version "1.1.6" } apply plugin: "application" diff --git a/ros2-msg-to-pubsub-generator/build.gradle b/ros2-msg-to-pubsub-generator/build.gradle index 435af579..4393a533 100644 --- a/ros2-msg-to-pubsub-generator/build.gradle +++ b/ros2-msg-to-pubsub-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.1" - id("us.ihmc.ihmc-ci") version "1.1.5" + id("us.ihmc.ihmc-ci") version "1.1.6" } ihmc { From bb53a6c3fa1bd1d791032d424f2714bac2f9ab7b Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Mon, 26 Nov 2018 12:18:24 -0600 Subject: [PATCH 13/23] :arrow_up: ihmc-build 0.15.4 --- build.gradle | 2 +- ihmc-ros2-library/build.gradle | 2 +- ihmc-ros2-library/settings.gradle | 2 +- ros2-common-interfaces/build.gradle | 2 +- ros2-common-interfaces/settings.gradle | 2 +- ros2-msg-to-idl-generator/build.gradle | 2 +- ros2-msg-to-idl-generator/settings.gradle | 2 +- ros2-msg-to-pubsub-generator/build.gradle | 2 +- ros2-msg-to-pubsub-generator/settings.gradle | 2 +- settings.gradle | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 7fe3cf2f..a444aa53 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,3 @@ plugins { - id("us.ihmc.ihmc-build") version "0.15.1" + id("us.ihmc.ihmc-build") version "0.15.4" } diff --git a/ihmc-ros2-library/build.gradle b/ihmc-ros2-library/build.gradle index e666beae..8ad4175b 100644 --- a/ihmc-ros2-library/build.gradle +++ b/ihmc-ros2-library/build.gradle @@ -1,5 +1,5 @@ plugins { - id("us.ihmc.ihmc-build") version "0.15.1" + id("us.ihmc.ihmc-build") version "0.15.4" id("us.ihmc.ihmc-ci") version "1.1.6" } diff --git a/ihmc-ros2-library/settings.gradle b/ihmc-ros2-library/settings.gradle index 2a23f9a2..5e740251 100644 --- a/ihmc-ros2-library/settings.gradle +++ b/ihmc-ros2-library/settings.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "us.ihmc:ihmc-build:0.15.1" + classpath "us.ihmc:ihmc-build:0.15.4" } } diff --git a/ros2-common-interfaces/build.gradle b/ros2-common-interfaces/build.gradle index c82aa590..2e838324 100644 --- a/ros2-common-interfaces/build.gradle +++ b/ros2-common-interfaces/build.gradle @@ -14,7 +14,7 @@ buildscript { } plugins { - id("us.ihmc.ihmc-build") version "0.15.1" + id("us.ihmc.ihmc-build") version "0.15.4" id("us.ihmc.ihmc-ci") version "1.1.6" } diff --git a/ros2-common-interfaces/settings.gradle b/ros2-common-interfaces/settings.gradle index 65f7b731..d77636fe 100644 --- a/ros2-common-interfaces/settings.gradle +++ b/ros2-common-interfaces/settings.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "us.ihmc:ihmc-build:0.15.1" + classpath "us.ihmc:ihmc-build:0.15.4" } } diff --git a/ros2-msg-to-idl-generator/build.gradle b/ros2-msg-to-idl-generator/build.gradle index efc996c7..4abdc1b7 100644 --- a/ros2-msg-to-idl-generator/build.gradle +++ b/ros2-msg-to-idl-generator/build.gradle @@ -1,5 +1,5 @@ plugins { - id("us.ihmc.ihmc-build") version "0.15.1" + id("us.ihmc.ihmc-build") version "0.15.4" id("us.ihmc.ihmc-ci") version "1.1.6" } diff --git a/ros2-msg-to-idl-generator/settings.gradle b/ros2-msg-to-idl-generator/settings.gradle index 2a23f9a2..5e740251 100644 --- a/ros2-msg-to-idl-generator/settings.gradle +++ b/ros2-msg-to-idl-generator/settings.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "us.ihmc:ihmc-build:0.15.1" + classpath "us.ihmc:ihmc-build:0.15.4" } } diff --git a/ros2-msg-to-pubsub-generator/build.gradle b/ros2-msg-to-pubsub-generator/build.gradle index 4393a533..c65210fd 100644 --- a/ros2-msg-to-pubsub-generator/build.gradle +++ b/ros2-msg-to-pubsub-generator/build.gradle @@ -1,5 +1,5 @@ plugins { - id("us.ihmc.ihmc-build") version "0.15.1" + id("us.ihmc.ihmc-build") version "0.15.4" id("us.ihmc.ihmc-ci") version "1.1.6" } diff --git a/ros2-msg-to-pubsub-generator/settings.gradle b/ros2-msg-to-pubsub-generator/settings.gradle index 2a23f9a2..5e740251 100644 --- a/ros2-msg-to-pubsub-generator/settings.gradle +++ b/ros2-msg-to-pubsub-generator/settings.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "us.ihmc:ihmc-build:0.15.1" + classpath "us.ihmc:ihmc-build:0.15.4" } } diff --git a/settings.gradle b/settings.gradle index 60228e05..913bba60 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "us.ihmc:ihmc-build:0.15.1" + classpath "us.ihmc:ihmc-build:0.15.4" } } From bb2c288da93b635c405b35d973393a44ffcc1f02 Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 7 Dec 2018 14:42:33 -0600 Subject: [PATCH 14/23] Upgrade ihmc-ci plugin. --- ihmc-ros2-library/build.gradle | 2 +- ros2-common-interfaces/build.gradle | 2 +- ros2-msg-to-idl-generator/build.gradle | 2 +- ros2-msg-to-pubsub-generator/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ihmc-ros2-library/build.gradle b/ihmc-ros2-library/build.gradle index 8ad4175b..24197170 100644 --- a/ihmc-ros2-library/build.gradle +++ b/ihmc-ros2-library/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.4" - id("us.ihmc.ihmc-ci") version "1.1.6" + id("us.ihmc.ihmc-ci") version "3.2" } ihmc { diff --git a/ros2-common-interfaces/build.gradle b/ros2-common-interfaces/build.gradle index 2e838324..9e07a442 100644 --- a/ros2-common-interfaces/build.gradle +++ b/ros2-common-interfaces/build.gradle @@ -15,7 +15,7 @@ buildscript { plugins { id("us.ihmc.ihmc-build") version "0.15.4" - id("us.ihmc.ihmc-ci") version "1.1.6" + id("us.ihmc.ihmc-ci") version "3.2" } apply plugin: "org.ajoberstar.grgit" diff --git a/ros2-msg-to-idl-generator/build.gradle b/ros2-msg-to-idl-generator/build.gradle index 4abdc1b7..2e6a2755 100644 --- a/ros2-msg-to-idl-generator/build.gradle +++ b/ros2-msg-to-idl-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.4" - id("us.ihmc.ihmc-ci") version "1.1.6" + id("us.ihmc.ihmc-ci") version "3.2" } apply plugin: "application" diff --git a/ros2-msg-to-pubsub-generator/build.gradle b/ros2-msg-to-pubsub-generator/build.gradle index c65210fd..5ff7f5dc 100644 --- a/ros2-msg-to-pubsub-generator/build.gradle +++ b/ros2-msg-to-pubsub-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.4" - id("us.ihmc.ihmc-ci") version "1.1.6" + id("us.ihmc.ihmc-ci") version "3.2" } ihmc { From a75c390559a91c2d0b37ad7d780730bec7044b9f Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 7 Dec 2018 14:43:06 -0600 Subject: [PATCH 15/23] Add JUnit 4 to 5 Assert translator. --- .../test/java/us/ihmc/robotics/Assert.java | 175 ++++++++++++++++++ .../test/java/us/ihmc/robotics/Assert.java | 175 ++++++++++++++++++ 2 files changed, 350 insertions(+) create mode 100644 ros2-msg-to-idl-generator/src/test/java/us/ihmc/robotics/Assert.java create mode 100644 ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/robotics/Assert.java diff --git a/ros2-msg-to-idl-generator/src/test/java/us/ihmc/robotics/Assert.java b/ros2-msg-to-idl-generator/src/test/java/us/ihmc/robotics/Assert.java new file mode 100644 index 00000000..4f64d6de --- /dev/null +++ b/ros2-msg-to-idl-generator/src/test/java/us/ihmc/robotics/Assert.java @@ -0,0 +1,175 @@ +package us.ihmc.robotics; + +public class Assert +{ + static public void assertTrue(String message, boolean condition) + { + org.junit.jupiter.api.Assertions.assertTrue(condition, message); + } + + static public void assertTrue(boolean condition) + { + org.junit.jupiter.api.Assertions.assertTrue(condition); + } + + static public void assertFalse(String message, boolean condition) + { + org.junit.jupiter.api.Assertions.assertFalse(condition, message); + } + + static public void assertFalse(boolean condition) + { + org.junit.jupiter.api.Assertions.assertFalse(condition); + } + + static public void fail(String message) + { + org.junit.jupiter.api.Assertions.fail(message); + } + + static public void fail() + { + org.junit.jupiter.api.Assertions.fail(); + } + + static public void assertEquals(String message, Object expected, Object actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + } + + static public void assertEquals(Object expected, Object actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + } + + static public void assertNotEquals(Object expected, Object actual) + { + org.junit.jupiter.api.Assertions.assertNotEquals(expected, actual); + } + + static public void assertNotEquals(long first, long second) + { + org.junit.jupiter.api.Assertions.assertNotEquals(first, second); + } + + static public void assertNotEquals(String message, double first, double second, double delta) + { + org.junit.jupiter.api.Assertions.assertNotEquals(first, second, message); + } + + static public void assertNotEquals(double first, double second, double delta) + { + org.junit.jupiter.api.Assertions.assertNotEquals(first, second); + } + + public static void assertArrayEquals(Object[] expecteds, Object[] actuals) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + } + + public static void assertArrayEquals(int[] expecteds, int[] actuals) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + } + + public static void assertArrayEquals(byte[] expecteds, byte[] actuals) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + } + + public static void assertArrayEquals(double[] expecteds, double[] actuals, double delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + else + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals, delta); + } + + public static void assertArrayEquals(float[] expecteds, float[] actuals, float delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + else + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals, delta); + } + + public static void assertArrayEquals(String string, double[] data, double[] ds, double delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertArrayEquals(data, ds, string); + else + org.junit.jupiter.api.Assertions.assertArrayEquals(data, ds, delta, string); + } + + static public void assertEquals(String message, double expected, double actual, double delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + else + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta, message); + } + + static public void assertEquals(String message, float expected, float actual, float delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + else + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta, message); + } + + static public void assertEquals(long expected, long actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + } + + static public void assertEquals(String message, long expected, long actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + } + + static public void assertEquals(double expected, double actual, double delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + else + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta); + } + + static public void assertEquals(float expected, float actual, float delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + else + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta); + } + + static public void assertNotNull(String message, Object object) + { + org.junit.jupiter.api.Assertions.assertNotNull(object, message); + } + + static public void assertNotNull(Object object) + { + org.junit.jupiter.api.Assertions.assertNotNull(object); + } + + static public void assertNull(String message, Object object) + { + org.junit.jupiter.api.Assertions.assertNull(object, message); + } + + static public void assertNull(Object object) + { + org.junit.jupiter.api.Assertions.assertNull(object); + } + + static public void assertSame(Object expected, Object actual) + { + org.junit.jupiter.api.Assertions.assertSame(expected, actual); + } + + static public void assertNotSame(Object unexpected, Object actual) + { + org.junit.jupiter.api.Assertions.assertNotSame(unexpected, actual); + } +} diff --git a/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/robotics/Assert.java b/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/robotics/Assert.java new file mode 100644 index 00000000..4f64d6de --- /dev/null +++ b/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/robotics/Assert.java @@ -0,0 +1,175 @@ +package us.ihmc.robotics; + +public class Assert +{ + static public void assertTrue(String message, boolean condition) + { + org.junit.jupiter.api.Assertions.assertTrue(condition, message); + } + + static public void assertTrue(boolean condition) + { + org.junit.jupiter.api.Assertions.assertTrue(condition); + } + + static public void assertFalse(String message, boolean condition) + { + org.junit.jupiter.api.Assertions.assertFalse(condition, message); + } + + static public void assertFalse(boolean condition) + { + org.junit.jupiter.api.Assertions.assertFalse(condition); + } + + static public void fail(String message) + { + org.junit.jupiter.api.Assertions.fail(message); + } + + static public void fail() + { + org.junit.jupiter.api.Assertions.fail(); + } + + static public void assertEquals(String message, Object expected, Object actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + } + + static public void assertEquals(Object expected, Object actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + } + + static public void assertNotEquals(Object expected, Object actual) + { + org.junit.jupiter.api.Assertions.assertNotEquals(expected, actual); + } + + static public void assertNotEquals(long first, long second) + { + org.junit.jupiter.api.Assertions.assertNotEquals(first, second); + } + + static public void assertNotEquals(String message, double first, double second, double delta) + { + org.junit.jupiter.api.Assertions.assertNotEquals(first, second, message); + } + + static public void assertNotEquals(double first, double second, double delta) + { + org.junit.jupiter.api.Assertions.assertNotEquals(first, second); + } + + public static void assertArrayEquals(Object[] expecteds, Object[] actuals) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + } + + public static void assertArrayEquals(int[] expecteds, int[] actuals) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + } + + public static void assertArrayEquals(byte[] expecteds, byte[] actuals) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + } + + public static void assertArrayEquals(double[] expecteds, double[] actuals, double delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + else + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals, delta); + } + + public static void assertArrayEquals(float[] expecteds, float[] actuals, float delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + else + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals, delta); + } + + public static void assertArrayEquals(String string, double[] data, double[] ds, double delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertArrayEquals(data, ds, string); + else + org.junit.jupiter.api.Assertions.assertArrayEquals(data, ds, delta, string); + } + + static public void assertEquals(String message, double expected, double actual, double delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + else + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta, message); + } + + static public void assertEquals(String message, float expected, float actual, float delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + else + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta, message); + } + + static public void assertEquals(long expected, long actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + } + + static public void assertEquals(String message, long expected, long actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + } + + static public void assertEquals(double expected, double actual, double delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + else + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta); + } + + static public void assertEquals(float expected, float actual, float delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + else + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta); + } + + static public void assertNotNull(String message, Object object) + { + org.junit.jupiter.api.Assertions.assertNotNull(object, message); + } + + static public void assertNotNull(Object object) + { + org.junit.jupiter.api.Assertions.assertNotNull(object); + } + + static public void assertNull(String message, Object object) + { + org.junit.jupiter.api.Assertions.assertNull(object, message); + } + + static public void assertNull(Object object) + { + org.junit.jupiter.api.Assertions.assertNull(object); + } + + static public void assertSame(Object expected, Object actual) + { + org.junit.jupiter.api.Assertions.assertSame(expected, actual); + } + + static public void assertNotSame(Object unexpected, Object actual) + { + org.junit.jupiter.api.Assertions.assertNotSame(unexpected, actual); + } +} From 55cafb199ea2b7c546546d8c9467bb630d824262 Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 7 Dec 2018 14:53:04 -0600 Subject: [PATCH 16/23] Convert to JUnit 5. --- ihmc-ros2-library/build.gradle | 2 +- .../us/ihmc/ros2/example/CommunicationTest.java | 14 +++++++------- .../java/us/ihmc/ros2/example/DataTypesTest.java | 6 +++--- .../example/RealtimeRos2IntraprocessCopyTest.java | 4 ++-- ros2-msg-to-pubsub-generator/build.gradle | 2 +- .../test/java/us/ihmc/MessageGenerationTest.java | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ihmc-ros2-library/build.gradle b/ihmc-ros2-library/build.gradle index 24197170..80a0cdb4 100644 --- a/ihmc-ros2-library/build.gradle +++ b/ihmc-ros2-library/build.gradle @@ -13,7 +13,7 @@ ihmc { mainDependencies { compile group: "us.ihmc", name: "ihmc-pub-sub", version: "0.10.0" compile group: "us.ihmc", name: "IHMCRealtime", version: "1.1.8" - compile group: "us.ihmc", name: "ihmc-commons", version: "0.24.0" + compile group: "us.ihmc", name: "ihmc-commons", version: "0.25.0" } testDependencies { diff --git a/ihmc-ros2-library/src/test/java/us/ihmc/ros2/example/CommunicationTest.java b/ihmc-ros2-library/src/test/java/us/ihmc/ros2/example/CommunicationTest.java index ca7318b6..206771da 100644 --- a/ihmc-ros2-library/src/test/java/us/ihmc/ros2/example/CommunicationTest.java +++ b/ihmc-ros2-library/src/test/java/us/ihmc/ros2/example/CommunicationTest.java @@ -2,7 +2,7 @@ import org.apache.commons.lang3.tuple.MutablePair; import org.apache.commons.lang3.tuple.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; import ros_msgs.msg.dds.TwoNum; import ros_msgs.msg.dds.TwoNumPubSubType; import us.ihmc.pubsub.DomainFactory.PubSubImplementation; @@ -11,25 +11,25 @@ public class CommunicationTest { - @Test(timeout = 5000) + @Test// timeout = 5000 public void testSimpleIntraProcessCommunication() { testSimpleCommunication(PubSubImplementation.INTRAPROCESS, null); } - @Test(timeout = 5000) + @Test// timeout = 5000 public void testSimpleRealRTPSCommunicationDefaultRosVersion() { testSimpleCommunication(PubSubImplementation.FAST_RTPS, null); } - @Test(timeout = 5000) + @Test// timeout = 5000 public void testSimpleRealRTPSCommunicationArdent() { testSimpleCommunication(PubSubImplementation.FAST_RTPS, Ros2Distro.ARDENT); } - @Test(timeout = 5000) + @Test// timeout = 5000 public void testSimpleRealRTPSCommunicationBouncy() { testSimpleCommunication(PubSubImplementation.FAST_RTPS, Ros2Distro.BOUNCY); @@ -75,7 +75,7 @@ private void testSimpleCommunication(PubSubImplementation pubSubImplementation, Thread.yield(); } - @Test(timeout = 5000) + @Test// timeout = 5000 public void testSimpleRealRTPSCommunicationAndDestroy() { Pair messagesReceived = new MutablePair<>(); @@ -117,7 +117,7 @@ public void testSimpleRealRTPSCommunicationAndDestroy() Thread.yield(); } - @Test(timeout = 5000) + @Test// timeout = 5000 public void testSimpleIntraProcessCommunicationRealtime() { Pair messagesReceived = new MutablePair<>(); diff --git a/ihmc-ros2-library/src/test/java/us/ihmc/ros2/example/DataTypesTest.java b/ihmc-ros2-library/src/test/java/us/ihmc/ros2/example/DataTypesTest.java index 4a5bd6a8..af0d844d 100644 --- a/ihmc-ros2-library/src/test/java/us/ihmc/ros2/example/DataTypesTest.java +++ b/ihmc-ros2-library/src/test/java/us/ihmc/ros2/example/DataTypesTest.java @@ -2,7 +2,7 @@ import org.apache.commons.lang3.tuple.MutablePair; import org.apache.commons.lang3.tuple.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; import ros_msgs.msg.dds.Num; import ros_msgs.msg.dds.NumPubSubType; import us.ihmc.pubsub.DomainFactory.PubSubImplementation; @@ -10,11 +10,11 @@ import us.ihmc.ros2.Ros2Node; import us.ihmc.ros2.Ros2Publisher; -import static org.junit.Assert.*; +import static us.ihmc.robotics.Assert.*; public class DataTypesTest { - @Test(timeout = 30000) + @Test// timeout = 30000 public void testAllDoubleValuesGetAcross() { Pair messagesReceived = new MutablePair<>(); diff --git a/ihmc-ros2-library/src/test/java/us/ihmc/ros2/example/RealtimeRos2IntraprocessCopyTest.java b/ihmc-ros2-library/src/test/java/us/ihmc/ros2/example/RealtimeRos2IntraprocessCopyTest.java index f3aa9d6b..a74dc437 100644 --- a/ihmc-ros2-library/src/test/java/us/ihmc/ros2/example/RealtimeRos2IntraprocessCopyTest.java +++ b/ihmc-ros2-library/src/test/java/us/ihmc/ros2/example/RealtimeRos2IntraprocessCopyTest.java @@ -16,7 +16,7 @@ package us.ihmc.ros2.example; import org.apache.commons.lang3.SystemUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import ros_msgs.msg.dds.BigNumSequence; import ros_msgs.msg.dds.BigNumSequencePubSubType; import ros_msgs.msg.dds.Num; @@ -44,7 +44,7 @@ public class RealtimeRos2IntraprocessCopyTest { public static final int NUMBER_OF_MESSAGES_TO_SEND = 20; - @Test(timeout = 300000) + @Test// timeout = 300000 public void testIntraprocessCopy() throws IOException, InterruptedException { Random random = new Random(892141240123L); diff --git a/ros2-msg-to-pubsub-generator/build.gradle b/ros2-msg-to-pubsub-generator/build.gradle index 5ff7f5dc..4d46b515 100644 --- a/ros2-msg-to-pubsub-generator/build.gradle +++ b/ros2-msg-to-pubsub-generator/build.gradle @@ -29,5 +29,5 @@ mainDependencies { testDependencies { compile pubsub - compile "us.ihmc:ihmc-commons:0.24.0" + compile "us.ihmc:ihmc-commons:0.25.0" } diff --git a/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java b/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java index 01694606..e9f452e1 100644 --- a/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java +++ b/ros2-msg-to-pubsub-generator/src/test/java/us/ihmc/MessageGenerationTest.java @@ -1,6 +1,6 @@ package us.ihmc; -import org.junit.Test; +import org.junit.jupiter.api.Test; import us.ihmc.log.LogTools; import us.ihmc.commons.nio.FileTools; import us.ihmc.ros2.rosidl.RosInterfaceGenerator; @@ -11,7 +11,7 @@ public class MessageGenerationTest { - @Test(timeout = 30000) + @Test// timeout = 30000 public void testMessageGeneration() throws IOException { Path startingPath; From 490fb2f206efb34c822c9df33a986fb2150fe141 Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Fri, 7 Dec 2018 17:03:19 -0600 Subject: [PATCH 17/23] Push Assert to fix Gradle compile. --- .../test/java/us/ihmc/robotics/Assert.java | 175 ++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 ihmc-ros2-library/src/test/java/us/ihmc/robotics/Assert.java diff --git a/ihmc-ros2-library/src/test/java/us/ihmc/robotics/Assert.java b/ihmc-ros2-library/src/test/java/us/ihmc/robotics/Assert.java new file mode 100644 index 00000000..4f64d6de --- /dev/null +++ b/ihmc-ros2-library/src/test/java/us/ihmc/robotics/Assert.java @@ -0,0 +1,175 @@ +package us.ihmc.robotics; + +public class Assert +{ + static public void assertTrue(String message, boolean condition) + { + org.junit.jupiter.api.Assertions.assertTrue(condition, message); + } + + static public void assertTrue(boolean condition) + { + org.junit.jupiter.api.Assertions.assertTrue(condition); + } + + static public void assertFalse(String message, boolean condition) + { + org.junit.jupiter.api.Assertions.assertFalse(condition, message); + } + + static public void assertFalse(boolean condition) + { + org.junit.jupiter.api.Assertions.assertFalse(condition); + } + + static public void fail(String message) + { + org.junit.jupiter.api.Assertions.fail(message); + } + + static public void fail() + { + org.junit.jupiter.api.Assertions.fail(); + } + + static public void assertEquals(String message, Object expected, Object actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + } + + static public void assertEquals(Object expected, Object actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + } + + static public void assertNotEquals(Object expected, Object actual) + { + org.junit.jupiter.api.Assertions.assertNotEquals(expected, actual); + } + + static public void assertNotEquals(long first, long second) + { + org.junit.jupiter.api.Assertions.assertNotEquals(first, second); + } + + static public void assertNotEquals(String message, double first, double second, double delta) + { + org.junit.jupiter.api.Assertions.assertNotEquals(first, second, message); + } + + static public void assertNotEquals(double first, double second, double delta) + { + org.junit.jupiter.api.Assertions.assertNotEquals(first, second); + } + + public static void assertArrayEquals(Object[] expecteds, Object[] actuals) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + } + + public static void assertArrayEquals(int[] expecteds, int[] actuals) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + } + + public static void assertArrayEquals(byte[] expecteds, byte[] actuals) + { + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + } + + public static void assertArrayEquals(double[] expecteds, double[] actuals, double delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + else + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals, delta); + } + + public static void assertArrayEquals(float[] expecteds, float[] actuals, float delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals); + else + org.junit.jupiter.api.Assertions.assertArrayEquals(expecteds, actuals, delta); + } + + public static void assertArrayEquals(String string, double[] data, double[] ds, double delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertArrayEquals(data, ds, string); + else + org.junit.jupiter.api.Assertions.assertArrayEquals(data, ds, delta, string); + } + + static public void assertEquals(String message, double expected, double actual, double delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + else + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta, message); + } + + static public void assertEquals(String message, float expected, float actual, float delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + else + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta, message); + } + + static public void assertEquals(long expected, long actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + } + + static public void assertEquals(String message, long expected, long actual) + { + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, message); + } + + static public void assertEquals(double expected, double actual, double delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + else + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta); + } + + static public void assertEquals(float expected, float actual, float delta) + { + if (delta == 0.0) + org.junit.jupiter.api.Assertions.assertEquals(expected, actual); + else + org.junit.jupiter.api.Assertions.assertEquals(expected, actual, delta); + } + + static public void assertNotNull(String message, Object object) + { + org.junit.jupiter.api.Assertions.assertNotNull(object, message); + } + + static public void assertNotNull(Object object) + { + org.junit.jupiter.api.Assertions.assertNotNull(object); + } + + static public void assertNull(String message, Object object) + { + org.junit.jupiter.api.Assertions.assertNull(object, message); + } + + static public void assertNull(Object object) + { + org.junit.jupiter.api.Assertions.assertNull(object); + } + + static public void assertSame(Object expected, Object actual) + { + org.junit.jupiter.api.Assertions.assertSame(expected, actual); + } + + static public void assertNotSame(Object unexpected, Object actual) + { + org.junit.jupiter.api.Assertions.assertNotSame(unexpected, actual); + } +} From 9f68c2809b184c3ab41cb5365d7f0d42d93de0df Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Wed, 12 Dec 2018 14:53:23 -0600 Subject: [PATCH 18/23] :arrow_up: ihmc-build 0.15.5 --- ihmc-ros2-library/settings.gradle | 2 +- ros2-common-interfaces/settings.gradle | 2 +- ros2-msg-to-idl-generator/settings.gradle | 2 +- ros2-msg-to-pubsub-generator/settings.gradle | 2 +- settings.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ihmc-ros2-library/settings.gradle b/ihmc-ros2-library/settings.gradle index 5e740251..a3a99d2e 100644 --- a/ihmc-ros2-library/settings.gradle +++ b/ihmc-ros2-library/settings.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "us.ihmc:ihmc-build:0.15.4" + classpath "us.ihmc:ihmc-build:0.15.5" } } diff --git a/ros2-common-interfaces/settings.gradle b/ros2-common-interfaces/settings.gradle index d77636fe..c448d04c 100644 --- a/ros2-common-interfaces/settings.gradle +++ b/ros2-common-interfaces/settings.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "us.ihmc:ihmc-build:0.15.4" + classpath "us.ihmc:ihmc-build:0.15.5" } } diff --git a/ros2-msg-to-idl-generator/settings.gradle b/ros2-msg-to-idl-generator/settings.gradle index 5e740251..a3a99d2e 100644 --- a/ros2-msg-to-idl-generator/settings.gradle +++ b/ros2-msg-to-idl-generator/settings.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "us.ihmc:ihmc-build:0.15.4" + classpath "us.ihmc:ihmc-build:0.15.5" } } diff --git a/ros2-msg-to-pubsub-generator/settings.gradle b/ros2-msg-to-pubsub-generator/settings.gradle index 5e740251..a3a99d2e 100644 --- a/ros2-msg-to-pubsub-generator/settings.gradle +++ b/ros2-msg-to-pubsub-generator/settings.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "us.ihmc:ihmc-build:0.15.4" + classpath "us.ihmc:ihmc-build:0.15.5" } } diff --git a/settings.gradle b/settings.gradle index 913bba60..6ba1b114 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "us.ihmc:ihmc-build:0.15.4" + classpath "us.ihmc:ihmc-build:0.15.5" } } From 0e1d826379743e6d8ae2d1bf3f96c3779dea5dd6 Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Wed, 12 Dec 2018 16:08:24 -0600 Subject: [PATCH 19/23] :arrow_up: ihmc-build 0.15.5, woops regex missed the plugins block --- build.gradle | 2 +- ihmc-ros2-library/build.gradle | 2 +- ros2-common-interfaces/build.gradle | 2 +- ros2-msg-to-idl-generator/build.gradle | 2 +- ros2-msg-to-pubsub-generator/build.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index a444aa53..228c760e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,3 @@ plugins { - id("us.ihmc.ihmc-build") version "0.15.4" + id("us.ihmc.ihmc-build") version "0.15.5" } diff --git a/ihmc-ros2-library/build.gradle b/ihmc-ros2-library/build.gradle index 80a0cdb4..542a815e 100644 --- a/ihmc-ros2-library/build.gradle +++ b/ihmc-ros2-library/build.gradle @@ -1,5 +1,5 @@ plugins { - id("us.ihmc.ihmc-build") version "0.15.4" + id("us.ihmc.ihmc-build") version "0.15.5" id("us.ihmc.ihmc-ci") version "3.2" } diff --git a/ros2-common-interfaces/build.gradle b/ros2-common-interfaces/build.gradle index 9e07a442..2ec61f93 100644 --- a/ros2-common-interfaces/build.gradle +++ b/ros2-common-interfaces/build.gradle @@ -14,7 +14,7 @@ buildscript { } plugins { - id("us.ihmc.ihmc-build") version "0.15.4" + id("us.ihmc.ihmc-build") version "0.15.5" id("us.ihmc.ihmc-ci") version "3.2" } diff --git a/ros2-msg-to-idl-generator/build.gradle b/ros2-msg-to-idl-generator/build.gradle index 2e6a2755..b62aa1c9 100644 --- a/ros2-msg-to-idl-generator/build.gradle +++ b/ros2-msg-to-idl-generator/build.gradle @@ -1,5 +1,5 @@ plugins { - id("us.ihmc.ihmc-build") version "0.15.4" + id("us.ihmc.ihmc-build") version "0.15.5" id("us.ihmc.ihmc-ci") version "3.2" } diff --git a/ros2-msg-to-pubsub-generator/build.gradle b/ros2-msg-to-pubsub-generator/build.gradle index 4d46b515..4e7ae375 100644 --- a/ros2-msg-to-pubsub-generator/build.gradle +++ b/ros2-msg-to-pubsub-generator/build.gradle @@ -1,5 +1,5 @@ plugins { - id("us.ihmc.ihmc-build") version "0.15.4" + id("us.ihmc.ihmc-build") version "0.15.5" id("us.ihmc.ihmc-ci") version "3.2" } From 8074a0ea51d0491b61cd94d1ea4bdf220708377a Mon Sep 17 00:00:00 2001 From: Duncan Calvert Date: Wed, 12 Dec 2018 17:23:55 -0600 Subject: [PATCH 20/23] Get better info about what's hanging. This upgrade adds better test logging. --- ihmc-ros2-library/build.gradle | 2 +- ros2-common-interfaces/build.gradle | 2 +- ros2-msg-to-idl-generator/build.gradle | 2 +- ros2-msg-to-pubsub-generator/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ihmc-ros2-library/build.gradle b/ihmc-ros2-library/build.gradle index 542a815e..93106b4a 100644 --- a/ihmc-ros2-library/build.gradle +++ b/ihmc-ros2-library/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.5" - id("us.ihmc.ihmc-ci") version "3.2" + id("us.ihmc.ihmc-ci") version "3.4" } ihmc { diff --git a/ros2-common-interfaces/build.gradle b/ros2-common-interfaces/build.gradle index 2ec61f93..d74e00d4 100644 --- a/ros2-common-interfaces/build.gradle +++ b/ros2-common-interfaces/build.gradle @@ -15,7 +15,7 @@ buildscript { plugins { id("us.ihmc.ihmc-build") version "0.15.5" - id("us.ihmc.ihmc-ci") version "3.2" + id("us.ihmc.ihmc-ci") version "3.4" } apply plugin: "org.ajoberstar.grgit" diff --git a/ros2-msg-to-idl-generator/build.gradle b/ros2-msg-to-idl-generator/build.gradle index b62aa1c9..f1827a2c 100644 --- a/ros2-msg-to-idl-generator/build.gradle +++ b/ros2-msg-to-idl-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.5" - id("us.ihmc.ihmc-ci") version "3.2" + id("us.ihmc.ihmc-ci") version "3.4" } apply plugin: "application" diff --git a/ros2-msg-to-pubsub-generator/build.gradle b/ros2-msg-to-pubsub-generator/build.gradle index 4e7ae375..878dd9d3 100644 --- a/ros2-msg-to-pubsub-generator/build.gradle +++ b/ros2-msg-to-pubsub-generator/build.gradle @@ -1,6 +1,6 @@ plugins { id("us.ihmc.ihmc-build") version "0.15.5" - id("us.ihmc.ihmc-ci") version "3.2" + id("us.ihmc.ihmc-ci") version "3.4" } ihmc { From c11ddf1a2a939d4666359b0e0d0b9a851627581d Mon Sep 17 00:00:00 2001 From: Sylvain Bertrand Date: Tue, 11 Dec 2018 16:50:38 -0600 Subject: [PATCH 21/23] :arrow_up: euclid 0.11.0. --- ros2-common-interfaces/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros2-common-interfaces/build.gradle b/ros2-common-interfaces/build.gradle index d74e00d4..04a16700 100644 --- a/ros2-common-interfaces/build.gradle +++ b/ros2-common-interfaces/build.gradle @@ -42,7 +42,7 @@ ihmc { } mainDependencies { - compile group: "us.ihmc", name: "euclid", version: "0.9.3" + compile group: "us.ihmc", name: "euclid-geometry", version: "0.11.0" compile group: "us.ihmc", name: "ihmc-pub-sub", version: "0.10.0" } From 0b4c030a2e19a427cec1cc24e3a04a0fa3cbd3eb Mon Sep 17 00:00:00 2001 From: Sylvain Bertrand Date: Wed, 12 Dec 2018 17:26:39 -0600 Subject: [PATCH 22/23] :arrow_up: ihmc-pub-sub 0.10.1. --- ihmc-ros2-library/build.gradle | 2 +- ros2-common-interfaces/build.gradle | 2 +- ros2-msg-to-pubsub-generator/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ihmc-ros2-library/build.gradle b/ihmc-ros2-library/build.gradle index 93106b4a..0fa841d7 100644 --- a/ihmc-ros2-library/build.gradle +++ b/ihmc-ros2-library/build.gradle @@ -11,7 +11,7 @@ ihmc { } mainDependencies { - compile group: "us.ihmc", name: "ihmc-pub-sub", version: "0.10.0" + compile group: "us.ihmc", name: "ihmc-pub-sub", version: "0.10.1" compile group: "us.ihmc", name: "IHMCRealtime", version: "1.1.8" compile group: "us.ihmc", name: "ihmc-commons", version: "0.25.0" } diff --git a/ros2-common-interfaces/build.gradle b/ros2-common-interfaces/build.gradle index 04a16700..436c25eb 100644 --- a/ros2-common-interfaces/build.gradle +++ b/ros2-common-interfaces/build.gradle @@ -43,7 +43,7 @@ ihmc { mainDependencies { compile group: "us.ihmc", name: "euclid-geometry", version: "0.11.0" - compile group: "us.ihmc", name: "ihmc-pub-sub", version: "0.10.0" + compile group: "us.ihmc", name: "ihmc-pub-sub", version: "0.10.1" } generatorDependencies { diff --git a/ros2-msg-to-pubsub-generator/build.gradle b/ros2-msg-to-pubsub-generator/build.gradle index 878dd9d3..354149bf 100644 --- a/ros2-msg-to-pubsub-generator/build.gradle +++ b/ros2-msg-to-pubsub-generator/build.gradle @@ -16,7 +16,7 @@ ihmc { configurePublications() } -def pubsubVersion = "0.10.0" +def pubsubVersion = "0.10.1" def pubsub = "us.ihmc:ihmc-pub-sub:$pubsubVersion" def pubsubGen = "us.ihmc:ihmc-pub-sub-generator:$pubsubVersion" def ros2IdlGen = "us.ihmc:ros2-msg-to-idl-generator:$version" From 8f6dbe56ac538a20f2446ae796c2e7fac311f5eb Mon Sep 17 00:00:00 2001 From: Sylvain Bertrand Date: Wed, 12 Dec 2018 17:45:02 -0600 Subject: [PATCH 23/23] :bookmark: 0.13.1 --- group.gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group.gradle.properties b/group.gradle.properties index 42816ecd..0ed0014d 100644 --- a/group.gradle.properties +++ b/group.gradle.properties @@ -1,5 +1,5 @@ group = us.ihmc -version = 0.13.0 +version = 0.13.1 vcsUrl = https://github.com/ihmcrobotics/ihmc-java-ros2-communication openSource = true maintainer = "Duncan Calvert (dcalvert@ihmc.us)"