Skip to content

Commit

Permalink
5 ➡️ 6 (#1277)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <louise@openrobotics.org>
  • Loading branch information
chapulina authored Jan 12, 2022
2 parents fe335f9 + db38ea9 commit 4dea262
Show file tree
Hide file tree
Showing 172 changed files with 1,006 additions and 314 deletions.
35 changes: 35 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,41 @@

## Ignition Gazebo 4.x

### Ignition Gazebo 4.13.0 (2021-11-15)

1. Prevent creation of spurious `<plugin>` elements when saving worlds
* [Pull request #1192](https://github.com/ignitionrobotics/ign-gazebo/pull/1192)

1. Add support for tracked vehicles
* [Pull request #869](https://github.com/ignitionrobotics/ign-gazebo/pull/869)

1. Add components to dynamically set joint limits
* [Pull request #847](https://github.com/ignitionrobotics/ign-gazebo/pull/847)

1. Fix updating component from state
* [Pull request #1181](https://github.com/ignitionrobotics/ign-gazebo/pull/1181)

1. Fix updating a component's data via SerializedState msg
* [Pull request #1149](https://github.com/ignitionrobotics/ign-gazebo/pull/1149)

1. Sensor systems work if loaded after sensors
* [Pull request #1104](https://github.com/ignitionrobotics/ign-gazebo/pull/1104)

1. Fix generation of systems library symlinks in build directory
* [Pull request #1160](https://github.com/ignitionrobotics/ign-gazebo/pull/1160)

1. Edit material colors in component inspector
* [Pull request #1123](https://github.com/ignitionrobotics/ign-gazebo/pull/1123)

1. Support setting the background color for sensors
* [Pull request #1147](https://github.com/ignitionrobotics/ign-gazebo/pull/1147)

1. Use uint64_t for ComponentInspector Entity IDs
* [Pull request #1144](https://github.com/ignitionrobotics/ign-gazebo/pull/1144)

1. Fix integers and floats on component inspector
* [Pull request #1143](https://github.com/ignitionrobotics/ign-gazebo/pull/1143)

### Ignition Gazebo 4.12.0 (2021-10-22)

1. Fix performance issue with contact data and AABB updates.
Expand Down
4 changes: 3 additions & 1 deletion src/Component_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <gtest/gtest.h>
#include <ignition/msgs/int32.pb.h>
#include <ignition/utilities/ExtraTestMacros.hh>

#include <memory>

Expand Down Expand Up @@ -61,7 +62,8 @@ TEST_F(ComponentTest, ComponentCanBeCopiedAfterDefaultCtor)
}

//////////////////////////////////////////////////
TEST_F(ComponentTest, DataByMove)
// See https://github.com/ignitionrobotics/ign-gazebo/issues/1175
TEST_F(ComponentTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(DataByMove))
{
auto factory = components::Factory::Instance();

Expand Down
92 changes: 62 additions & 30 deletions src/EntityComponentManager_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <ignition/common/Util.hh>
#include <ignition/math/Pose3.hh>
#include <ignition/math/Rand.hh>
#include <ignition/utilities/ExtraTestMacros.hh>
#include <ignition/utils/SuppressWarning.hh>

#include "ignition/gazebo/components/CanonicalLink.hh"
Expand Down Expand Up @@ -135,7 +136,8 @@ TEST_P(EntityComponentManagerFixture, InvalidComponentType)
}

/////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, RemoveComponent)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(RemoveComponent))
{
// Create some entities
auto eInt = manager.CreateEntity();
Expand Down Expand Up @@ -212,7 +214,8 @@ TEST_P(EntityComponentManagerFixture, RemoveComponent)
}

/////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EntitiesAndComponents)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EntitiesAndComponents))
{
EXPECT_EQ(0u, manager.EntityCount());

Expand Down Expand Up @@ -299,7 +302,8 @@ TEST_P(EntityComponentManagerFixture, EntitiesAndComponents)
}

/////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ComponentValues)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ComponentValues))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -474,7 +478,8 @@ TEST_P(EntityComponentManagerFixture, ComponentValues)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, RebuildViews)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(RebuildViews))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -543,7 +548,8 @@ TEST_P(EntityComponentManagerFixture, RebuildViews)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ViewsAddComponents)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ViewsAddComponents))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -616,7 +622,8 @@ TEST_P(EntityComponentManagerFixture, ViewsAddComponents)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ViewsRemoveComponents)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ViewsRemoveComponents))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -690,7 +697,8 @@ TEST_P(EntityComponentManagerFixture, ViewsRemoveComponents)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ViewsAddEntity)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ViewsAddEntity))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -779,7 +787,8 @@ TEST_P(EntityComponentManagerFixture, ViewsAddEntity)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ViewsRemoveEntities)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ViewsRemoveEntities))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -915,7 +924,8 @@ TEST_P(EntityComponentManagerFixture, RemoveEntity)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ViewsRemoveEntity)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ViewsRemoveEntity))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -1047,7 +1057,8 @@ int eachCount(EntityCompMgrTest &_manager)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachNewBasic)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachNewBasic))
{
// Create entities
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -1091,7 +1102,8 @@ TEST_P(EntityComponentManagerFixture, EachNewBasic)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachNewAfterRemoveComponent)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachNewAfterRemoveComponent))
{
// Create entities
Entity e1 = manager.CreateEntity();
Expand All @@ -1111,7 +1123,8 @@ TEST_P(EntityComponentManagerFixture, EachNewAfterRemoveComponent)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachNewRemoveComponentFromRemoveEntity)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachNewRemoveComponentFromRemoveEntity))
{
// Create entities
Entity e1 = manager.CreateEntity();
Expand All @@ -1131,7 +1144,8 @@ TEST_P(EntityComponentManagerFixture, EachNewRemoveComponentFromRemoveEntity)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachNewAddComponentToExistingEntity)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachNewAddComponentToExistingEntity))
{
// Create entities
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -1164,7 +1178,8 @@ TEST_P(EntityComponentManagerFixture, EachNewAddComponentToExistingEntity)
}

////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachRemoveBasic)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachRemoveBasic))
{
// Create an entities
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -1218,7 +1233,8 @@ TEST_P(EntityComponentManagerFixture, EachRemoveAlreadyRemove)
}

////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachRemoveAfterRebuild)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachRemoveAfterRebuild))
{
// Test after rebuild
Entity e1 = manager.CreateEntity();
Expand All @@ -1237,7 +1253,8 @@ TEST_P(EntityComponentManagerFixture, EachRemoveAfterRebuild)
}

////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachRemoveAddComponentToRemoveEntity)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachRemoveAddComponentToRemoveEntity))
{
Entity e1 = manager.CreateEntity();
auto comp1 = manager.CreateComponent<IntComponent>(e1, IntComponent(123));
Expand All @@ -1255,7 +1272,8 @@ TEST_P(EntityComponentManagerFixture, EachRemoveAddComponentToRemoveEntity)
}

////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachRemoveAllRemove)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachRemoveAllRemove))
{
// Test when all entities are removed
Entity e1 = manager.CreateEntity();
Expand All @@ -1274,7 +1292,8 @@ TEST_P(EntityComponentManagerFixture, EachRemoveAllRemove)
}

////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachNewEachRemove)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachNewEachRemove))
{
// Test EachNew and EachRemove together
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -1304,7 +1323,8 @@ TEST_P(EntityComponentManagerFixture, EachNewEachRemove)
}

////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachGetsNewOldRemove)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachGetsNewOldRemove))
{
// Test that an Each call gets new, old, and removed entities
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -1399,7 +1419,8 @@ TEST_P(EntityComponentManagerFixture, EachAddRemoveComponent)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EntityByComponents)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EntityByComponents))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -1479,7 +1500,8 @@ TEST_P(EntityComponentManagerFixture, EntityByComponents)
}

/////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EntityGraph)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EntityGraph))
{
EXPECT_EQ(0u, manager.EntityCount());

Expand Down Expand Up @@ -1618,7 +1640,7 @@ TEST_P(EntityComponentManagerFixture, EntityGraph)
}

/////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, State)
TEST_P(EntityComponentManagerFixture, IGN_UTILS_TEST_DISABLED_ON_WIN32(State))
{
// Entities and components
Entity e1{1};
Expand Down Expand Up @@ -1899,7 +1921,8 @@ TEST_P(EntityComponentManagerFixture, State)
}

/////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ChangedStateComponents)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ChangedStateComponents))
{
// Entity and component
Entity e1{1};
Expand Down Expand Up @@ -2180,7 +2203,8 @@ TEST_P(EntityComponentManagerFixture, Descendants)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, SetChanged)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(SetChanged))
{
// Create entities
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -2278,7 +2302,9 @@ TEST_P(EntityComponentManagerFixture, SetEntityCreateOffset)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, SerializedStateMapMsgAfterRemoveComponent)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(
SerializedStateMapMsgAfterRemoveComponent))
{
// Create entity
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -2346,7 +2372,8 @@ TEST_P(EntityComponentManagerFixture, SerializedStateMapMsgAfterRemoveComponent)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, SerializedStateMsgAfterRemoveComponent)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(SerializedStateMsgAfterRemoveComponent))
{
// Create entity
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -2410,7 +2437,8 @@ TEST_P(EntityComponentManagerFixture, SerializedStateMsgAfterRemoveComponent)
//////////////////////////////////////////////////
// Verify SerializedStateMap message with no changed components,
// but some removed components
TEST_P(EntityComponentManagerFixture, SerializedStateMapMsgCompsRemovedOnly)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(SerializedStateMapMsgCompsRemovedOnly))
{
// Create entity
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -2454,7 +2482,8 @@ TEST_P(EntityComponentManagerFixture, SerializedStateMapMsgCompsRemovedOnly)
//////////////////////////////////////////////////
// Verify that removed components are correctly filtered when creating a
// SerializedStateMap message
TEST_P(EntityComponentManagerFixture, SetRemovedComponentsMsgTypesFilter)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(SetRemovedComponentsMsgTypesFilter))
{
// Create entity
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -2495,7 +2524,9 @@ TEST_P(EntityComponentManagerFixture, SetRemovedComponentsMsgTypesFilter)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, RemovedComponentsSyncBetweenServerAndGUI)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(
RemovedComponentsSyncBetweenServerAndGUI))
{
// Simulate the GUI's ECM
EntityCompMgrTest guiManager;
Expand Down Expand Up @@ -3020,7 +3051,8 @@ TEST_P(EntityComponentManagerFixture, PinnedEntity)
//////////////////////////////////////////////////
/// \brief Test using msgs::SerializedStateMap and msgs::SerializedState
/// to update existing component data between multiple ECMs
TEST_P(EntityComponentManagerFixture, StateMsgUpdateComponent)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(StateMsgUpdateComponent))
{
// create 2 ECMs: one will be modified directly, and the other should be
// updated to match the first via msgs::SerializedStateMap
Expand Down
6 changes: 4 additions & 2 deletions src/ModelCommandAPI_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <string>

#include <gtest/gtest.h>
#include <ignition/utilities/ExtraTestMacros.hh>

#include "ignition/gazebo/Server.hh"
#include "ignition/gazebo/test_config.hh" // NOLINT(build/include)
Expand Down Expand Up @@ -72,7 +73,8 @@ std::string customExecStr(std::string _cmd)

/////////////////////////////////////////////////
// Test `ign model` command when no Gazebo server is running.
TEST(ModelCommandAPI, NoServerRunning)
// See https://github.com/ignitionrobotics/ign-gazebo/issues/1175
TEST(ModelCommandAPI, IGN_UTILS_TEST_DISABLED_ON_WIN32(NoServerRunning))
{
const std::string cmd = kIgnModelCommand + "--list ";
const std::string output = customExecStr(cmd);
Expand All @@ -85,7 +87,7 @@ TEST(ModelCommandAPI, NoServerRunning)

/////////////////////////////////////////////////
// Tests `ign model` command.
TEST(ModelCommandAPI, Commands)
TEST(ModelCommandAPI, IGN_UTILS_TEST_DISABLED_ON_WIN32(Commands))
{
ignition::gazebo::ServerConfig serverConfig;
// Using an static model to avoid any movements in the simulation.
Expand Down
Loading

0 comments on commit 4dea262

Please sign in to comment.