From 0c54fa71a858e28b69557f72a52f6149baaa3c29 Mon Sep 17 00:00:00 2001 From: Geoff Hutchison Date: Fri, 29 Nov 2024 12:27:59 -0500 Subject: [PATCH] Update comment headers to new format (missed some in prev effort) Signed-off-by: Geoff Hutchison --- avogadro/command/qube.cpp | 19 +- avogadro/qtgui/insertfragmentdialog.cpp | 13 +- avogadro/qtgui/scriptloader.cpp | 11 +- avogadro/qtgui/scriptloader.h | 14 +- avogadro/qtplugins/bonding/bonding.h | 3 +- avogadro/qtplugins/commandscripts/command.cpp | 2 +- avogadro/qtplugins/commandscripts/command.h | 2 +- .../qtplugins/gamessinput/gamesshighlighter.h | 13 +- .../qtplugins/measuretool/measuretool.cpp | 10 +- avogadro/rendering/dashedlinegeometry.cpp | 23 +- avogadro/rendering/dashedlinegeometry.h | 23 +- tests/core/arraytest.cpp | 13 +- tests/core/atomtest.cpp | 17 +- tests/core/atomtypertest.cpp | 14 +- tests/core/basissettest.cpp | 13 +- tests/core/bondtest.cpp | 15 +- tests/core/coordinateblockgeneratortest.cpp | 376 +++++++++++------- tests/core/coordinatesettest.cpp | 15 +- tests/core/cubetest.cpp | 15 +- tests/core/eigentest.cpp | 13 +- tests/core/elementtest.cpp | 13 +- tests/core/graphtest.cpp | 17 +- tests/core/meshtest.cpp | 13 +- tests/core/moleculetest.cpp | 13 +- tests/core/mutextest.cpp | 13 +- tests/core/ringperceivertest.cpp | 13 +- tests/core/spacegrouptest.cpp | 13 +- tests/core/unitcelltest.cpp | 30 +- tests/core/utilitiestest.cpp | 15 +- tests/core/variantmaptest.cpp | 13 +- tests/core/varianttest.cpp | 13 +- tests/io/cjsontest.cpp | 15 +- tests/io/cmltest.cpp | 21 +- tests/io/fileformatmanagertest.cpp | 15 +- tests/io/hdf5test.cpp | 39 +- tests/io/lammpstest.cpp | 13 +- tests/io/mdltest.cpp | 15 +- tests/io/mmtftest.cpp | 25 +- tests/io/vasptest.cpp | 13 +- tests/io/xyztest.cpp | 15 +- tests/qtgui/filebrowsewidgettest.cpp | 13 +- tests/qtgui/generichighlightertest.cpp | 15 +- tests/qtgui/hydrogentoolstest.cpp | 15 +- tests/qtgui/inputgeneratortest.cpp | 15 +- tests/qtgui/inputgeneratorwidgettest.cpp | 17 +- tests/qtgui/moleculetest.cpp | 63 +-- tests/qtgui/molequeuequeuelistmodeltest.cpp | 15 +- tests/qtgui/rwmoleculetest.cpp | 17 +- tests/qtopengl/glwidgettest.cpp | 15 +- tests/qtopengl/qttextlabeltest.cpp | 19 +- tests/qtopengl/qttextrenderstrategytest.cpp | 17 +- .../absoluteoverlayquadstrategytest.cpp | 19 +- tests/rendering/absolutequadstrategytest.cpp | 17 +- tests/rendering/billboardquadstrategytest.cpp | 17 +- tests/rendering/cameratest.cpp | 15 +- tests/rendering/nodetest.cpp | 15 +- tests/rendering/overlayquadstrategytest.cpp | 17 +- tests/rendering/spheregeometrytest.cpp | 17 +- 58 files changed, 436 insertions(+), 863 deletions(-) diff --git a/avogadro/command/qube.cpp b/avogadro/command/qube.cpp index 18a5235958..5277bbbe80 100644 --- a/avogadro/command/qube.cpp +++ b/avogadro/command/qube.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2014 Albert DeFusco University of Pittsburgh - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include #include @@ -28,15 +17,15 @@ #include #include -using Avogadro::Io::FileFormatManager; using Avogadro::Core::Cube; -using Avogadro::Core::Molecule; using Avogadro::Core::GaussianSetTools; +using Avogadro::Core::Molecule; +using Avogadro::Io::FileFormatManager; using std::cin; using std::cout; using std::endl; -using std::string; using std::ostringstream; +using std::string; using Eigen::Vector3d; using Eigen::Vector3i; diff --git a/avogadro/qtgui/insertfragmentdialog.cpp b/avogadro/qtgui/insertfragmentdialog.cpp index dfa0856c1a..34b7393130 100644 --- a/avogadro/qtgui/insertfragmentdialog.cpp +++ b/avogadro/qtgui/insertfragmentdialog.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2020 Geoffrey R. Hutchison - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "insertfragmentdialog.h" diff --git a/avogadro/qtgui/scriptloader.cpp b/avogadro/qtgui/scriptloader.cpp index 47b353b8c8..9b266c404a 100644 --- a/avogadro/qtgui/scriptloader.cpp +++ b/avogadro/qtgui/scriptloader.cpp @@ -1,15 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "scriptloader.h" diff --git a/avogadro/qtgui/scriptloader.h b/avogadro/qtgui/scriptloader.h index 15b2e40547..eb173b2dbe 100644 --- a/avogadro/qtgui/scriptloader.h +++ b/avogadro/qtgui/scriptloader.h @@ -1,15 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #ifndef AVOGADRO_QTGUI_SCRIPTLOADER_H @@ -27,6 +18,9 @@ namespace QtGui { /** * @brief The ScriptLoader class finds and verifies different types of * python utility scripts. + * + * For example, finding all the "charge" scripts + * auto chargeScripts = ScriptLoader::scriptList("charge"); */ class AVOGADROQTGUI_EXPORT ScriptLoader : public QObject { diff --git a/avogadro/qtplugins/bonding/bonding.h b/avogadro/qtplugins/bonding/bonding.h index bda5d9fe0f..2103b0d68e 100644 --- a/avogadro/qtplugins/bonding/bonding.h +++ b/avogadro/qtplugins/bonding/bonding.h @@ -1,7 +1,6 @@ /****************************************************************************** This source file is part of the Avogadro project. - - This source code is released under the New BSD License, (the "License"). + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #ifndef AVOGADRO_QTPLUGINS_BONDING_H diff --git a/avogadro/qtplugins/commandscripts/command.cpp b/avogadro/qtplugins/commandscripts/command.cpp index 0e4410813b..5bac9077b0 100644 --- a/avogadro/qtplugins/commandscripts/command.cpp +++ b/avogadro/qtplugins/commandscripts/command.cpp @@ -1,6 +1,6 @@ /****************************************************************************** This source file is part of the Avogadro project. - This source code is released under the New BSD License, (the "License"). + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "command.h" diff --git a/avogadro/qtplugins/commandscripts/command.h b/avogadro/qtplugins/commandscripts/command.h index 72d196600c..4f7ad3f4c2 100644 --- a/avogadro/qtplugins/commandscripts/command.h +++ b/avogadro/qtplugins/commandscripts/command.h @@ -1,6 +1,6 @@ /****************************************************************************** This source file is part of the Avogadro project. - This source code is released under the New BSD License, (the "License"). + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #ifndef AVOGADRO_QTPLUGINS_COMMAND_H diff --git a/avogadro/qtplugins/gamessinput/gamesshighlighter.h b/avogadro/qtplugins/gamessinput/gamesshighlighter.h index 39e804feee..d00b01f7e5 100644 --- a/avogadro/qtplugins/gamessinput/gamesshighlighter.h +++ b/avogadro/qtplugins/gamessinput/gamesshighlighter.h @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright (C) 2009 Marcus D. Hanwell - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #ifndef GAMESSHIGHLIGHTER_H diff --git a/avogadro/qtplugins/measuretool/measuretool.cpp b/avogadro/qtplugins/measuretool/measuretool.cpp index 491859fd36..0fd0c62c12 100644 --- a/avogadro/qtplugins/measuretool/measuretool.cpp +++ b/avogadro/qtplugins/measuretool/measuretool.cpp @@ -1,11 +1,6 @@ /****************************************************************************** This source file is part of the Avogadro project. - - Adapted from Avogadro 1.x with the following authors' permission: - Copyright 2007 Donald Ephraim Curtis - Copyright 2008 Marcus D. Hanwell - - This source code is released under the New BSD License, (the "License"). + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "measuretool.h" @@ -59,7 +54,8 @@ MeasureTool::MeasureTool(QObject* parent_) "\tDistances are measured between 1-2 and 2-3\n" "\tAngle is measured between 1-3 using 2 as the common point\n" "\tDihedral is measured between 1-2-3-4\n" - "Right Mouse: \tReset the measurements.").arg(shortcut)); + "Right Mouse: \tReset the measurements.") + .arg(shortcut)); setIcon(); } diff --git a/avogadro/rendering/dashedlinegeometry.cpp b/avogadro/rendering/dashedlinegeometry.cpp index 8e3e6adba8..7ea7464453 100644 --- a/avogadro/rendering/dashedlinegeometry.cpp +++ b/avogadro/rendering/dashedlinegeometry.cpp @@ -1,6 +1,6 @@ /****************************************************************************** This source file is part of the Avogadro project. - This source code is released under the New BSD License, (the "License"). + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "dashedlinegeometry.h" @@ -22,7 +22,7 @@ namespace { #include "dashedline_fs.h" #include "dashedline_vs.h" -} +} // namespace using Avogadro::Vector3f; using Avogadro::Vector3ub; @@ -46,8 +46,7 @@ class DashedLineGeometry::Private }; DashedLineGeometry::DashedLineGeometry() - : m_lineWidth(1.0), m_lineCount(0), - m_color(255, 0, 0), m_opacity(255), + : m_lineWidth(1.0), m_lineCount(0), m_color(255, 0, 0), m_opacity(255), m_dirty(false), d(new Private) { } @@ -159,8 +158,9 @@ void DashedLineGeometry::clear() m_dirty = true; } -size_t DashedLineGeometry::addDashedLine(const Vector3f &start, const Vector3f &end, - const Vector4ub &rgba, int dashCount) +size_t DashedLineGeometry::addDashedLine(const Vector3f& start, + const Vector3f& end, + const Vector4ub& rgba, int dashCount) { const int vertexCount = 2 * dashCount; Vector3f delta = (end - start) / (vertexCount - 1); @@ -176,17 +176,18 @@ size_t DashedLineGeometry::addDashedLine(const Vector3f &start, const Vector3f & return m_lineCount - 1; } -size_t DashedLineGeometry::addDashedLine(const Vector3f &start, const Vector3f &end, - const Vector3ub &rgb, int dashCount) +size_t DashedLineGeometry::addDashedLine(const Vector3f& start, + const Vector3f& end, + const Vector3ub& rgb, int dashCount) { Vector4ub rgba = Vector4ub(rgb(0), rgb(1), rgb(2), m_opacity); return addDashedLine(start, end, rgba, dashCount); } -size_t DashedLineGeometry::addDashedLine(const Vector3f &start, const Vector3f &end, - int dashCount) +size_t DashedLineGeometry::addDashedLine(const Vector3f& start, + const Vector3f& end, int dashCount) { return addDashedLine(start, end, m_color, dashCount); } -} // End namespace Avogadro +} // namespace Avogadro::Rendering diff --git a/avogadro/rendering/dashedlinegeometry.h b/avogadro/rendering/dashedlinegeometry.h index 798b122faf..de8ab61feb 100644 --- a/avogadro/rendering/dashedlinegeometry.h +++ b/avogadro/rendering/dashedlinegeometry.h @@ -1,6 +1,6 @@ /****************************************************************************** This source file is part of the Avogadro project. - This source code is released under the New BSD License, (the "License"). + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #ifndef AVOGADRO_RENDERING_DASHEDLINEGEOMETRY_H @@ -27,9 +27,7 @@ class AVOGADRORENDERING_EXPORT DashedLineGeometry : public Drawable Vector3f vertex; // 12 bytes Vector4ub color; // 4 bytes - PackedVertex(const Vector3f &v, const Vector4ub &c) - : vertex(v), color(c) - {} + PackedVertex(const Vector3f& v, const Vector4ub& c) : vertex(v), color(c) {} static int vertexOffset() { return 0; } static int colorOffset() { return static_cast(sizeof(Vector3f)); } }; @@ -69,12 +67,12 @@ class AVOGADRORENDERING_EXPORT DashedLineGeometry : public Drawable * @return The index of the first vertex added by this call. * @{ */ - size_t addDashedLine(const Vector3f &start, const Vector3f &end, - const Vector4ub& color, int dashCount); - size_t addDashedLine(const Vector3f &start, const Vector3f &end, - const Vector3ub& color, int dashCount); - size_t addDashedLine(const Vector3f &start, const Vector3f &end, - int dashCount); + size_t addDashedLine(const Vector3f& start, const Vector3f& end, + const Vector4ub& color, int dashCount); + size_t addDashedLine(const Vector3f& start, const Vector3f& end, + const Vector3ub& color, int dashCount); + size_t addDashedLine(const Vector3f& start, const Vector3f& end, + int dashCount); /** @} */ /** @@ -112,7 +110,7 @@ class AVOGADRORENDERING_EXPORT DashedLineGeometry : public Drawable Core::Array m_vertices; float m_lineWidth; int m_lineCount; - + Vector3ub m_color; unsigned char m_opacity; @@ -122,7 +120,8 @@ class AVOGADRORENDERING_EXPORT DashedLineGeometry : public Drawable Private* d; }; -inline DashedLineGeometry& DashedLineGeometry::operator=(DashedLineGeometry other) +inline DashedLineGeometry& DashedLineGeometry::operator=( + DashedLineGeometry other) { using std::swap; swap(*this, other); diff --git a/tests/core/arraytest.cpp b/tests/core/arraytest.cpp index b1e58cb604..70e75fa807 100644 --- a/tests/core/arraytest.cpp +++ b/tests/core/arraytest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2011-2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include diff --git a/tests/core/atomtest.cpp b/tests/core/atomtest.cpp index 0a2c9ad629..33417e4779 100644 --- a/tests/core/atomtest.cpp +++ b/tests/core/atomtest.cpp @@ -1,27 +1,16 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2011-2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include #include -using Avogadro::Core::Molecule; -using Avogadro::Core::Atom; using Avogadro::Vector2; using Avogadro::Vector3; +using Avogadro::Core::Atom; +using Avogadro::Core::Molecule; TEST(AtomTest, setAtomicNumber) { diff --git a/tests/core/atomtypertest.cpp b/tests/core/atomtypertest.cpp index 07c581356f..1981ac77e7 100644 --- a/tests/core/atomtypertest.cpp +++ b/tests/core/atomtypertest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -40,6 +29,7 @@ TEST(AtomTyper, singleAtomTyping) public: MassTyper() : AtomTyper(nullptr) {} Array& typesRef() { return m_types; } + protected: double type(const Atom& atom) { diff --git a/tests/core/basissettest.cpp b/tests/core/basissettest.cpp index 4c324e0d38..69926fa0ce 100644 --- a/tests/core/basissettest.cpp +++ b/tests/core/basissettest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2011-2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include diff --git a/tests/core/bondtest.cpp b/tests/core/bondtest.cpp index 69d22eff85..72885bed83 100644 --- a/tests/core/bondtest.cpp +++ b/tests/core/bondtest.cpp @@ -1,26 +1,15 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2011-2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include #include -using Avogadro::Core::Molecule; using Avogadro::Core::Atom; using Avogadro::Core::Bond; +using Avogadro::Core::Molecule; TEST(BondTest, setOrder) { diff --git a/tests/core/coordinateblockgeneratortest.cpp b/tests/core/coordinateblockgeneratortest.cpp index 05899274f1..02a156d8c4 100644 --- a/tests/core/coordinateblockgeneratortest.cpp +++ b/tests/core/coordinateblockgeneratortest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -22,135 +11,252 @@ #include +using Avogadro::Vector3; using Avogadro::Core::CoordinateBlockGenerator; using Avogadro::Core::Elements; using Avogadro::Core::Molecule; -using Avogadro::Vector3; namespace { -const std::string refCoordBlock( - "1 0 0.0 Xx Dummy 2.776264 5.085929 7.395591 0 1 0 1\n" - "2 1 1.0 H Hydrogen 3.219533 5.739168 8.258798 0 1 0 1\n" - "3 2 2.0 He Helium 3.662802 6.392406 9.122004 0 1 0 1\n" - "4 3 3.0 Li Lithium 4.106072 7.045645 9.985210 0 1 0 1\n" - "5 4 4.0 Be Beryllium 4.549341 7.698883 10.848417 0 1 0 1\n" - "6 5 5.0 B Boron 4.992610 8.352122 11.711623 0 1 0 1\n" - "7 6 6.0 C Carbon 5.435879 9.005360 12.574829 0 1 0 1\n" - "8 7 7.0 N Nitrogen 5.879148 9.658599 13.438036 0 1 0 1\n" - "9 8 8.0 O Oxygen 6.322417 10.311837 14.301242 0 1 0 1\n" - "10 9 9.0 F Fluorine 6.765686 10.965076 15.164448 0 1 0 1\n" - "11 10 10.0 Ne Neon 7.208955 11.618314 16.027655 0 1 0 1\n" - "12 11 11.0 Na Sodium 7.652224 12.271553 16.890861 0 1 0 1\n" - "13 12 12.0 Mg Magnesium 8.095493 12.924791 17.754067 0 1 0 1\n" - "14 13 13.0 Al Aluminium 8.538762 13.578030 18.617274 0 1 0 1\n" - "15 14 14.0 Si Silicon 8.982031 14.231268 19.480480 0 1 0 1\n" - "16 15 15.0 P Phosphorus 9.425300 14.884506 20.343687 0 1 0 1\n" - "17 16 16.0 S Sulfur 9.868570 15.537745 21.206893 0 1 0 1\n" - "18 17 17.0 Cl Chlorine 10.311839 16.190983 22.070099 0 1 0 1\n" - "19 18 18.0 Ar Argon 10.755108 16.844222 22.933306 0 1 0 1\n" - "20 19 19.0 K Potassium 11.198377 17.497460 23.796512 0 1 0 1\n" - "21 20 20.0 Ca Calcium 11.641646 18.150699 24.659718 0 1 0 1\n" - "22 21 21.0 Sc Scandium 12.084915 18.803937 25.522925 0 1 0 1\n" - "23 22 22.0 Ti Titanium 12.528184 19.457176 26.386131 0 1 0 1\n" - "24 23 23.0 V Vanadium 12.971453 20.110414 27.249337 0 1 0 1\n" - "25 24 24.0 Cr Chromium 13.414722 20.763653 28.112544 0 1 0 1\n" - "26 25 25.0 Mn Manganese 13.857991 21.416891 28.975750 0 1 0 1\n" - "27 26 26.0 Fe Iron 14.301260 22.070130 29.838956 0 1 0 1\n" - "28 27 27.0 Co Cobalt 14.744529 22.723368 30.702163 0 1 0 1\n" - "29 28 28.0 Ni Nickel 15.187799 23.376607 31.565369 0 1 0 1\n" - "30 29 29.0 Cu Copper 15.631068 24.029845 32.428576 0 1 0 1\n" - "31 30 30.0 Zn Zinc 16.074337 24.683084 33.291782 0 1 0 1\n" - "32 31 31.0 Ga Gallium 16.517606 25.336322 34.154988 0 1 0 1\n" - "33 32 32.0 Ge Germanium 16.960875 25.989561 35.018195 0 1 0 1\n" - "34 33 33.0 As Arsenic 17.404144 26.642799 35.881401 0 1 0 1\n" - "35 34 34.0 Se Selenium 17.847413 27.296038 36.744607 0 1 0 1\n" - "36 35 35.0 Br Bromine 18.290682 27.949276 37.607814 0 1 0 1\n" - "37 36 36.0 Kr Krypton 18.733951 28.602515 38.471020 0 1 0 1\n" - "38 37 37.0 Rb Rubidium 19.177220 29.255753 39.334226 0 1 0 1\n" - "39 38 38.0 Sr Strontium 19.620489 29.908992 40.197433 0 1 0 1\n" - "40 39 39.0 Y Yttrium 20.063758 30.562230 41.060639 0 1 0 1\n" - "41 40 40.0 Zr Zirconium 20.507027 31.215468 41.923845 0 1 0 1\n" - "42 41 41.0 Nb Niobium 20.950297 31.868707 42.787052 0 1 0 1\n" - "43 42 42.0 Mo Molybdenum 21.393566 32.521945 43.650258 0 1 0 1\n" - "44 43 43.0 Tc Technetium 21.836835 33.175184 44.513465 0 1 0 1\n" - "45 44 44.0 Ru Ruthenium 22.280104 33.828422 45.376671 0 1 0 1\n" - "46 45 45.0 Rh Rhodium 22.723373 34.481661 46.239877 0 1 0 1\n" - "47 46 46.0 Pd Palladium 23.166642 35.134899 47.103084 0 1 0 1\n" - "48 47 47.0 Ag Silver 23.609911 35.788138 47.966290 0 1 0 1\n" - "49 48 48.0 Cd Cadmium 24.053180 36.441376 48.829496 0 1 0 1\n" - "50 49 49.0 In Indium 24.496449 37.094615 49.692703 0 1 0 1\n" - "51 50 50.0 Sn Tin 24.939718 37.747853 50.555909 0 1 0 1\n" - "52 51 51.0 Sb Antimony 25.382987 38.401092 51.419115 0 1 0 1\n" - "53 52 52.0 Te Tellurium 25.826256 39.054330 52.282322 0 1 0 1\n" - "54 53 53.0 I Iodine 26.269525 39.707569 53.145528 0 1 0 1\n" - "55 54 54.0 Xe Xenon 26.712795 40.360807 54.008734 0 1 0 1\n" - "56 55 55.0 Cs Caesium 27.156064 41.014046 54.871941 0 1 0 1\n" - "57 56 56.0 Ba Barium 27.599333 41.667284 55.735147 0 1 0 1\n" - "58 57 57.0 La Lanthanum 28.042602 42.320523 56.598354 0 1 0 1\n" - "59 58 58.0 Ce Cerium 28.485871 42.973761 57.461560 0 1 0 1\n" - "60 59 59.0 Pr Praseodymium 28.929140 43.627000 58.324766 0 1 0 1\n" - "61 60 60.0 Nd Neodymium 29.372409 44.280238 59.187973 0 1 0 1\n" - "62 61 61.0 Pm Promethium 29.815678 44.933477 60.051179 0 1 0 1\n" - "63 62 62.0 Sm Samarium 30.258947 45.586715 60.914385 0 1 0 1\n" - "64 63 63.0 Eu Europium 30.702216 46.239954 61.777592 0 1 0 1\n" - "65 64 64.0 Gd Gadolinium 31.145485 46.893192 62.640798 0 1 0 1\n" - "66 65 65.0 Tb Terbium 31.588754 47.546430 63.504004 0 1 0 1\n" - "67 66 66.0 Dy Dysprosium 32.032023 48.199669 64.367211 0 1 0 1\n" - "68 67 67.0 Ho Holmium 32.475293 48.852907 65.230417 0 1 0 1\n" - "69 68 68.0 Er Erbium 32.918562 49.506146 66.093623 0 1 0 1\n" - "70 69 69.0 Tm Thulium 33.361831 50.159384 66.956830 0 1 0 1\n" - "71 70 70.0 Yb Ytterbium 33.805100 50.812623 67.820036 0 1 0 1\n" - "72 71 71.0 Lu Lutetium 34.248369 51.465861 68.683242 0 1 0 1\n" - "73 72 72.0 Hf Hafnium 34.691638 52.119100 69.546449 0 1 0 1\n" - "74 73 73.0 Ta Tantalum 35.134907 52.772338 70.409655 0 1 0 1\n" - "75 74 74.0 W Tungsten 35.578176 53.425577 71.272862 0 1 0 1\n" - "76 75 75.0 Re Rhenium 36.021445 54.078815 72.136068 0 1 0 1\n" - "77 76 76.0 Os Osmium 36.464714 54.732054 72.999274 0 1 0 1\n" - "78 77 77.0 Ir Iridium 36.907983 55.385292 73.862481 0 1 0 1\n" - "79 78 78.0 Pt Platinum 37.351252 56.038531 74.725687 0 1 0 1\n" - "80 79 79.0 Au Gold 37.794522 56.691769 75.588893 0 1 0 1\n" - "81 80 80.0 Hg Mercury 38.237791 57.345008 76.452100 0 1 0 1\n" - "82 81 81.0 Tl Thallium 38.681060 57.998246 77.315306 0 1 0 1\n" - "83 82 82.0 Pb Lead 39.124329 58.651485 78.178512 0 1 0 1\n" - "84 83 83.0 Bi Bismuth 39.567598 59.304723 79.041719 0 1 0 1\n" - "85 84 84.0 Po Polonium 40.010867 59.957962 79.904925 0 1 0 1\n" - "86 85 85.0 At Astatine 40.454136 60.611200 80.768131 0 1 0 1\n" - "87 86 86.0 Rn Radon 40.897405 61.264439 81.631338 0 1 0 1\n" - "88 87 87.0 Fr Francium 41.340674 61.917677 82.494544 0 1 0 1\n" - "89 88 88.0 Ra Radium 41.783943 62.570916 83.357751 0 1 0 1\n" - "90 89 89.0 Ac Actinium 42.227212 63.224154 84.220957 0 1 0 1\n" - "91 90 90.0 Th Thorium 42.670481 63.877392 85.084163 0 1 0 1\n" - "92 91 91.0 Pa Protactinium 43.113750 64.530631 85.947370 0 1 0 1\n" - "93 92 92.0 U Uranium 43.557020 65.183869 86.810576 0 1 0 1\n" - "94 93 93.0 Np Neptunium 44.000289 65.837108 87.673782 0 1 0 1\n" - "95 94 94.0 Pu Plutonium 44.443558 66.490346 88.536989 0 1 0 1\n" - "96 95 95.0 Am Americium 44.886827 67.143585 89.400195 0 1 0 1\n" - "97 96 96.0 Cm Curium 45.330096 67.796823 90.263401 0 1 0 1\n" - "98 97 97.0 Bk Berkelium 45.773365 68.450062 91.126608 0 1 0 1\n" - "99 98 98.0 Cf Californium 46.216634 69.103300 91.989814 0 1 0 1\n" - "100 99 99.0 Es Einsteinium 46.659903 69.756539 92.853020 0 1 0 1\n" - "101 100 100.0 Fm Fermium 47.103172 70.409777 93.716227 0 1 0 1\n" - "102 101 101.0 Md Mendelevium 47.546441 71.063016 94.579433 0 1 0 1\n" - "103 102 102.0 No Nobelium 47.989710 71.716254 95.442640 0 1 0 1\n" - "104 103 103.0 Lr Lawrencium 48.432979 72.369493 96.305846 0 1 0 1\n" - "105 104 104.0 Rf Rutherfordium 48.876248 73.022731 97.169052 0 1 0 1\n" - "106 105 105.0 Db Dubnium 49.319518 73.675970 98.032259 0 1 0 1\n" - "107 106 106.0 Sg Seaborgium 49.762787 74.329208 98.895465 0 1 0 1\n" - "108 107 107.0 Bh Bohrium 50.206056 74.982447 99.758671 0 1 0 1\n" - "109 108 108.0 Hs Hassium 50.649325 75.635685 100.621878 0 1 0 1\n" - "110 109 109.0 Mt Meitnerium 51.092594 76.288924 101.485084 0 1 0 1\n" - "111 110 110.0 Ds Darmstadtium 51.535863 76.942162 102.348290 0 1 0 1\n" - "112 111 111.0 Rg Roentgenium 51.979132 77.595401 103.211497 0 1 0 1\n" - "113 112 112.0 Cn Copernicium 52.422401 78.248639 104.074703 0 1 0 1\n" - "114 113 113.0 Nh Nihonium 52.865670 78.901878 104.937909 0 1 0 1\n" - "115 114 114.0 Fl Flerovium 53.308939 79.555116 105.801116 0 1 0 1\n" - "116 115 115.0 Mc Moscovium 53.752208 80.208354 106.664322 0 1 0 1\n" - "117 116 116.0 Lv Livermorium 54.195477 80.861593 107.527529 0 1 0 1\n" - "118 117 117.0 Ts Tennessine 54.638747 81.514831 108.390735 0 1 0 1\n" - "119 118 118.0 Og Oganesson 55.082016 82.168070 109.253941 0 1 0 1\n" - ); -} // end anon namespace +const std::string refCoordBlock("1 0 0.0 Xx Dummy 2.776264 " + " 5.085929 7.395591 0 1 0 1\n" + "2 1 1.0 H Hydrogen 3.219533 " + " 5.739168 8.258798 0 1 0 1\n" + "3 2 2.0 He Helium 3.662802 " + " 6.392406 9.122004 0 1 0 1\n" + "4 3 3.0 Li Lithium 4.106072 " + " 7.045645 9.985210 0 1 0 1\n" + "5 4 4.0 Be Beryllium 4.549341 " + " 7.698883 10.848417 0 1 0 1\n" + "6 5 5.0 B Boron 4.992610 " + " 8.352122 11.711623 0 1 0 1\n" + "7 6 6.0 C Carbon 5.435879 " + " 9.005360 12.574829 0 1 0 1\n" + "8 7 7.0 N Nitrogen 5.879148 " + " 9.658599 13.438036 0 1 0 1\n" + "9 8 8.0 O Oxygen 6.322417 " + "10.311837 14.301242 0 1 0 1\n" + "10 9 9.0 F Fluorine 6.765686 " + "10.965076 15.164448 0 1 0 1\n" + "11 10 10.0 Ne Neon 7.208955 " + "11.618314 16.027655 0 1 0 1\n" + "12 11 11.0 Na Sodium 7.652224 " + "12.271553 16.890861 0 1 0 1\n" + "13 12 12.0 Mg Magnesium 8.095493 " + "12.924791 17.754067 0 1 0 1\n" + "14 13 13.0 Al Aluminium 8.538762 " + "13.578030 18.617274 0 1 0 1\n" + "15 14 14.0 Si Silicon 8.982031 " + "14.231268 19.480480 0 1 0 1\n" + "16 15 15.0 P Phosphorus 9.425300 " + "14.884506 20.343687 0 1 0 1\n" + "17 16 16.0 S Sulfur 9.868570 " + "15.537745 21.206893 0 1 0 1\n" + "18 17 17.0 Cl Chlorine 10.311839 " + "16.190983 22.070099 0 1 0 1\n" + "19 18 18.0 Ar Argon 10.755108 " + "16.844222 22.933306 0 1 0 1\n" + "20 19 19.0 K Potassium 11.198377 " + "17.497460 23.796512 0 1 0 1\n" + "21 20 20.0 Ca Calcium 11.641646 " + "18.150699 24.659718 0 1 0 1\n" + "22 21 21.0 Sc Scandium 12.084915 " + "18.803937 25.522925 0 1 0 1\n" + "23 22 22.0 Ti Titanium 12.528184 " + "19.457176 26.386131 0 1 0 1\n" + "24 23 23.0 V Vanadium 12.971453 " + "20.110414 27.249337 0 1 0 1\n" + "25 24 24.0 Cr Chromium 13.414722 " + "20.763653 28.112544 0 1 0 1\n" + "26 25 25.0 Mn Manganese 13.857991 " + "21.416891 28.975750 0 1 0 1\n" + "27 26 26.0 Fe Iron 14.301260 " + "22.070130 29.838956 0 1 0 1\n" + "28 27 27.0 Co Cobalt 14.744529 " + "22.723368 30.702163 0 1 0 1\n" + "29 28 28.0 Ni Nickel 15.187799 " + "23.376607 31.565369 0 1 0 1\n" + "30 29 29.0 Cu Copper 15.631068 " + "24.029845 32.428576 0 1 0 1\n" + "31 30 30.0 Zn Zinc 16.074337 " + "24.683084 33.291782 0 1 0 1\n" + "32 31 31.0 Ga Gallium 16.517606 " + "25.336322 34.154988 0 1 0 1\n" + "33 32 32.0 Ge Germanium 16.960875 " + "25.989561 35.018195 0 1 0 1\n" + "34 33 33.0 As Arsenic 17.404144 " + "26.642799 35.881401 0 1 0 1\n" + "35 34 34.0 Se Selenium 17.847413 " + "27.296038 36.744607 0 1 0 1\n" + "36 35 35.0 Br Bromine 18.290682 " + "27.949276 37.607814 0 1 0 1\n" + "37 36 36.0 Kr Krypton 18.733951 " + "28.602515 38.471020 0 1 0 1\n" + "38 37 37.0 Rb Rubidium 19.177220 " + "29.255753 39.334226 0 1 0 1\n" + "39 38 38.0 Sr Strontium 19.620489 " + "29.908992 40.197433 0 1 0 1\n" + "40 39 39.0 Y Yttrium 20.063758 " + "30.562230 41.060639 0 1 0 1\n" + "41 40 40.0 Zr Zirconium 20.507027 " + "31.215468 41.923845 0 1 0 1\n" + "42 41 41.0 Nb Niobium 20.950297 " + "31.868707 42.787052 0 1 0 1\n" + "43 42 42.0 Mo Molybdenum 21.393566 " + "32.521945 43.650258 0 1 0 1\n" + "44 43 43.0 Tc Technetium 21.836835 " + "33.175184 44.513465 0 1 0 1\n" + "45 44 44.0 Ru Ruthenium 22.280104 " + "33.828422 45.376671 0 1 0 1\n" + "46 45 45.0 Rh Rhodium 22.723373 " + "34.481661 46.239877 0 1 0 1\n" + "47 46 46.0 Pd Palladium 23.166642 " + "35.134899 47.103084 0 1 0 1\n" + "48 47 47.0 Ag Silver 23.609911 " + "35.788138 47.966290 0 1 0 1\n" + "49 48 48.0 Cd Cadmium 24.053180 " + "36.441376 48.829496 0 1 0 1\n" + "50 49 49.0 In Indium 24.496449 " + "37.094615 49.692703 0 1 0 1\n" + "51 50 50.0 Sn Tin 24.939718 " + "37.747853 50.555909 0 1 0 1\n" + "52 51 51.0 Sb Antimony 25.382987 " + "38.401092 51.419115 0 1 0 1\n" + "53 52 52.0 Te Tellurium 25.826256 " + "39.054330 52.282322 0 1 0 1\n" + "54 53 53.0 I Iodine 26.269525 " + "39.707569 53.145528 0 1 0 1\n" + "55 54 54.0 Xe Xenon 26.712795 " + "40.360807 54.008734 0 1 0 1\n" + "56 55 55.0 Cs Caesium 27.156064 " + "41.014046 54.871941 0 1 0 1\n" + "57 56 56.0 Ba Barium 27.599333 " + "41.667284 55.735147 0 1 0 1\n" + "58 57 57.0 La Lanthanum 28.042602 " + "42.320523 56.598354 0 1 0 1\n" + "59 58 58.0 Ce Cerium 28.485871 " + "42.973761 57.461560 0 1 0 1\n" + "60 59 59.0 Pr Praseodymium 28.929140 " + "43.627000 58.324766 0 1 0 1\n" + "61 60 60.0 Nd Neodymium 29.372409 " + "44.280238 59.187973 0 1 0 1\n" + "62 61 61.0 Pm Promethium 29.815678 " + "44.933477 60.051179 0 1 0 1\n" + "63 62 62.0 Sm Samarium 30.258947 " + "45.586715 60.914385 0 1 0 1\n" + "64 63 63.0 Eu Europium 30.702216 " + "46.239954 61.777592 0 1 0 1\n" + "65 64 64.0 Gd Gadolinium 31.145485 " + "46.893192 62.640798 0 1 0 1\n" + "66 65 65.0 Tb Terbium 31.588754 " + "47.546430 63.504004 0 1 0 1\n" + "67 66 66.0 Dy Dysprosium 32.032023 " + "48.199669 64.367211 0 1 0 1\n" + "68 67 67.0 Ho Holmium 32.475293 " + "48.852907 65.230417 0 1 0 1\n" + "69 68 68.0 Er Erbium 32.918562 " + "49.506146 66.093623 0 1 0 1\n" + "70 69 69.0 Tm Thulium 33.361831 " + "50.159384 66.956830 0 1 0 1\n" + "71 70 70.0 Yb Ytterbium 33.805100 " + "50.812623 67.820036 0 1 0 1\n" + "72 71 71.0 Lu Lutetium 34.248369 " + "51.465861 68.683242 0 1 0 1\n" + "73 72 72.0 Hf Hafnium 34.691638 " + "52.119100 69.546449 0 1 0 1\n" + "74 73 73.0 Ta Tantalum 35.134907 " + "52.772338 70.409655 0 1 0 1\n" + "75 74 74.0 W Tungsten 35.578176 " + "53.425577 71.272862 0 1 0 1\n" + "76 75 75.0 Re Rhenium 36.021445 " + "54.078815 72.136068 0 1 0 1\n" + "77 76 76.0 Os Osmium 36.464714 " + "54.732054 72.999274 0 1 0 1\n" + "78 77 77.0 Ir Iridium 36.907983 " + "55.385292 73.862481 0 1 0 1\n" + "79 78 78.0 Pt Platinum 37.351252 " + "56.038531 74.725687 0 1 0 1\n" + "80 79 79.0 Au Gold 37.794522 " + "56.691769 75.588893 0 1 0 1\n" + "81 80 80.0 Hg Mercury 38.237791 " + "57.345008 76.452100 0 1 0 1\n" + "82 81 81.0 Tl Thallium 38.681060 " + "57.998246 77.315306 0 1 0 1\n" + "83 82 82.0 Pb Lead 39.124329 " + "58.651485 78.178512 0 1 0 1\n" + "84 83 83.0 Bi Bismuth 39.567598 " + "59.304723 79.041719 0 1 0 1\n" + "85 84 84.0 Po Polonium 40.010867 " + "59.957962 79.904925 0 1 0 1\n" + "86 85 85.0 At Astatine 40.454136 " + "60.611200 80.768131 0 1 0 1\n" + "87 86 86.0 Rn Radon 40.897405 " + "61.264439 81.631338 0 1 0 1\n" + "88 87 87.0 Fr Francium 41.340674 " + "61.917677 82.494544 0 1 0 1\n" + "89 88 88.0 Ra Radium 41.783943 " + "62.570916 83.357751 0 1 0 1\n" + "90 89 89.0 Ac Actinium 42.227212 " + "63.224154 84.220957 0 1 0 1\n" + "91 90 90.0 Th Thorium 42.670481 " + "63.877392 85.084163 0 1 0 1\n" + "92 91 91.0 Pa Protactinium 43.113750 " + "64.530631 85.947370 0 1 0 1\n" + "93 92 92.0 U Uranium 43.557020 " + "65.183869 86.810576 0 1 0 1\n" + "94 93 93.0 Np Neptunium 44.000289 " + "65.837108 87.673782 0 1 0 1\n" + "95 94 94.0 Pu Plutonium 44.443558 " + "66.490346 88.536989 0 1 0 1\n" + "96 95 95.0 Am Americium 44.886827 " + "67.143585 89.400195 0 1 0 1\n" + "97 96 96.0 Cm Curium 45.330096 " + "67.796823 90.263401 0 1 0 1\n" + "98 97 97.0 Bk Berkelium 45.773365 " + "68.450062 91.126608 0 1 0 1\n" + "99 98 98.0 Cf Californium 46.216634 " + "69.103300 91.989814 0 1 0 1\n" + "100 99 99.0 Es Einsteinium 46.659903 " + "69.756539 92.853020 0 1 0 1\n" + "101 100 100.0 Fm Fermium 47.103172 " + "70.409777 93.716227 0 1 0 1\n" + "102 101 101.0 Md Mendelevium 47.546441 " + "71.063016 94.579433 0 1 0 1\n" + "103 102 102.0 No Nobelium 47.989710 " + "71.716254 95.442640 0 1 0 1\n" + "104 103 103.0 Lr Lawrencium 48.432979 " + "72.369493 96.305846 0 1 0 1\n" + "105 104 104.0 Rf Rutherfordium 48.876248 " + "73.022731 97.169052 0 1 0 1\n" + "106 105 105.0 Db Dubnium 49.319518 " + "73.675970 98.032259 0 1 0 1\n" + "107 106 106.0 Sg Seaborgium 49.762787 " + "74.329208 98.895465 0 1 0 1\n" + "108 107 107.0 Bh Bohrium 50.206056 " + "74.982447 99.758671 0 1 0 1\n" + "109 108 108.0 Hs Hassium 50.649325 " + "75.635685 100.621878 0 1 0 1\n" + "110 109 109.0 Mt Meitnerium 51.092594 " + "76.288924 101.485084 0 1 0 1\n" + "111 110 110.0 Ds Darmstadtium 51.535863 " + "76.942162 102.348290 0 1 0 1\n" + "112 111 111.0 Rg Roentgenium 51.979132 " + "77.595401 103.211497 0 1 0 1\n" + "113 112 112.0 Cn Copernicium 52.422401 " + "78.248639 104.074703 0 1 0 1\n" + "114 113 113.0 Nh Nihonium 52.865670 " + "78.901878 104.937909 0 1 0 1\n" + "115 114 114.0 Fl Flerovium 53.308939 " + "79.555116 105.801116 0 1 0 1\n" + "116 115 115.0 Mc Moscovium 53.752208 " + "80.208354 106.664322 0 1 0 1\n" + "117 116 116.0 Lv Livermorium 54.195477 " + "80.861593 107.527529 0 1 0 1\n" + "118 117 117.0 Ts Tennessine 54.638747 " + "81.514831 108.390735 0 1 0 1\n" + "119 118 118.0 Og Oganesson 55.082016 " + "82.168070 109.253941 0 1 0 1\n"); +} // namespace TEST(CoordinateBlockGeneratorTest, generateCoordinateBlock) { diff --git a/tests/core/coordinatesettest.cpp b/tests/core/coordinatesettest.cpp index 546bf27b67..4a0fd5e285 100644 --- a/tests/core/coordinatesettest.cpp +++ b/tests/core/coordinatesettest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -19,9 +8,9 @@ #include #include +using Avogadro::Vector3; using Avogadro::Core::ArraySet; using Avogadro::Core::CoordinateSet; -using Avogadro::Vector3; TEST(CoordinateSetTest, StoreType) { diff --git a/tests/core/cubetest.cpp b/tests/core/cubetest.cpp index f4c1a75653..d8183ac43d 100644 --- a/tests/core/cubetest.cpp +++ b/tests/core/cubetest.cpp @@ -1,26 +1,15 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include #include -using Avogadro::Core::Cube; using Avogadro::Vector3; using Avogadro::Vector3i; +using Avogadro::Core::Cube; TEST(CubeTest, initialize) { diff --git a/tests/core/eigentest.cpp b/tests/core/eigentest.cpp index 35b855d038..7a0a9b526e 100644 --- a/tests/core/eigentest.cpp +++ b/tests/core/eigentest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2011-2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include diff --git a/tests/core/elementtest.cpp b/tests/core/elementtest.cpp index 6f06f4920a..91c0755d58 100644 --- a/tests/core/elementtest.cpp +++ b/tests/core/elementtest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2011-2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include diff --git a/tests/core/graphtest.cpp b/tests/core/graphtest.cpp index e55b7c1d4e..6f7dea6884 100644 --- a/tests/core/graphtest.cpp +++ b/tests/core/graphtest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2011-2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -53,9 +42,7 @@ TEST(GraphTest, isEmpty) EXPECT_EQ(graph.isEmpty(), true); } -TEST(GraphTest, clear) -{ -} +TEST(GraphTest, clear) {} TEST(GraphTest, addVertex) { diff --git a/tests/core/meshtest.cpp b/tests/core/meshtest.cpp index 3ac1557ccd..fb66a7b35c 100644 --- a/tests/core/meshtest.cpp +++ b/tests/core/meshtest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2011-2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include diff --git a/tests/core/moleculetest.cpp b/tests/core/moleculetest.cpp index 4561d9aa84..398107d878 100644 --- a/tests/core/moleculetest.cpp +++ b/tests/core/moleculetest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2011-2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "utils.h" diff --git a/tests/core/mutextest.cpp b/tests/core/mutextest.cpp index 2074c714e0..414e312329 100644 --- a/tests/core/mutextest.cpp +++ b/tests/core/mutextest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include diff --git a/tests/core/ringperceivertest.cpp b/tests/core/ringperceivertest.cpp index 3401ab7bfa..9eda02fa17 100644 --- a/tests/core/ringperceivertest.cpp +++ b/tests/core/ringperceivertest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2011-2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include diff --git a/tests/core/spacegrouptest.cpp b/tests/core/spacegrouptest.cpp index 563c740e53..d5a2799d1f 100644 --- a/tests/core/spacegrouptest.cpp +++ b/tests/core/spacegrouptest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2016 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include diff --git a/tests/core/unitcelltest.cpp b/tests/core/unitcelltest.cpp index 2adc46fb16..24640270d3 100644 --- a/tests/core/unitcelltest.cpp +++ b/tests/core/unitcelltest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -59,7 +48,7 @@ bool checkParams(const UnitCell& cell, Real a, Real b, Real c, Real alpha, } return true; } -} +} // namespace TEST(UnitCellTest, cellParameters) { @@ -261,11 +250,20 @@ TEST(UnitCellTest, wrapAtomsToUnitCell) for (std::vector::const_iterator it = fcoords.begin(), itEnd = fcoords.end(); it != itEnd; ++it) { - EXPECT_GT(it->x(), static_cast(-std::numeric_limits::epsilon())); // x >= 0, "mostly" zero + EXPECT_GT( + it->x(), + static_cast( + -std::numeric_limits::epsilon())); // x >= 0, "mostly" zero EXPECT_LE(it->x(), static_cast(1.0)); - EXPECT_GT(it->y(), static_cast(-std::numeric_limits::epsilon())); // y >= 0, "mostly" zero + EXPECT_GT( + it->y(), + static_cast( + -std::numeric_limits::epsilon())); // y >= 0, "mostly" zero EXPECT_LE(it->y(), static_cast(1.0)); - EXPECT_GT(it->z(), static_cast(-std::numeric_limits::epsilon())); // z >= 0, "mostly" zero + EXPECT_GT( + it->z(), + static_cast( + -std::numeric_limits::epsilon())); // z >= 0, "mostly" zero EXPECT_LE(it->z(), static_cast(1.0)); } } diff --git a/tests/core/utilitiestest.cpp b/tests/core/utilitiestest.cpp index c98b684be0..3d234bb5e1 100644 --- a/tests/core/utilitiestest.cpp +++ b/tests/core/utilitiestest.cpp @@ -1,29 +1,18 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include #include -using std::string; using Avogadro::Core::contains; using Avogadro::Core::lexicalCast; using Avogadro::Core::split; using Avogadro::Core::startsWith; using Avogadro::Core::trimmed; +using std::string; TEST(UtilitiesTest, split) { diff --git a/tests/core/variantmaptest.cpp b/tests/core/variantmaptest.cpp index 64fd07424e..a9c81479f8 100644 --- a/tests/core/variantmaptest.cpp +++ b/tests/core/variantmaptest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2011-2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include diff --git a/tests/core/varianttest.cpp b/tests/core/varianttest.cpp index 1cfd39da5b..cbe9a11488 100644 --- a/tests/core/varianttest.cpp +++ b/tests/core/varianttest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2011-2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include diff --git a/tests/io/cjsontest.cpp b/tests/io/cjsontest.cpp index 1f8d5e55b3..0ffb5224e1 100644 --- a/tests/io/cjsontest.cpp +++ b/tests/io/cjsontest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "iotests.h" @@ -24,6 +13,7 @@ #include +using Avogadro::MatrixX; using Avogadro::PI_F; using Avogadro::Real; using Avogadro::Core::Atom; @@ -32,7 +22,6 @@ using Avogadro::Core::Molecule; using Avogadro::Core::UnitCell; using Avogadro::Core::Variant; using Avogadro::Io::CjsonFormat; -using Avogadro::MatrixX; TEST(CjsonTest, readFile) { diff --git a/tests/io/cmltest.cpp b/tests/io/cmltest.cpp index 9eab97dbb2..7f158dd8f1 100644 --- a/tests/io/cmltest.cpp +++ b/tests/io/cmltest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "iotests.h" @@ -24,14 +13,14 @@ #include -using Avogadro::Core::Molecule; +using Avogadro::MatrixX; +using Avogadro::Real; +using Avogadro::Vector3; using Avogadro::Core::Atom; using Avogadro::Core::Bond; +using Avogadro::Core::Molecule; using Avogadro::Core::Variant; using Avogadro::Io::CmlFormat; -using Avogadro::MatrixX; -using Avogadro::Real; -using Avogadro::Vector3; TEST(CmlTest, readFile) { diff --git a/tests/io/fileformatmanagertest.cpp b/tests/io/fileformatmanagertest.cpp index c8f29ba052..f5147bcdaa 100644 --- a/tests/io/fileformatmanagertest.cpp +++ b/tests/io/fileformatmanagertest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "iotests.h" @@ -22,9 +11,9 @@ #include #include -using Avogadro::Core::Molecule; using Avogadro::Core::Atom; using Avogadro::Core::Bond; +using Avogadro::Core::Molecule; using Avogadro::Core::Variant; using Avogadro::Io::FileFormat; using Avogadro::Io::FileFormatManager; diff --git a/tests/io/hdf5test.cpp b/tests/io/hdf5test.cpp index 27050f294f..7f5efa2aa7 100644 --- a/tests/io/hdf5test.cpp +++ b/tests/io/hdf5test.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "iotests.h" @@ -35,7 +24,7 @@ bool fileExists(const char* filename) } return false; } -} +} // namespace TEST(Hdf5Test, openCloseReadOnly) { @@ -62,8 +51,8 @@ TEST(Hdf5Test, openCloseReadOnly) } } - ASSERT_TRUE(hdf5.closeFile()) << "Failed to close read-only file " << testfile - << "."; + ASSERT_TRUE(hdf5.closeFile()) + << "Failed to close read-only file " << testfile << "."; } TEST(Hdf5Test, openCloseReadWriteAppend) @@ -91,8 +80,8 @@ TEST(Hdf5Test, openCloseReadWriteAppend) } } - ASSERT_TRUE(hdf5.closeFile()) << "Failed to close read-only file " << testfile - << "."; + ASSERT_TRUE(hdf5.closeFile()) + << "Failed to close read-only file " << testfile << "."; } TEST(Hdf5Test, readWriteEigenMatrixXd) @@ -121,8 +110,8 @@ TEST(Hdf5Test, readWriteEigenMatrixXd) << mat << "\nRead:\n" << matRead; - ASSERT_TRUE(hdf5.closeFile()) << "Closing test file '" << tmpFileName - << "' failed."; + ASSERT_TRUE(hdf5.closeFile()) + << "Closing test file '" << tmpFileName << "' failed."; remove(tmpFileName.c_str()); } @@ -156,8 +145,8 @@ TEST(Hdf5Test, readWriteDoubleVector) << "std::vector read/write mismatch at index " << i << "."; } - ASSERT_TRUE(hdf5.closeFile()) << "Closing test file '" << tmpFileName - << "' failed."; + ASSERT_TRUE(hdf5.closeFile()) + << "Closing test file '" << tmpFileName << "' failed."; remove(tmpFileName.c_str()); } @@ -266,12 +255,12 @@ TEST(Hdf5Test, datasetInteraction) EXPECT_TRUE(hdf5.datasetExists(str)) << "Data set should exist, but isn't found: " << str; EXPECT_TRUE(hdf5.removeDataset(str)) << "Error removing dataset " << str; - EXPECT_FALSE(hdf5.datasetExists(str)) << "Removed dataset still exists: " - << str; + EXPECT_FALSE(hdf5.datasetExists(str)) + << "Removed dataset still exists: " << str; } - ASSERT_TRUE(hdf5.closeFile()) << "Closing test file '" << tmpFileName - << "' failed."; + ASSERT_TRUE(hdf5.closeFile()) + << "Closing test file '" << tmpFileName << "' failed."; remove(tmpFileName.c_str()); } diff --git a/tests/io/lammpstest.cpp b/tests/io/lammpstest.cpp index 03a7d32797..d934b715de 100644 --- a/tests/io/lammpstest.cpp +++ b/tests/io/lammpstest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "iotests.h" diff --git a/tests/io/mdltest.cpp b/tests/io/mdltest.cpp index 8a055f38bd..6780631326 100644 --- a/tests/io/mdltest.cpp +++ b/tests/io/mdltest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "iotests.h" @@ -22,9 +11,9 @@ #include -using Avogadro::Core::Molecule; using Avogadro::Core::Atom; using Avogadro::Core::Bond; +using Avogadro::Core::Molecule; using Avogadro::Core::Variant; using Avogadro::Io::FileFormat; using Avogadro::Io::MdlFormat; diff --git a/tests/io/mmtftest.cpp b/tests/io/mmtftest.cpp index ecc3914ff0..4b7aac88a3 100644 --- a/tests/io/mmtftest.cpp +++ b/tests/io/mmtftest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "iotests.h" @@ -145,13 +134,15 @@ TEST(MMTFTest, AltLoc) EXPECT_EQ(molecule.coordinate3dCount(), 2); - EXPECT_FLOAT_EQ(molecule.atomPosition3d(270).x(), molecule.coordinate3d(1)[270].x()); - EXPECT_FLOAT_EQ(molecule.atomPosition3d(270).y(), molecule.coordinate3d(1)[270].y()); - EXPECT_FLOAT_EQ(molecule.atomPosition3d(270).z(), molecule.coordinate3d(1)[270].z()); + EXPECT_FLOAT_EQ(molecule.atomPosition3d(270).x(), + molecule.coordinate3d(1)[270].x()); + EXPECT_FLOAT_EQ(molecule.atomPosition3d(270).y(), + molecule.coordinate3d(1)[270].y()); + EXPECT_FLOAT_EQ(molecule.atomPosition3d(270).z(), + molecule.coordinate3d(1)[270].z()); EXPECT_TRUE( molecule.atomPosition3d(271).x() != molecule.coordinate3d(1)[271].x() || molecule.atomPosition3d(271).y() != molecule.coordinate3d(1)[271].y() || - molecule.atomPosition3d(271).z() != molecule.coordinate3d(1)[271].z() - ); + molecule.atomPosition3d(271).z() != molecule.coordinate3d(1)[271].z()); } diff --git a/tests/io/vasptest.cpp b/tests/io/vasptest.cpp index 4378c12e86..dc7b2e5144 100644 --- a/tests/io/vasptest.cpp +++ b/tests/io/vasptest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2016 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "iotests.h" diff --git a/tests/io/xyztest.cpp b/tests/io/xyztest.cpp index 457b885ecb..1b89c2497c 100644 --- a/tests/io/xyztest.cpp +++ b/tests/io/xyztest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "iotests.h" @@ -28,11 +17,11 @@ #include #include +using Avogadro::Vector3; using Avogadro::Core::Atom; using Avogadro::Core::Molecule; using Avogadro::Io::FileFormat; using Avogadro::Io::XyzFormat; -using Avogadro::Vector3; // methane.xyz uses atomic symbols to identify atoms TEST(XyzTest, readAtomicSymbols) diff --git a/tests/qtgui/filebrowsewidgettest.cpp b/tests/qtgui/filebrowsewidgettest.cpp index 4b8dce09c6..b8eb91cb98 100644 --- a/tests/qtgui/filebrowsewidgettest.cpp +++ b/tests/qtgui/filebrowsewidgettest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "qtguitests.h" diff --git a/tests/qtgui/generichighlightertest.cpp b/tests/qtgui/generichighlightertest.cpp index 8fab84e8ff..f67c2c048d 100644 --- a/tests/qtgui/generichighlightertest.cpp +++ b/tests/qtgui/generichighlightertest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -95,7 +84,7 @@ class GenericHighlighterHtml : public GenericHighlighter } }; -} // end anon namespace +} // namespace // This currently seg faults... TEST(DISABLED_GenericHighlighterTest, exercise) diff --git a/tests/qtgui/hydrogentoolstest.cpp b/tests/qtgui/hydrogentoolstest.cpp index 10fdd9c276..b2023d7880 100644 --- a/tests/qtgui/hydrogentoolstest.cpp +++ b/tests/qtgui/hydrogentoolstest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -19,9 +8,9 @@ #include #include -using Avogadro::QtGui::RWAtom; using Avogadro::QtGui::HydrogenTools; using Avogadro::QtGui::Molecule; +using Avogadro::QtGui::RWAtom; using Avogadro::QtGui::RWMolecule; TEST(HydrogenToolsTest, removeAllHydrogens) diff --git a/tests/qtgui/inputgeneratortest.cpp b/tests/qtgui/inputgeneratortest.cpp index 794eb09d6a..a01367a35d 100644 --- a/tests/qtgui/inputgeneratortest.cpp +++ b/tests/qtgui/inputgeneratortest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -29,8 +18,8 @@ #include #include -using Avogadro::QtGui::GenericHighlighter; using Avogadro::MoleQueue::InputGenerator; +using Avogadro::QtGui::GenericHighlighter; TEST(InputGeneratorTest, exercise) { diff --git a/tests/qtgui/inputgeneratorwidgettest.cpp b/tests/qtgui/inputgeneratorwidgettest.cpp index 15406c3a6c..a71e9db943 100644 --- a/tests/qtgui/inputgeneratorwidgettest.cpp +++ b/tests/qtgui/inputgeneratorwidgettest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -33,8 +22,8 @@ #include #include -using Avogadro::QtGui::FileBrowseWidget; using Avogadro::MoleQueue::InputGeneratorWidget; +using Avogadro::QtGui::FileBrowseWidget; using Avogadro::QtGui::Molecule; namespace { @@ -47,7 +36,7 @@ void flushEvents() qApp->exec(); } -} // end anon namespace +} // namespace TEST(InputGeneratorWidgetTest, exercise) { diff --git a/tests/qtgui/moleculetest.cpp b/tests/qtgui/moleculetest.cpp index 82e4416bda..319d653b29 100644 --- a/tests/qtgui/moleculetest.cpp +++ b/tests/qtgui/moleculetest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -26,15 +15,15 @@ #include "utils.h" -using Avogadro::QtGui::Molecule; -using Avogadro::QtGui::PersistentAtom; -using Avogadro::QtGui::PersistentBond; +using Avogadro::Index; using Avogadro::Core::Array; using Avogadro::Core::Atom; using Avogadro::Core::Bond; using Avogadro::Core::Color3f; using Avogadro::Core::Mesh; -using Avogadro::Index; +using Avogadro::QtGui::Molecule; +using Avogadro::QtGui::PersistentAtom; +using Avogadro::QtGui::PersistentBond; class MoleculeTest : public testing::Test { @@ -470,15 +459,15 @@ TEST_F(MoleculeTest, centerOfGeometry) a = mol.addAtom(1); mol.setAtomPosition3d(a.index(), Avogadro::Vector3(0.0, 1.0, -1.0)); center = mol.centerOfGeometry(); - EXPECT_DOUBLE_EQ(center.x(), 1./3.); - EXPECT_DOUBLE_EQ(center.y(), 1./3.); - EXPECT_DOUBLE_EQ(center.z(), -1./3.); + EXPECT_DOUBLE_EQ(center.x(), 1. / 3.); + EXPECT_DOUBLE_EQ(center.y(), 1. / 3.); + EXPECT_DOUBLE_EQ(center.z(), -1. / 3.); a8.setAtomicNumber(9); center = mol.centerOfGeometry(); - EXPECT_DOUBLE_EQ(center.x(), 1./3.); - EXPECT_DOUBLE_EQ(center.y(), 1./3.); - EXPECT_DOUBLE_EQ(center.z(), -1./3.); + EXPECT_DOUBLE_EQ(center.x(), 1. / 3.); + EXPECT_DOUBLE_EQ(center.y(), 1. / 3.); + EXPECT_DOUBLE_EQ(center.z(), -1. / 3.); } TEST_F(MoleculeTest, centerOfMass) @@ -496,22 +485,38 @@ TEST_F(MoleculeTest, centerOfMass) Atom a = mol.addAtom(2); mol.setAtomPosition3d(a.index(), Avogadro::Vector3(2.0, 0.0, 0.0)); center = mol.centerOfMass(); - EXPECT_DOUBLE_EQ(center.x(), (2.0 * Avogadro::Core::Elements::mass(2) / mol.atomCount()) / mol.mass()); + EXPECT_DOUBLE_EQ(center.x(), + (2.0 * Avogadro::Core::Elements::mass(2) / mol.atomCount()) / + mol.mass()); EXPECT_DOUBLE_EQ(center.y(), 0.0); EXPECT_DOUBLE_EQ(center.z(), 0.0); a = mol.addAtom(3); mol.setAtomPosition3d(a.index(), Avogadro::Vector3(1.0, 3.0, -4.0)); center = mol.centerOfMass(); - EXPECT_DOUBLE_EQ(center.x(), ((2.0 * Avogadro::Core::Elements::mass(2) + 1.0 * Avogadro::Core::Elements::mass(3)) / mol.atomCount()) / mol.mass()); - EXPECT_DOUBLE_EQ(center.y(), (3.0 * Avogadro::Core::Elements::mass(3) / mol.atomCount()) / mol.mass()); - EXPECT_DOUBLE_EQ(center.z(), (-4.0 * Avogadro::Core::Elements::mass(3) / mol.atomCount()) / mol.mass()); + EXPECT_DOUBLE_EQ(center.x(), ((2.0 * Avogadro::Core::Elements::mass(2) + + 1.0 * Avogadro::Core::Elements::mass(3)) / + mol.atomCount()) / + mol.mass()); + EXPECT_DOUBLE_EQ(center.y(), + (3.0 * Avogadro::Core::Elements::mass(3) / mol.atomCount()) / + mol.mass()); + EXPECT_DOUBLE_EQ( + center.z(), + (-4.0 * Avogadro::Core::Elements::mass(3) / mol.atomCount()) / mol.mass()); a8.setAtomicNumber(9); center = mol.centerOfMass(); - EXPECT_DOUBLE_EQ(center.x(), ((2.0 * Avogadro::Core::Elements::mass(2) + 1.0 * Avogadro::Core::Elements::mass(3)) / mol.atomCount()) / mol.mass()); - EXPECT_DOUBLE_EQ(center.y(), (3.0 * Avogadro::Core::Elements::mass(3) / mol.atomCount()) / mol.mass()); - EXPECT_DOUBLE_EQ(center.z(), (-4.0 * Avogadro::Core::Elements::mass(3) / mol.atomCount()) / mol.mass()); + EXPECT_DOUBLE_EQ(center.x(), ((2.0 * Avogadro::Core::Elements::mass(2) + + 1.0 * Avogadro::Core::Elements::mass(3)) / + mol.atomCount()) / + mol.mass()); + EXPECT_DOUBLE_EQ(center.y(), + (3.0 * Avogadro::Core::Elements::mass(3) / mol.atomCount()) / + mol.mass()); + EXPECT_DOUBLE_EQ( + center.z(), + (-4.0 * Avogadro::Core::Elements::mass(3) / mol.atomCount()) / mol.mass()); } TEST_F(MoleculeTest, radius) diff --git a/tests/qtgui/molequeuequeuelistmodeltest.cpp b/tests/qtgui/molequeuequeuelistmodeltest.cpp index 164fd11ed4..c79f5ea7da 100644 --- a/tests/qtgui/molequeuequeuelistmodeltest.cpp +++ b/tests/qtgui/molequeuequeuelistmodeltest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -60,7 +49,7 @@ void populateModel(MoleQueueQueueListModelTestBridge& model, int numQueues, model.setQueueList(queues, programs); } -} // end anon namespace +} // namespace TEST(MoleQueueQueueListModelTest, setQueues) { diff --git a/tests/qtgui/rwmoleculetest.cpp b/tests/qtgui/rwmoleculetest.cpp index 13b296d55c..4b27ed17e9 100644 --- a/tests/qtgui/rwmoleculetest.cpp +++ b/tests/qtgui/rwmoleculetest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -293,8 +282,8 @@ TEST(RWMoleculeTest, clearAtoms) EXPECT_EQ(static_cast(order), mol.bondOrder(ind)); \ EXPECT_EQ(uid, mol.bondUniqueId(ind)) -// This is disabled because the pair may come in any order -// EXPECT_EQ(std::make_pair(Index(atom1), Index(atom2)), mol.bondPair(ind)); + // This is disabled because the pair may come in any order + // EXPECT_EQ(std::make_pair(Index(atom1), Index(atom2)), mol.bondPair(ind)); VALIDATE_BOND(0, 0, 1, 0, 0); VALIDATE_BOND(1, 1, 2, 1, 1); diff --git a/tests/qtopengl/glwidgettest.cpp b/tests/qtopengl/glwidgettest.cpp index 033f6a41e2..e9d23fda0b 100644 --- a/tests/qtopengl/glwidgettest.cpp +++ b/tests/qtopengl/glwidgettest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2012-2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -30,9 +19,9 @@ using Avogadro::Vector3f; using Avogadro::Vector3ub; +using Avogadro::QtOpenGL::GLWidget; using Avogadro::Rendering::GeometryNode; using Avogadro::Rendering::SphereGeometry; -using Avogadro::QtOpenGL::GLWidget; using Avogadro::VtkTesting::ImageRegressionTest; int glwidgettest(int argc, char* argv[]) diff --git a/tests/qtopengl/qttextlabeltest.cpp b/tests/qtopengl/qttextlabeltest.cpp index c8efeba2ca..920ba4b907 100644 --- a/tests/qtopengl/qttextlabeltest.cpp +++ b/tests/qtopengl/qttextlabeltest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -37,15 +26,15 @@ #include using Avogadro::Vector2f; -using Avogadro::Vector3f; using Avogadro::Vector2i; +using Avogadro::Vector3f; using Avogadro::Vector3ub; +using Avogadro::QtOpenGL::GLWidget; using Avogadro::Rendering::GeometryNode; +using Avogadro::Rendering::SphereGeometry; using Avogadro::Rendering::TextLabel2D; using Avogadro::Rendering::TextLabel3D; using Avogadro::Rendering::TextProperties; -using Avogadro::Rendering::SphereGeometry; -using Avogadro::QtOpenGL::GLWidget; using Avogadro::VtkTesting::ImageRegressionTest; int qttextlabeltest(int argc, char* argv[]) diff --git a/tests/qtopengl/qttextrenderstrategytest.cpp b/tests/qtopengl/qttextrenderstrategytest.cpp index 8dcd7bcadb..ddffe45654 100644 --- a/tests/qtopengl/qttextrenderstrategytest.cpp +++ b/tests/qtopengl/qttextrenderstrategytest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include "qtopengltests.h" @@ -30,8 +19,8 @@ typedef Avogadro::QtOpenGL::QtTextRenderStrategy Strategy; typedef Avogadro::Rendering::TextRenderStrategy Interface; -using Avogadro::Rendering::TextProperties; using Avogadro::Vector2i; +using Avogadro::Rendering::TextProperties; // Need to start an app to load fonts #define START_QAPP \ @@ -179,7 +168,7 @@ bool render() return result; } -} // end anon namespace +} // namespace // Driver function: int qttextrenderstrategytest(int, char** const) diff --git a/tests/rendering/absoluteoverlayquadstrategytest.cpp b/tests/rendering/absoluteoverlayquadstrategytest.cpp index 37f622342f..a2985f93e1 100644 --- a/tests/rendering/absoluteoverlayquadstrategytest.cpp +++ b/tests/rendering/absoluteoverlayquadstrategytest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -24,11 +13,11 @@ typedef Avogadro::Rendering::AbsoluteOverlayQuadStrategy Strategy; -using Avogadro::Core::Array; -using Avogadro::Rendering::Camera; using Avogadro::Vector2f; -using Avogadro::Vector3f; using Avogadro::Vector2i; +using Avogadro::Vector3f; +using Avogadro::Core::Array; +using Avogadro::Rendering::Camera; TEST(AbsoluteOverlayQuadStrategyTest, exercise) { diff --git a/tests/rendering/absolutequadstrategytest.cpp b/tests/rendering/absolutequadstrategytest.cpp index e9b95870d6..b1edffdb60 100644 --- a/tests/rendering/absolutequadstrategytest.cpp +++ b/tests/rendering/absolutequadstrategytest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -24,10 +13,10 @@ typedef Avogadro::Rendering::AbsoluteQuadStrategy Strategy; -using Avogadro::Core::Array; -using Avogadro::Rendering::Camera; using Avogadro::Vector2f; using Avogadro::Vector3f; +using Avogadro::Core::Array; +using Avogadro::Rendering::Camera; TEST(AbsoluteQuadStrategyTest, exercise) { diff --git a/tests/rendering/billboardquadstrategytest.cpp b/tests/rendering/billboardquadstrategytest.cpp index ae03c91e7f..e72e47ca37 100644 --- a/tests/rendering/billboardquadstrategytest.cpp +++ b/tests/rendering/billboardquadstrategytest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -24,10 +13,10 @@ typedef Avogadro::Rendering::BillboardQuadStrategy Strategy; -using Avogadro::Core::Array; -using Avogadro::Rendering::Camera; using Avogadro::Vector2f; using Avogadro::Vector3f; +using Avogadro::Core::Array; +using Avogadro::Rendering::Camera; TEST(BillboardQuadStrategyTest, exercise) { diff --git a/tests/rendering/cameratest.cpp b/tests/rendering/cameratest.cpp index 2b82804f30..fe6ec653c2 100644 --- a/tests/rendering/cameratest.cpp +++ b/tests/rendering/cameratest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2012 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -22,8 +11,8 @@ #include -using Avogadro::Rendering::Camera; using Avogadro::Vector3f; +using Avogadro::Rendering::Camera; void setUpOrthographic(Camera& camera) { diff --git a/tests/rendering/nodetest.cpp b/tests/rendering/nodetest.cpp index 6e230e5048..1d2a030a7d 100644 --- a/tests/rendering/nodetest.cpp +++ b/tests/rendering/nodetest.cpp @@ -1,25 +1,14 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include #include -using Avogadro::Rendering::Node; using Avogadro::Rendering::GroupNode; +using Avogadro::Rendering::Node; TEST(NodeTest, children) { diff --git a/tests/rendering/overlayquadstrategytest.cpp b/tests/rendering/overlayquadstrategytest.cpp index 4f58b14424..866394bbc6 100644 --- a/tests/rendering/overlayquadstrategytest.cpp +++ b/tests/rendering/overlayquadstrategytest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -24,10 +13,10 @@ typedef Avogadro::Rendering::OverlayQuadStrategy Strategy; -using Avogadro::Core::Array; -using Avogadro::Rendering::Camera; using Avogadro::Vector2f; using Avogadro::Vector3f; +using Avogadro::Core::Array; +using Avogadro::Rendering::Camera; TEST(OverlayQuadStrategyTest, exercise) { diff --git a/tests/rendering/spheregeometrytest.cpp b/tests/rendering/spheregeometrytest.cpp index b7415a5a13..a879f596a5 100644 --- a/tests/rendering/spheregeometrytest.cpp +++ b/tests/rendering/spheregeometrytest.cpp @@ -1,17 +1,6 @@ /****************************************************************************** - This source file is part of the Avogadro project. - - Copyright 2013 Kitware, Inc. - - This source code is released under the New BSD License, (the "License"). - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ #include @@ -20,10 +9,10 @@ #include #include -using Avogadro::Rendering::GeometryNode; -using Avogadro::Rendering::SphereGeometry; using Avogadro::Vector3f; using Avogadro::Vector3ub; +using Avogadro::Rendering::GeometryNode; +using Avogadro::Rendering::SphereGeometry; TEST(SphereGeometryTest, children) {