Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r51052 - sandbox/SOC/2007/visualization/libs/svg_plot/test
From: pbristow_at_[hidden]
Date: 2009-02-06 11:05:41


Author: pbristow
Date: 2009-02-06 11:05:41 EST (Fri, 06 Feb 2009)
New Revision: 51052
URL: http://svn.boost.org/trac/boost/changeset/51052

Log:
Update for new text_element and Jamfile.v2 - and all pass.
Text files modified:
   sandbox/SOC/2007/visualization/libs/svg_plot/test/1d_color_consistency.cpp | 6 +++
   sandbox/SOC/2007/visualization/libs/svg_plot/test/1d_tests.cpp | 14 ++++----
   sandbox/SOC/2007/visualization/libs/svg_plot/test/2d_color_consistency.cpp | 13 ++++----
   sandbox/SOC/2007/visualization/libs/svg_plot/test/Jamfile.v2 | 58 +++++++++++++++++++++++++++++++++------
   4 files changed, 67 insertions(+), 24 deletions(-)

Modified: sandbox/SOC/2007/visualization/libs/svg_plot/test/1d_color_consistency.cpp
==============================================================================
--- sandbox/SOC/2007/visualization/libs/svg_plot/test/1d_color_consistency.cpp (original)
+++ sandbox/SOC/2007/visualization/libs/svg_plot/test/1d_color_consistency.cpp 2009-02-06 11:05:41 EST (Fri, 06 Feb 2009)
@@ -1,4 +1,7 @@
-// 1d_color_consistency.cpp
+/*! \file 1d_color_consistency.cpp
+ \brief Test of SVG 1D plot
+ \author Jacob Voytko & Paul A. Bristow
+*/
 
 // Copyright Jacob Voytko 2007
 // Copyright Paul A. Bristow 2007
@@ -17,6 +20,7 @@
 # pragma warning(disable : 4512) // assignment operator could not be generated
 # pragma warning(disable : 4702) // unreachable code
 # pragma warning(disable : 4701) // potentially uninitialized local variable 'old_iph' used
+# pragma warning(disable : 4996) // Deprecated.
 #endif
 
 #define BOOST_TEST_MAIN

Modified: sandbox/SOC/2007/visualization/libs/svg_plot/test/1d_tests.cpp
==============================================================================
--- sandbox/SOC/2007/visualization/libs/svg_plot/test/1d_tests.cpp (original)
+++ sandbox/SOC/2007/visualization/libs/svg_plot/test/1d_tests.cpp 2009-02-06 11:05:41 EST (Fri, 06 Feb 2009)
@@ -1,4 +1,7 @@
-// 1d_tests.cpp
+/*! \file 1d_tests.cpp
+ \brief Test of SVG 1D plot
+ \author Jacob Voytko & Paul A. Bristow
+*/
 
 // Copyright Jacob Voytko 2007
 // Copyright Paul A. Bristow 2008
@@ -47,8 +50,6 @@
     top_side = +1,
   };
 
