Changeset 4f684a in git

Timestamp:

Apr 18, 2011, 9:06:26 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

0ffdec76b9340ac8c557e00b7c25bf36046ecf5b

Parents:

845729b0cdf699d3eba18bc144ad8e14f46e1c99

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-04-18 21:06:26+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:17+01:00

Message:

ADD: unit tests for polys

Location:

libpolys/tests

Files:

• Makefile.am (modified) (3 diffs)
• coeffs_test.h (modified) (2 diffs)
• common.h (added)
• polys_test.h (added)

libpolys/tests/Makefile.am

@@ -2 +2 @@
 
 ## for testing...
-AM_LDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc -L${top_builddir}/../omalloc 
+AM_LDFLAGS = -L${top_builddir}/polys -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc -L${top_builddir}/../omalloc 
 
 
@@ -14 +14 @@
 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${srcdir} ${GMP_CFLAGS}
 
-TESTS = simple_test coeffs_test
+
+TESTS = simple_test coeffs_test polys_test
 check_PROGRAMS = $(TESTS)
 
 simple_test_SOURCES = simple_test_runner.cpp
-
 coeffs_test_SOURCES = coeffs_test_runner.cpp
+polys_test_SOURCES = polys_test_runner.cpp
 
 coeffs_test_LDADD = -lcoeffs_g ${GMP_LIBS} -lresources_g -lreporter_g -lmisc -lomalloc_debug
+polys_test_LDADD = -lpolys_g $(coeffs_test_LDADD)
 
 
-BUILT_SOURCES = $(simple_test_SOURCES) $(coeffs_test_SOURCES)
+BUILT_SOURCES = $(simple_test_SOURCES) $(coeffs_test_SOURCES) $(polys_test_SOURCES)
 
 
@@ -33 +35 @@
 coeffs_test_runner.cpp: coeffs_test.h
         ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer $^
+
+polys_test_runner.cpp: polys_test.h
+        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer $^

libpolys/tests/coeffs_test.h

@@ -22 +22 @@
 
 
-#include <iostream>
+#include "common.h"
 using namespace std;
 
 
-#pragma GCC diagnostic ignored "-Wwrite-strings"
 namespace
 {
-  static inline ostream& operator<< (ostream& o, const n_coeffType& type)
-  {
-#define CASE(A) case A: return o << (" " # A) << " ";
-    switch( type )
-    {
-      CASE(n_unknown);
-      CASE(n_Zp);
-      CASE(n_Q);
-      CASE(n_R);
-      CASE(n_GF);
-      CASE(n_long_R);
-      CASE(n_Zp_a);
-      CASE(n_Q_a);
-      CASE(n_long_C);
-      CASE(n_Z);
-      CASE(n_Zn);
-      CASE(n_Zpn);
-      CASE(n_Z2m);
-      CASE(n_CF);
-      default: return o << "Unknown type: [" << (const unsigned long) type << "]";  
-    }   
-#undef CASE
-    return o;
-  }
-
-  template<typename T>
-      static inline std::string _2S(T i)
-  {
-    std::stringstream ss;
-    ss << i;
-//    std::string s = ss.str();
-    return ss.str();
-  }
-
-
-  static inline std::string _2S(number a, const coeffs r)
-  {
-    n_Test(a,r);
-    StringSetS("");  
-    n_Write(a, r);
-
-    const char* s = StringAppendS("");
-    
-    std::stringstream ss;  ss << s;
-
-    StringSetS("");  
-    return ss.str();
-    
-  }
-  
-
-}
-
-void PrintSized(/*const*/ number a, const coeffs r, BOOLEAN eoln = TRUE)
-{
-  clog << _2S(a, r) << ", of size: " << n_Size(a, r);
-  
-  if( eoln ) 
-    clog << endl;  
-}
-  
 
 void TestSum(const coeffs r, const unsigned long N)
@@ -365 +303 @@
 
 
+}
+
 
 class CoeffsTestSuite : public CxxTest::TestSuite 
 {
  public:
-   void test_dummy()
-   {
-     float fnum = 2.00001f;             
-     TS_ASSERT_DELTA (fnum, 2.0f, 0.0001f);
-     
-   }
-
+//   void test_dummy() { float fnum = 2.00001f; TS_ASSERT_DELTA (fnum, 2.0f, 0.0001f);  }
 
    void test_Z2m4()