[Modeling-cvs] ProjectModeling/Modeling/tests test_generate_python_code.sh,1.2,1.3

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv12293/Modeling/tests

Modified Files:
	test_generate_python_code.sh 
Log Message:
Refactored to test pymodels as well; now also handles option -v

Index: test_generate_python_code.sh
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/test_generate_python_code.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_generate_python_code.sh	26 May 2003 15:44:49 -0000	1.2
--- test_generate_python_code.sh	9 Jul 2003 11:42:41 -0000	1.3
***************
*** 6,24 ****
  PYTHON=/usr/local/bin/python
  
- function test_AuthorBooks() {
-   $PYTHON ./test_EditingContext_Global.py > /dev/null 2>&1
- }
- 
- function test_StoreEmployees() {
-   $PYTHON ./test_EditingContext_Global_Inheritance.py > /dev/null 2>&1
- }
- 
  tests_dir=`pwd`
  mdl_dir=`dirname $tests_dir`
  export PYTHONPATH=`dirname $mdl_dir`:$PYTHONPATH
  
  ##--------
  ## You should not need to modify anything below this line
  ##--------
  function check_success() {
    if [ $? -ne 0 ]; then
--- 6,53 ----
  PYTHON=/usr/local/bin/python
  
  tests_dir=`pwd`
  mdl_dir=`dirname $tests_dir`
  export PYTHONPATH=`dirname $mdl_dir`:$PYTHONPATH
  
+ models_AuthorBooks=`echo \
+          "testPackages/AuthorBooks.ori/model_AuthorBooks.xml" \
+          "testPackages/AuthorBooks.ori/pymodel_AuthorBooks.py"`
+ 
+ models_StoreEmployees12=`echo "xmlmodels/model_StoreEmployees.xml xmlmodels/model_StoreEmployees2.xml testPackages/StoreEmployees.ori/pymodel_StoreEmployees.py xmlmodels/pymodel_StoreEmployees2.py"`
+ 
+ models_StoreEmployees3=`echo "xmlmodels/model_StoreEmployees3.xml xmlmodels/pymodel_StoreEmployees3.py"`
+ 
  ##--------
  ## You should not need to modify anything below this line
  ##--------
+ argc=$#
+ argv=$*
+ 
+ function execute () {
+   if [ $argc -ge 1 ] && [ ${argv[0]} == "-v"  ]; then
+     $*
+   else
+     $* > /dev/null 2>&1
+   fi
+ }
+ 
+ function test_AuthorBooks() {
+   execute $PYTHON ./test_EditingContext_Global.py
+ }
+ function test_StoreEmployees() {
+   execute $PYTHON ./test_EditingContext_Global_Inheritance.py
+ }
+ function fix_StoreEmployees() {
+   if [ ! -e testPackages/StoreEmployees/Executive.py ]; then
+     echo 'from Employees import Executive' > testPackages/StoreEmployees/Executive.py
+   fi
+   if [ ! -e testPackages/StoreEmployees/SalesClerk.py ]; then
+     echo 'from Employees import SalesClerk' > testPackages/StoreEmployees/SalesClerk.py
+   fi
+   if [ ! -e testPackages/StoreEmployees/Employee.py ]; then
+     echo 'from Employees import Employee' > testPackages/StoreEmployees/Employee.py
+   fi
+ }
+ 
  function check_success() {
    if [ $? -ne 0 ]; then
***************
*** 35,41 ****
    fi
  }
- 
  function generate() { 
!   $PYTHON $GENERATE $* > /dev/null 2>&1 
  }
  
--- 64,69 ----
    fi
  }
  function generate() { 
!   execute $PYTHON $GENERATE $*
  }
  
***************
*** 44,115 ****
  cp -Rp testPackages/StoreEmployees testPackages/StoreEmployees.ori
  
! ######## AuthorBooks / -B
! 
! $RMDIR testPackages/AuthorBooks ;
! generate -B ./xmlmodels/model_AuthorBooks.xml testPackages/
! test_AuthorBooks
! check_success "AuthorBooks / -B"
! 
! ######## AuthorBooks / -C
! 
! $RMDIR testPackages/AuthorBooks
! generate -C ./xmlmodels/model_AuthorBooks.xml testPackages/
! test_AuthorBooks
! check_success "AuthorBooks / -C"
! 
! ######## StoreEmployees / -B / xml
! 
! $RMDIR testPackages/StoreEmployees
! generate -B ./xmlmodels/model_StoreEmployees.xml testPackages/
! test_StoreEmployees
! check_success "StoreEmployees / -B / xml"
! 
! ######## StoreEmployees / -C / xml
! 
! $RMDIR testPackages/StoreEmployees
! generate -C ./xmlmodels/model_StoreEmployees.xml testPackages/
! test_StoreEmployees
! check_success "StoreEmployees / -C / xml"
! 
! ######## StoreEmployees / -B / xml 2 (Executive&SalesClerk in module Employees)
! 
! $RMDIR testPackages/StoreEmployees
! generate -B ./xmlmodels/model_StoreEmployees.xml2 testPackages/
! echo 'from Employees import Executive' > testPackages/StoreEmployees/Executive.py
! echo 'from Employees import SalesClerk' > testPackages/StoreEmployees/SalesClerk.py
! test_StoreEmployees
! check_success "StoreEmployees / -B / xml2"
! 
! # less StoreEmployees/MDL/Employees.py 
  
! ######## StoreEmployees / -C / xml 2
  
- $RMDIR testPackages/StoreEmployees
- generate -C ./xmlmodels/model_StoreEmployees.xml2 testPackages/
- echo 'from Employees import Executive' > testPackages/StoreEmployees/Executive.py
- echo 'from Employees import SalesClerk' > testPackages/StoreEmployees/SalesClerk.py
- test_StoreEmployees
- check_success "StoreEmployees / -C / xml2"
  
  
! ######## StoreEmployees / -C / xml 3
  ########    (Executive+SalesClerk+Employee in module Employees)
! $RMDIR testPackages/StoreEmployees
! generate -C ./xmlmodels/model_StoreEmployees.xml3 testPackages/
! echo 'from Employees import Executive' > testPackages/StoreEmployees/Executive.py
! echo 'from Employees import SalesClerk' > testPackages/StoreEmployees/SalesClerk.py
! echo 'from Employees import Employee' > testPackages/StoreEmployees/Employee.py
! 
! test_StoreEmployees
! check_success "StoreEmployees / -C / xml3"
! 
! ######## StoreEmployees / -B / xml 3
! ######## Should fail!!!
! $RMDIR testPackages/StoreEmployees
! generate -B ./xmlmodels/model_StoreEmployees.xml3 testPackages/
! check_failure "StoreEmployees / -B / xml3"
! 
! # less StoreEmployees/MDL/Employees.py 
  
  
  ## Restore original directories
--- 72,127 ----
  cp -Rp testPackages/StoreEmployees testPackages/StoreEmployees.ori
  
! ######## AuthorBooks
  
! for model in $models_AuthorBooks; do
!   ## -B
!   $RMDIR testPackages/AuthorBooks ;
!   generate -B $model testPackages/
!   test_AuthorBooks
!   check_success "AuthorBooks / -B w/ $model"
!   
!   ## -C
!   $RMDIR testPackages/AuthorBooks
!   generate -C $model testPackages/
!   test_AuthorBooks
!   check_success "AuthorBooks / -C w/ $model"
! done
  
  
+ ######## StoreEmployees / -B / models 1 & 2
+ for model in $models_StoreEmployees12; do
+   ## -B
+   
+   $RMDIR testPackages/StoreEmployees
+   generate -B $model testPackages/
+   fix_StoreEmployees
+   test_StoreEmployees
+   check_success "StoreEmployees / -B w/ $model"
+   
+   ## -C / xml
+   
+   $RMDIR testPackages/StoreEmployees
+   generate -C $model testPackages/
+   fix_StoreEmployees
+   test_StoreEmployees
+   check_success "StoreEmployees / -C w/ $model"
+ done
  
! ######## StoreEmployees / -C / model 3
  ########    (Executive+SalesClerk+Employee in module Employees)
! for model in $models_StoreEmployees3; do
!   ## -C
!   $RMDIR testPackages/StoreEmployees
!   generate -C $model testPackages/
!   fix_StoreEmployees
!   test_StoreEmployees
!   check_success "StoreEmployees / -C w/ $model"
  
+   ## -B / xml 3 : Should fail!!!
+   $RMDIR testPackages/StoreEmployees
+   generate -B $model testPackages/
+   fix_StoreEmployees
+   check_failure "StoreEmployees / -B w/ $model"
+ done
  
  ## Restore original directories