-
-
 BOOST_AUTO_TEST_CASE( test1 )
 {
   // Check on default values and all set and get functions.
@@ -491,7 +492,8 @@
 
 /*
 
-Using Jake's g() version 22 Jan 2008
+
+6 Feb 2008 Vista MSVC 9
 
 Compiling...
 1d_tests.cpp
@@ -500,7 +502,5 @@
 Autorun "j:\Cpp\SVG\debug\1d_tests.exe"
 Running 1 test case...
 *** No errors detected
-Build Time 0:09
-Build log was saved at "file://j:\Cpp\SVG\1d_tests\Debug\BuildLog.htm"
-
+Build Time 0:10
 */
\ No newline at end of file

Modified: sandbox/SOC/2007/visualization/libs/svg_plot/test/2d_color_consistency.cpp
==============================================================================
--- sandbox/SOC/2007/visualization/libs/svg_plot/test/2d_color_consistency.cpp (original)
+++ sandbox/SOC/2007/visualization/libs/svg_plot/test/2d_color_consistency.cpp 2009-02-06 11:05:41 EST (Fri, 06 Feb 2009)
@@ -9,10 +9,11 @@
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #ifdef _MSC_VER
+# pragma warning(disable : 4996) //
 # pragma warning(disable : 4267) // '=' : conversion from 'size_t' to 'unsigned int' in spirit
 # pragma warning(disable : 4180) // warning C4180: qualifier applied to function type has no meaning; ignored
 # pragma warning(disable : 4172) // warning C4180: qualifier applied to function type has no meaning; ignored
-
+# pragma warning(disable : 4224) // nonstandard extension used : formal parameter 'arg' was previously defined as a type
 // added to boost.test/detail supress_warnings
 //# pragma warning(disable : 4310) // cast truncates constant value
 //# pragma warning(disable : 4512) // assignment operator could not be generated
@@ -35,18 +36,18 @@
 {
         svg_2d_plot my_plot;
 
- BOOST_CHECK_EQUAL(my_plot.title(), "Plot of data");
+ BOOST_CHECK_EQUAL(my_plot.title(), ""); // Default now null string.
   my_plot.title("Plot of my data");
   cout << my_plot.title() << endl;
- BOOST_CHECK_EQUAL(my_plot.title(), "Plot of my data");
+ BOOST_CHECK_EQUAL(my_plot.title(), "Plot of my data");
 
   my_plot.x_range(-1., 1.);
- cout << "x max " << my_plot.x_minimum() << endl;
- cout << "x min " << my_plot.x_maximum() << endl;
+ cout << "x max " << my_plot.x_min() << endl;
+ cout << "x min " << my_plot.x_max() << endl;
 
   // Tests that do NOT apply to 1D.
 
- BOOST_CHECK_EQUAL(my_plot.y_label(), "Y Axis"); // Check default label.
+ BOOST_CHECK_EQUAL(my_plot.y_label(), ""); // Check default label is null.
   my_plot.y_label("Y"); //
          BOOST_CHECK_EQUAL(my_plot.y_label(), "Y"); // & check.
 

Modified: sandbox/SOC/2007/visualization/libs/svg_plot/test/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/visualization/libs/svg_plot/test/Jamfile.v2 (original)
+++ sandbox/SOC/2007/visualization/libs/svg_plot/test/Jamfile.v2 2009-02-06 11:05:41 EST (Fri, 06 Feb 2009)
@@ -1,16 +1,54 @@
-# Copyright 2007 Jake Voytko
-# Distributed under the Boost Software License, Version 1.0. (See
-# accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
+# visualization/libs/svg_plot/test/jamfile.v2
 
-import testing ;
+# SVG Plot Tests using Unit Test Library
 
-#change to BOOST_ROOT
-project
+# Copyright Paul A. Bristow
+
+# From Copyright 2005: Eric Niebler
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+# <define>BOOST_ALL_NO_LIB=1 Not needed?
+
+import testing ; # Bring in rules for testing
+import feature ;
+
+feature.feature iterator_debugging
+ : on off
+ : composite propagated optional
+ ;
+
+feature.compose <iterator_debugging>off
+ : <define>_HAS_ITERATOR_DEBUGGING=0
+ ;
+
+project SVG_Plot
     : requirements
+ <include>$(boost-root)
       <include>../../..
- <include>$BOOST_ROOT
+ <library>$(boost-root)/boost/test//boost_unit_test_framework
+ <link>static
+ <toolset>msvc:<asynch-exceptions>on # Needed for Boost.Test
+ <toolset>msvc:<warnings>all
+ <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
+ <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
+ <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+ <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
+
+ # Warning suppression:
+ <toolset>msvc:<cxxflags>/wd4996 # 'putenv': The POSIX name for this item is deprecated.
+ <toolset>msvc:<cxxflags>/wd4512 # assignment operator could not be generated.
+ <toolset>msvc:<cxxflags>/wd4610 #
+ <toolset>msvc:<cxxflags>/wd4510 #
+ <toolset>msvc:<cxxflags>/wd4224 # nonstandard extension used : formal parameter 'arg' was previously defined as a type.
+ <toolset>msvc:<cxxflags>/wd4127 # expression is constant.
+ <toolset>msvc:<cxxflags>/wd4701 # needed for lexical cast - temporary.
+
+ <toolset>msvc:<iterator_debugging>off
+ <toolset>intel-win:<iterator_debugging>off
     ;
 
-run 1d_color_consistency.cpp ;
-run 2d_color_consistency.cpp ;
+test-suite "SVG Plot"
+ : [ run 1d_tests.cpp ]
+ [ run 1d_color_consistency.cpp ]
+ ;


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk