Skip to content

Commit 7a15fbf

Browse files
wsobelwsobel
authored
Merge pull request #614 from mtconnect/addressing_test_coverage_issues
Added additional tests to improve test coverage Fixed some possible issues with some test frameworks Fixed logging issues in the mruby implementation Fixed VS 2026 support with the tests because of legacy cmake requirements
2 parents 73243d1 + 147b7de commit 7a15fbf

286 files changed

Lines changed: 1027 additions & 329 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set(AGENT_VERSION_MAJOR 2)
33
set(AGENT_VERSION_MINOR 7)
44
set(AGENT_VERSION_PATCH 0)
5-
set(AGENT_VERSION_BUILD 12)
5+
set(AGENT_VERSION_BUILD 13)
66
set(AGENT_VERSION_RC "")
77

88
# This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent

‎agent/cppagent.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
2+
// Copyright 2009-2026, AMT – The Association For Manufacturing Technology (“AMT”)
33
// All rights reserved.
44
//
55
// Licensed under the Apache License, Version 2.0 (the "License");

‎src/mtconnect/agent.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
2+
// Copyright 2009-2026, AMT – The Association For Manufacturing Technology (“AMT”)
33
// All rights reserved.
44
//
55
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -124,6 +124,12 @@ namespace mtconnect {
124124
m_printers["xml"] = make_unique<printer::XmlPrinter>(m_pretty, m_validation);
125125
m_printers["json"] = make_unique<printer::JsonPrinter>(jsonVersion, m_pretty, m_validation);
126126

127+
if (!m_schemaVersion)
128+
{
129+
m_xmlParser->parseFile(m_deviceXmlPath, dynamic_cast<printer::XmlPrinter *>(m_printers["xml"].get()));
130+
m_schemaVersion = m_xmlParser->getSchemaVersion();
131+
}
132+
127133
if (m_schemaVersion)
128134
{
129135
m_intSchemaVersion = IntSchemaVersion(*m_schemaVersion);

‎src/mtconnect/agent.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
2+
// Copyright 2009-2026, AMT – The Association For Manufacturing Technology (“AMT”)
33
// All rights reserved.
44
//
55
// Licensed under the Apache License, Version 2.0 (the "License");

‎src/mtconnect/asset/asset.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
2+
// Copyright 2009-2026, AMT – The Association For Manufacturing Technology (“AMT”)
33
// All rights reserved.
44
//
55
// Licensed under the Apache License, Version 2.0 (the "License");

‎src/mtconnect/asset/asset.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
2+
// Copyright 2009-2026, AMT – The Association For Manufacturing Technology (“AMT”)
33
// All rights reserved.
44
//
55
// Licensed under the Apache License, Version 2.0 (the "License");

‎src/mtconnect/asset/asset_buffer.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
2+
// Copyright 2009-2026, AMT – The Association For Manufacturing Technology (“AMT”)
33
// All rights reserved.
44
//
55
// Licensed under the Apache License, Version 2.0 (the "License");

‎src/mtconnect/asset/asset_storage.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
2+
// Copyright 2009-2026, AMT – The Association For Manufacturing Technology (“AMT”)
33
// All rights reserved.
44
//
55
// Licensed under the Apache License, Version 2.0 (the "License");

‎src/mtconnect/asset/component_configuration_parameters.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
2+
// Copyright 2009-2026, AMT – The Association For Manufacturing Technology (“AMT”)
33
// All rights reserved.
44
//
55
// Licensed under the Apache License, Version 2.0 (the "License");

‎src/mtconnect/asset/component_configuration_parameters.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
2+
// Copyright 2009-2026, AMT – The Association For Manufacturing Technology (“AMT”)
33
// All rights reserved.
44
//
55
// Licensed under the Apache License, Version 2.0 (the "License");

0 commit comments

Comments
 (0)