Commit b0894109 authored by Moore's avatar Moore
Browse files

Re #15999 GeometryTest fixes

parent 1af3105f
......@@ -365,7 +365,7 @@ public:
double radius, height;
shape->GetObjectGeom(otype, vectors, radius, height);
TS_ASSERT_EQUALS(otype, 5);
TS_ASSERT_EQUALS(otype, 6);
TS_ASSERT_EQUALS(radius, 0.1);
TS_ASSERT_EQUALS(height, 0.6);
}
......
......@@ -59,7 +59,7 @@ public:
double radius(-1.0), height(-1.0);
std::vector<V3D> pts;
original->GetObjectGeom(objType, pts, radius, height);
TS_ASSERT_EQUALS(2, objType);
TS_ASSERT_EQUALS(3, objType);
TS_ASSERT(boost::dynamic_pointer_cast<GluGeometryHandler>(
original->getGeometryHandler()));
......@@ -68,7 +68,7 @@ public:
objType = -1;
copy.GetObjectGeom(objType, pts, radius, height);
TS_ASSERT_EQUALS(2, objType);
TS_ASSERT_EQUALS(3, objType);
TS_ASSERT(boost::dynamic_pointer_cast<GluGeometryHandler>(
copy.getGeometryHandler()));
TS_ASSERT_EQUALS(copy.getName(), original->getName());
......@@ -84,7 +84,7 @@ public:
double radius(-1.0), height(-1.0);
std::vector<V3D> pts;
original->GetObjectGeom(objType, pts, radius, height);
TS_ASSERT_EQUALS(2, objType);
TS_ASSERT_EQUALS(3, objType);
TS_ASSERT(boost::dynamic_pointer_cast<GluGeometryHandler>(
original->getGeometryHandler()));
......@@ -94,7 +94,7 @@ public:
objType = -1;
lhs.GetObjectGeom(objType, pts, radius, height);
TS_ASSERT_EQUALS(2, objType);
TS_ASSERT_EQUALS(3, objType);
TS_ASSERT(boost::dynamic_pointer_cast<GluGeometryHandler>(
lhs.getGeometryHandler()));
}
......
......@@ -140,7 +140,7 @@ public:
double radius, height;
shape->GetObjectGeom(otype, vectors, radius, height);
TS_ASSERT_EQUALS(otype, 5);
TS_ASSERT_EQUALS(otype, 6);
TS_ASSERT_EQUALS(radius, 0.1);
TS_ASSERT_EQUALS(height, 0.6);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment