[glom: 4/4] Merge commit 'github/csv-import'

[Michael Hasselmann <mikhas src gnome org>]

commit b3e153fe8c40e424cf06e493b1437ed58a61f9fc
Merge: 93df609... b041532...
Author: Michael Hasselmann <michaelh openismus com>
Date:   Thu Sep 17 19:20:47 2009 +0200

    Merge commit 'github/csv-import'

 ChangeLog                                          |   33 ++++
 Makefile_tests.am                                  |   46 +++--
 glom/glom.glade                                    |  194 ++++++++++---------
 glom/import_csv.cc                                 |    6 +-
 {regression_tests => tests}/.gitignore             |    0
 tests/import/test_parsing.cc                       |  191 +++++++++++++++++++
 tests/import/test_signals.cc                       |  165 +++++++++++++++++
 .../test_load_python_library.cc                    |    0
 {regression_tests => tests}/test_parsing_time.cc   |    0
 {regression_tests => tests}/test_python_module.cc  |    0
 {regression_tests => tests}/test_signal_reemit.cc  |    0
 11 files changed, 525 insertions(+), 110 deletions(-)
---
diff --cc ChangeLog
index c7065ca,cccbbd0..552c203
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,51 -1,16 +1,84 @@@
++2009-09-17  Michael Hasselmann <michaelh openismus com>
++
++Refactoring Dialog_Import_CSV: created testcase for the CsvParser's signal emission
++	
++	* Makefile_tests.am: all tests now run within valgrind by default since mem
++	leaks in testcases are potential mem leaks in the application. Parameters might
++	need tweaking.
++	
++	* glom/import_csv.cc (CsvParser::on_idle_parse): Fixed a missing negation in a
++	conditional, which was wrongfully leading to signal emissions. Found by the
++	import signals testcase.
++	
++	* test/import/test_parsing.cc: Fixed a null byte issue when setting the raw
++	contents of the parser.
++	
++	* test/import/test_signals.cc: This testcase checks the CsvParser's signal
++	emission on varying input. The basic idea was to have on testcase for each
++	code path that leads to a signal emission in glom/import_csv.cc, even if that
++	leads to overlapping code coverage tests with the parser testcase.
++
 +2009-09-17  Johannes Schmid  <jschmid openismus com>
 +
 +	* Makefile_libglom.am: Don't link libglom
 +	statically on maemo. (#594355)
 +
 +2009-09-17  Johannes Schmid  <jschmid openismus com>
 +
 +	* glom/application.cc: offer_new_or_existing():
 +	Replace a TODO comment with g_assert_val_if_reached() because
 +	reaching this branch would mean that the dialog returned
 +	an unhandled response.
 +
 +2009-09-17  Johannes Schmid  <jschmid openismus com>
 +
 +	* regression_tests/test_python_module.cc:
 +	* Makefile_tests.am:
 +	Added a regression test for the loading of the python modules.
 +	Unfortunately this test doesn't trigger the crash bug that
 +	happens on exit() on the maemo platform.
 +
 +2009-09-17  Johannes Schmid  <jschmid openismus com>
 +
 +	* glom/main.cc:
 +	Really check if pygda module is available. A typo caused
 +	the check for the glom module twice while the gda module
 +	wasn't checked at all
 +
 +2009-09-14  Johannes Schmid  <jschmid openismus com>
 +
 +	* glom/dialog_import_csv.cc:
 +	Fixed maemo non-exception build of CsvParser refactoring.
 +
 +2009-09-14  Murray Cumming  <murrayc murrayc com>
 +
 +	Main Window: Correct (again) the order of Records/Found widgets.
 +
 +	* glom/glom.glade: main_window: Put the Records:/Found: widgets in 
 +	sub-hboxes, and change their order by hand in the .glade file because 
 +	GtkBuilder and Glade do not seem to interpret the file in the same way.
 +
 +1.11.2:
 +
 +2009-09-14  Murray Cumming  <murrayc murray com>
 +
 +	* glom/frame_glom.cc:
 +	* glom/utility_widgets/flowtable.cc: Fixed warnings-as-errors build 
 +	problems with the latest gtkmm.
 +
+ 2009-09-11  Michael Hasselmann <michaelh openismus com>
+ 
+ 	Refactoring Glom::Dialog_Import_CSV: first parser tests created
+ 
+ 	* Makefile_tests.am, tests/import.sh,
+ 	tests/import/test_parsing.cc: The first tests for the CsvParser
+ 	are ready. Basic input is tested but no real world examples yet. Run with 'make
+ 	check TESTS=tests/import.sh' to run tests with valgrind.
+ 
+ 	Renamed regression_tests folder to tests
+ 
+ 	* tests, Makefile_tests.am: Changed paths accordingly.
+ 
  2009-09-09  Michael Hasselmann <michaelh openismus com>
  
  	Refactoring Glom::Dialog_Import_CSV
diff --cc Makefile_tests.am
index fdf2424,bce76b8..d2b3bf6
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@@ -22,15 -22,20 +22,21 @@@ check_PROGRAMS =						
  	glom/utility_widgets/test_flowtable			\
  	glom/utility_widgets/egg/toolpalette/testtoolpalette	\
  	glom/test_pyembed					\
- 	regression_tests/test_parsing_time			\
- 	regression_tests/test_signal_reemit			\
- 	regression_tests/test_load_python_library \
- 	regression_tests/test_python_module
+ 	tests/test_parsing_time			\
+ 	tests/test_signal_reemit			\
+ 	tests/test_load_python_library\
++	tests/test_python_module \
+ 	tests/import/test_parsing\
+ 	tests/import/test_signals
  
- TESTS =	regression_tests/test_parsing_time	\
- 	regression_tests/test_signal_reemit	\
- 	regression_tests/test_load_python_library \
- 	regression_tests/test_python_module
+ TESTS =	tests/test_parsing_time	\
+ 	tests/test_signal_reemit	\
+ 	tests/test_load_python_library\
++	tests/test_python_module\
+ 	tests/import/test_parsing\
 -	tests/import/test_signals\
 -	tests/import.sh
++	tests/import/test_signals
+ 
+ TESTS_ENVIRONMENT=which valgrind && valgrind --tool=memcheck --leak-check=full --leak-resolution=high --trace-children=yes --num-callers=30
  
  tests_ldadd = glom/libglom/libglom-$(GLOM_ABI_VERSION).la $(LIBGLOM_LIBS)
  
@@@ -62,7 -75,8 +76,9 @@@ glom_utility_widgets_egg_toolpalette_te
  
  glom_test_pyembed_LDADD = $(LIBGLOM_LIBS) $(PYTHON_LIBS)
  
- regression_tests_test_parsing_time_LDADD = $(tests_ldadd)
- regression_tests_test_signal_reemit_LDADD = $(LIBGLOM_LIBS)
- regression_tests_test_load_python_library_LDADD = $(LIBGLOM_LIBS)
- regression_tests_test_python_module_LDADD = $(LIBGLOM_LIBS) $(PYTHON_LIBS) glom/libglom/libglom-$(GLOM_ABI_VERSION).la
+ tests_test_parsing_time_LDADD = $(tests_ldadd)
+ tests_test_signal_reemit_LDADD = $(LIBGLOM_LIBS)
+ tests_test_load_python_library_LDADD = $(LIBGLOM_LIBS)
++tests_test_python_module_LDADD = $(LIBGLOM_LIBS) $(PYTHON_LIBS) glom/libglom/libglom-$(GLOM_ABI_VERSION).la
+ tests_import_test_parsing_LDADD = $(LIBGLOM_LIBS)
+ tests_import_test_signals_LDADD = $(LIBGLOM_LIBS)
diff --cc tests/test_python_module.cc
index 0240097,0000000..0240097
mode 100644,000000..100644
--- a/tests/test_python_module.cc
+++ b/tests/test_python_module.cc