From 02a533bccb3faaf2c2f5efef1b8749704ec5c64b Mon Sep 17 00:00:00 2001
From: "Parker, Peter G" <parkerpg@ornl.gov>
Date: Wed, 20 Jun 2018 16:15:43 -0400
Subject: [PATCH] Refs #22608 - Let clang-format do its thing.
I should probably get round to working out how to call it locally...
---
Framework/Catalog/src/ONCat.cpp | 3 +--
Framework/Catalog/test/ONCatTest.h | 27 ++++++++++++---------------
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/Framework/Catalog/src/ONCat.cpp b/Framework/Catalog/src/ONCat.cpp
index 822443e7980..c0289e4dd6f 100644
--- a/Framework/Catalog/src/ONCat.cpp
+++ b/Framework/Catalog/src/ONCat.cpp
@@ -118,8 +118,7 @@ ONCat::ONCat(const ONCat &other)
: m_url(other.m_url), m_tokenStore(other.m_tokenStore),
m_clientId(other.m_clientId), m_clientSecret(other.m_clientSecret),
- m_flow(other.m_flow),
- m_internetHelper(other.m_internetHelper) {}
+ m_flow(other.m_flow), m_internetHelper(other.m_internetHelper) {}
ONCat::~ONCat() {}
diff --git a/Framework/Catalog/test/ONCatTest.h b/Framework/Catalog/test/ONCatTest.h
index cccd18b897e..66dce202b6b 100644
--- a/Framework/Catalog/test/ONCatTest.h
+++ b/Framework/Catalog/test/ONCatTest.h
@@ -275,11 +275,10 @@ public:
auto mock_oncat_api = make_mock_oncat_api(
{{DUMMY_URL + "/api/instruments/HB2C?facility=HFIR",
- std::make_pair(HTTPResponse::HTTP_OK,
- "{\"facility\": \"HFIR\","
- "\"name\": \"HB2C\","
- "\"id\": \"HB2C\","
- "\"type\": \"instrument\"}")}});
+ std::make_pair(HTTPResponse::HTTP_OK, "{\"facility\": \"HFIR\","
+ "\"name\": \"HB2C\","
+ "\"id\": \"HB2C\","
+ "\"type\": \"instrument\"}")}});
oncat.setInternetHelper(mock_oncat_api);
@@ -363,11 +362,10 @@ public:
"\"access_token\": \"2KSL5aEnLvIudMHIjc7LcBWBCfxOHZ\", "
"\"scope\": \"api:read data:read settings:read\"}")},
{DUMMY_URL + "/api/instruments/HB2C?facility=HFIR",
- std::make_pair(HTTPResponse::HTTP_OK,
- "{\"facility\": \"HFIR\","
- "\"name\": \"HB2C\","
- "\"id\": \"HB2C\","
- "\"type\": \"instrument\"}")}});
+ std::make_pair(HTTPResponse::HTTP_OK, "{\"facility\": \"HFIR\","
+ "\"name\": \"HB2C\","
+ "\"id\": \"HB2C\","
+ "\"type\": \"instrument\"}")}});
oncat.setInternetHelper(mock_oncat_api);
@@ -378,11 +376,10 @@ public:
mock_oncat_api = make_mock_oncat_api({{
DUMMY_URL + "/oauth/token",
- std::make_pair(
- HTTPResponse::HTTP_OK,
- "{\"token_type\": \"Bearer\", \"expires_in\": 3600, "
- "\"access_token\": \"987JHGFiusdvs72fAkjhsKJH32tkjk\", "
- "\"scope\": \"api:read data:read settings:read\"}"), }});
+ std::make_pair(HTTPResponse::HTTP_OK,
+ "{\"token_type\": \"Bearer\", \"expires_in\": 3600, "
+ "\"access_token\": \"987JHGFiusdvs72fAkjhsKJH32tkjk\", "
+ "\"scope\": \"api:read data:read settings:read\"}"), }});
oncat.setInternetHelper(mock_oncat_api);
--
GitLab