提交 0cd6d18b 编写于 作者: L luoqi06 提交者: Jiangtao Hu

Control : update control/common folder

上级 a5556537
......@@ -19,8 +19,8 @@
#include <string>
#include <utility>
#include "gmock/gmock.h"
#include "cybertron/common/log.h"
#include "gmock/gmock.h"
#include "modules/common/util/file.h"
#include "modules/control/proto/control_conf.pb.h"
......@@ -33,9 +33,8 @@ class Interpolation1DTest : public ::testing::Test {
public:
virtual void SetUp() {
std::string control_conf_file =
"modules/control/testdata/conf/lincoln.pb.txt";
CHECK(common::util::GetProtoFromFile(control_conf_file,
&control_conf_));
"/apollo/modules/control/testdata/conf/lincoln.pb.txt";
CHECK(common::util::GetProtoFromFile(control_conf_file, &control_conf_));
}
protected:
......
......@@ -19,8 +19,8 @@
#include <string>
#include <utility>
#include "gtest/gtest.h"
#include "cybertron/common/log.h"
#include "gtest/gtest.h"
#include "modules/common/util/file.h"
#include "modules/control/proto/control_conf.pb.h"
......@@ -31,9 +31,8 @@ class Interpolation2DTest : public ::testing::Test {
public:
virtual void SetUp() {
std::string control_conf_file =
"modules/control/testdata/conf/lincoln.pb.txt";
CHECK(common::util::GetProtoFromFile(control_conf_file,
&control_conf_));
"/apollo/modules/control/testdata/conf/lincoln.pb.txt";
CHECK(common::util::GetProtoFromFile(control_conf_file, &control_conf_));
}
protected:
......
......@@ -28,7 +28,7 @@ class PidBCControllerTest : public ::testing::Test {
public:
virtual void SetUp() {
std::string control_conf_file =
"modules/control/testdata/conf/lincoln.pb.txt";
"/apollo/modules/control/testdata/conf/lincoln.pb.txt";
CHECK(common::util::GetProtoFromFile(control_conf_file,
&control_conf_));
lon_controller_conf_ = control_conf_.lon_controller_conf();
......
......@@ -30,7 +30,7 @@ class PidICControllerTest : public ::testing::Test {
public:
virtual void SetUp() {
std::string control_conf_file =
"modules/control/testdata/conf/lincoln.pb.txt";
"/apollo/modules/control/testdata/conf/lincoln.pb.txt";
CHECK(common::util::GetProtoFromFile(control_conf_file,
&control_conf_));
lon_controller_conf_ = control_conf_.lon_controller_conf();
......
......@@ -31,7 +31,7 @@ class PidControllerTest : public ::testing::Test {
public:
virtual void SetUp() {
std::string control_conf_file =
"modules/control/testdata/conf/lincoln.pb.txt";
"/apollo/modules/control/testdata/conf/lincoln.pb.txt";
CHECK(common::util::GetProtoFromFile(control_conf_file,
&control_conf_));
lon_controller_conf_ = control_conf_.lon_controller_conf();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册