diff options
| author | Utkarsh Sanghi <usanghi@google.com> | 2015-09-17 10:13:44 -0700 |
|---|---|---|
| committer | Utkarsh Sanghi <usanghi@google.com> | 2015-09-17 10:17:00 -0700 |
| commit | 343cb530db4edbc0f09718af0a96ddb6c5430b18 (patch) | |
| tree | aa3cec545378d993f158eb4b1fc9fc0ec7848381 | |
| parent | 8ae77ac28c1e4d3d6ab7e201a9aeeb077ec5962c (diff) | |
| download | trunks-343cb530db4edbc0f09718af0a96ddb6c5430b18.tar.gz | |
trunks: Refactor Mock classes include order, and test file names.
BUG=None
TEST=FEATURES=test emerge-rambi trunks
Change-Id: I4b072592c8a6c28ecc4acb0f41f9797cded6f75f
| -rw-r--r-- | hmac_authorization_delegate_test.cc (renamed from hmac_authorization_delegate_unittest.cc) | 4 | ||||
| -rw-r--r-- | mock_blob_parser.h | 4 | ||||
| -rw-r--r-- | mock_hmac_session.h | 4 | ||||
| -rw-r--r-- | mock_policy_session.h | 4 | ||||
| -rw-r--r-- | mock_session_manager.h | 4 | ||||
| -rw-r--r-- | mock_tpm.h | 4 | ||||
| -rw-r--r-- | mock_tpm_state.h | 4 | ||||
| -rw-r--r-- | mock_tpm_utility.h | 4 | ||||
| -rw-r--r-- | password_authorization_delegate_test.cc (renamed from password_authorization_delegate_unittest.cc) | 4 |
9 files changed, 18 insertions, 18 deletions
diff --git a/hmac_authorization_delegate_unittest.cc b/hmac_authorization_delegate_test.cc index 9defbd2..025c80a 100644 --- a/hmac_authorization_delegate_unittest.cc +++ b/hmac_authorization_delegate_test.cc @@ -14,12 +14,12 @@ // limitations under the License. // -#include "trunks/hmac_authorization_delegate.h" - #include <string> #include <gtest/gtest.h> +#include "trunks/hmac_authorization_delegate.h" + namespace trunks { TEST(HmacAuthorizationDelegateTest, UninitializedSessionTest) { diff --git a/mock_blob_parser.h b/mock_blob_parser.h index 5d7eb21..f6f3d6e 100644 --- a/mock_blob_parser.h +++ b/mock_blob_parser.h @@ -17,12 +17,12 @@ #ifndef TRUNKS_MOCK_BLOB_PARSER_H_ #define TRUNKS_MOCK_BLOB_PARSER_H_ -#include "trunks/blob_parser.h" - #include <string> #include <gmock/gmock.h> +#include "trunks/blob_parser.h" + namespace trunks { class MockBlobParser : public BlobParser { diff --git a/mock_hmac_session.h b/mock_hmac_session.h index 5dca343..3bd1fad 100644 --- a/mock_hmac_session.h +++ b/mock_hmac_session.h @@ -17,12 +17,12 @@ #ifndef TRUNKS_MOCK_HMAC_SESSION_H_ #define TRUNKS_MOCK_HMAC_SESSION_H_ -#include "trunks/hmac_session.h" - #include <string> #include <gmock/gmock.h> +#include "trunks/hmac_session.h" + namespace trunks { class MockHmacSession : public HmacSession { diff --git a/mock_policy_session.h b/mock_policy_session.h index 91cb660..2ce4214 100644 --- a/mock_policy_session.h +++ b/mock_policy_session.h @@ -17,13 +17,13 @@ #ifndef TRUNKS_MOCK_POLICY_SESSION_H_ #define TRUNKS_MOCK_POLICY_SESSION_H_ -#include "trunks/policy_session.h" - #include <string> #include <vector> #include <gmock/gmock.h> +#include "trunks/policy_session.h" + namespace trunks { class MockPolicySession : public PolicySession { diff --git a/mock_session_manager.h b/mock_session_manager.h index a481ece..e674f0b 100644 --- a/mock_session_manager.h +++ b/mock_session_manager.h @@ -17,12 +17,12 @@ #ifndef TRUNKS_MOCK_SESSION_MANAGER_H_ #define TRUNKS_MOCK_SESSION_MANAGER_H_ -#include "trunks/session_manager.h" - #include <string> #include <gmock/gmock.h> +#include "trunks/session_manager.h" + namespace trunks { class MockSessionManager : public SessionManager { @@ -17,13 +17,13 @@ #ifndef TRUNKS_MOCK_TPM_H_ #define TRUNKS_MOCK_TPM_H_ -#include "trunks/tpm_generated.h" - #include <string> #include <base/callback.h> #include <gmock/gmock.h> +#include "trunks/tpm_generated.h" + namespace trunks { class MockTpm : public Tpm { diff --git a/mock_tpm_state.h b/mock_tpm_state.h index 0d3ed9a..9c3073a 100644 --- a/mock_tpm_state.h +++ b/mock_tpm_state.h @@ -17,10 +17,10 @@ #ifndef TRUNKS_MOCK_TPM_STATE_H_ #define TRUNKS_MOCK_TPM_STATE_H_ -#include "trunks/tpm_state.h" - #include <gmock/gmock.h> +#include "trunks/tpm_state.h" + namespace trunks { class MockTpmState : public TpmState { diff --git a/mock_tpm_utility.h b/mock_tpm_utility.h index 6f11b9b..1fa7fce 100644 --- a/mock_tpm_utility.h +++ b/mock_tpm_utility.h @@ -17,12 +17,12 @@ #ifndef TRUNKS_MOCK_TPM_UTILITY_H_ #define TRUNKS_MOCK_TPM_UTILITY_H_ -#include "trunks/tpm_utility.h" - #include <string> #include <gmock/gmock.h> +#include "trunks/tpm_utility.h" + namespace trunks { class MockTpmUtility : public TpmUtility { diff --git a/password_authorization_delegate_unittest.cc b/password_authorization_delegate_test.cc index 9c26c40..2bdcbb0 100644 --- a/password_authorization_delegate_unittest.cc +++ b/password_authorization_delegate_test.cc @@ -14,12 +14,12 @@ // limitations under the License. // -#include "trunks/password_authorization_delegate.h" - #include <string> #include <gtest/gtest.h> +#include "trunks/password_authorization_delegate.h" + namespace trunks { // This test looks at initialization of the delegate with no password. |