Changeset db6b872 for molecuilder/src/unittests/AtomDescriptorTest.hpp

Timestamp:

Mar 4, 2010, 10:34:52 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

fe3540

Parents:

d50264 (diff), f058ef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'StructureRefactoring' into MenuRefactoring

File:

• molecuilder/src/unittests/AtomDescriptorTest.hpp (moved) (moved from molecuilder/src/unittests/DescriptorUnittest.hpp ) (4 diffs)

molecuilder/src/unittests/AtomDescriptorTest.hpp

@@ -1 +1 @@
 /*
- * DescriptorUnittest.hpp
+ * AtomDescriptorTest.hpp
  *
  *  Created on: Feb 9, 2010
@@ -6 +6 @@
  */
 
-#ifndef DESCRIPTORUNITTEST_HPP_
-#define DESCRIPTORUNITTEST_HPP_
+#ifndef ATOMDESCRIPTORTEST_HPP_
+#define ATOMDESCRIPTORTEST_HPP_
 
 #include <cppunit/extensions/HelperMacros.h>
+
+#include "defs.hpp"
 
 #define ATOM_COUNT (10)
@@ -15 +17 @@
 class atom;
 
-class DescriptorUnittest : public CppUnit::TestFixture
+class AtomDescriptorTest : public CppUnit::TestFixture
 {
-  CPPUNIT_TEST_SUITE( DescriptorUnittest );
+  CPPUNIT_TEST_SUITE( AtomDescriptorTest );
   CPPUNIT_TEST ( AtomBaseSetsTest );
   CPPUNIT_TEST ( AtomIdTest );
@@ -33 +35 @@
 private:
   atom *atoms [ATOM_COUNT];
-  int atomIds [ATOM_COUNT];
+  atomId_t atomIds [ATOM_COUNT];
 };
 
-#endif /* DESCRIPTORUNITTEST_HPP_ */
+#endif /* ATOMDESCRIPTORTEST_HPP_ */