GoogleTest R2, R3, R6 refactor

Author: Daniel J. Greenhoe

CMakeLists.txt

@@ -66,8 +66,9 @@
  set( SOURCES_TARGET
       main.cpp
       tests/TestSuiteMisc.cpp
-      tests/TestSuiteTuples.cpp
-      tests/TestSuiteVectRn.cpp
+      tests/TestSuiteR2.cpp
+      tests/TestSuiteR3.cpp
+      tests/TestSuiteR6.cpp
       tests/TestSuiteLarc.cpp
     )
 

tests/TestSuiteR2.cpp

@@ -0,0 +1,66 @@
+//=============================================================================
+// Daniel J. Greenhoe
+// Test routines
+//=============================================================================
+#include <stdio.h>
+#include <math.h>
+#include "r1.h"
+#include "r2.h"
+#include "r3.h"
+#include "gtest/gtest.h"  // https://github.com/google/googletest/blob/master/googletest/docs/primer.md
+
+//-----------------------------------------------------------------------------
+// \brief Test opair Set operation
+//-----------------------------------------------------------------------------
+TEST( TestSuiteR2, set  )
+{
+  opair ab(3,-4);
+  ASSERT_EQ( ab.getx(),  3 );
+  ASSERT_EQ( ab.gety(), -4 );
+}
+
+//-----------------------------------------------------------------------------
+// \brief Test opair Clear operation
+//-----------------------------------------------------------------------------
+TEST( TestSuiteR2, clear  )
+{
+  opair ab(3,-4);
+  ab.clear();
+  ASSERT_EQ( ab.getx(),  0 );
+  ASSERT_EQ( ab.gety(),  0 );
+}
+
+//-----------------------------------------------------------------------------
+//! \brief Test R2 operations
+//-----------------------------------------------------------------------------
+TEST( TestSuiteR2, misc )
+{
+  vectR2 p(3,-4);
+  vectR2 q,s;
+  ASSERT_EQ( p.getx(),  3 );
+  ASSERT_EQ( p.gety(), -4 );
+  ASSERT_EQ( p.norm(),  5 );
+  p.put(sqrt(3),1);
+  ASSERT_DOUBLE_EQ( p.theta()/M_PI*180, 30.0 );
+  q=-p;
+  ASSERT_EQ( q.getx(), -sqrt(3) );
+  ASSERT_EQ( q.gety(), -1       );
+  p.put(3,-5); q.put(-2,7); s=p+q;
+  ASSERT_EQ( s.getx(), 1 );
+  ASSERT_EQ( s.gety(), 2 );
+  p.put(3,-5); q.put(-2,7); s=p-q;
+  ASSERT_EQ( s.getx(),  5 );
+  ASSERT_EQ( s.gety(),-12 );
+  p.put(2,-3); q.put(-5,7);
+  ASSERT_DOUBLE_EQ( p^q, -31 );
+  q=p; q&=(M_PI/2);
+  ASSERT_DOUBLE_EQ( q.getx(),  3 );
+  ASSERT_DOUBLE_EQ( q.gety(),  2 );
+  q=p; q&=(M_PI);
+  ASSERT_DOUBLE_EQ( q.getx(), -2 );
+  ASSERT_DOUBLE_EQ( q.gety(),  3 );
+  p.clear();
+  ASSERT_DOUBLE_EQ( p.getx(),  0 );
+  ASSERT_DOUBLE_EQ( p.gety(),  0 );
+}
+

tests/TestSuiteTuples.cpp tests/TestSuiteR3.cpptests/TestSuiteTuples.cpp renamed to tests/TestSuiteR3.cpp

@@ -7,35 +7,12 @@
 #include "r1.h"
 #include "r2.h"
 #include "r3.h"
-#include "r4.h"
-#include "r6.h"
 #include "gtest/gtest.h"  // https://github.com/google/googletest/blob/master/googletest/docs/primer.md
 
-//-----------------------------------------------------------------------------
-// \brief Test opair Set operation
-//-----------------------------------------------------------------------------
-TEST( TestSuiteTuples, opairSet  )
-{
-  opair ab(3,-4);
-  ASSERT_EQ( ab.getx(),  3 );
-  ASSERT_EQ( ab.gety(), -4 );
-}
-
-//-----------------------------------------------------------------------------
-// \brief Test opair Clear operation
-//-----------------------------------------------------------------------------
-TEST( TestSuiteTuples, opairClear  )
-{
-  opair ab(3,-4);
-  ab.clear();
-  ASSERT_EQ( ab.getx(),  0 );
-  ASSERT_EQ( ab.gety(),  0 );
-}
-
 //-----------------------------------------------------------------------------
 // \brief Test otriple clear operation
 //-----------------------------------------------------------------------------
-TEST( TestSuiteTuples, otripleSet  )
+TEST( TestSuiteR3, set  )
 {
   otriple abc( 3, -4, 5 );
   ASSERT_EQ( abc.getx(),  3 );
@@ -46,7 +23,7 @@ TEST( TestSuiteTuples, otripleSet  )
 //-----------------------------------------------------------------------------
 // \brief Test otriple clear operation
 //-----------------------------------------------------------------------------
-TEST( TestSuiteTuples, otripleClear  )
+TEST( TestSuiteR3, clear  )
 {
   otriple abc(3,-4,5);
   abc.clear();
@@ -55,50 +32,6 @@ TEST( TestSuiteTuples, otripleClear  )
   ASSERT_EQ( abc.getz(), 0 );
 }
 
-//-----------------------------------------------------------------------------
-// \brief Test osix Clear operation
-//-----------------------------------------------------------------------------
-TEST( TestSuiteTuples, osixSet )
-{
-  osix x(1,-2,3,-5,7,-11);
-  osix y,z;
-  y=x;
-  z.put(y);
-  ASSERT_EQ( x.get1(),  1 );
-  ASSERT_EQ( x.get2(), -2 );
-  ASSERT_EQ( x.get3(),  3 );
-  ASSERT_EQ( x.get4(), -5 );
-  ASSERT_EQ( x.get5(),  7 );
-  ASSERT_EQ( x.get6(),-11 );
-  ASSERT_EQ( x.get1(), y.get1() );
-  ASSERT_EQ( x.get2(), y.get2() );
-  ASSERT_EQ( x.get3(), y.get3() );
-  ASSERT_EQ( x.get4(), y.get4() );
-  ASSERT_EQ( x.get5(), y.get5() );
-  ASSERT_EQ( x.get6(), y.get6() );
-  ASSERT_EQ( x.get1(), z.get1() );
-  ASSERT_EQ( x.get2(), z.get2() );
-  ASSERT_EQ( x.get3(), z.get3() );
-  ASSERT_EQ( x.get4(), z.get4() );
-  ASSERT_EQ( x.get5(), z.get5() );
-  ASSERT_EQ( x.get6(), z.get6() );
-}
-
-//-----------------------------------------------------------------------------
-//! \brief Test osix Clear operation
-//-----------------------------------------------------------------------------
-TEST( TestSuiteTuples, osixClear  )
-{
-  osix x(1,-2,3,-5,7,-11);
-  x.clear();
-  ASSERT_EQ( x.get1(),  0 );
-  ASSERT_EQ( x.get2(),  0 );
-  ASSERT_EQ( x.get3(),  0 );
-  ASSERT_EQ( x.get4(),  0 );
-  ASSERT_EQ( x.get5(),  0 );
-  ASSERT_EQ( x.get6(),  0 );
-}
-
 //-----------------------------------------------------------------------------
 //! \brief Test otriple angle operation
 //-----------------------------------------------------------------------------