Use attr->val rather than attr->node Created Removed parts dealing with
2001-02-20 Bradford Hovinen <hovinen@ximian.com> * location.c (compare_xml_nodes): Use attr->val rather than attr->node * tests/test-3.sh: Created * tests/test-2.sh: Removed parts dealing with partial containment
This commit is contained in:
Bradford Hovinen
Bradford Hovinen (Gdict maintainer)
parent
afc3333a5a
commit
737118953b
5 changed files with 260 additions and 73 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2001-02-20 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* location.c (compare_xml_nodes): Use attr->val rather than
|
||||
attr->node
|
||||
|
||||
2001-02-19 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* location.c (location_foreach_backend): Update to use BackendNote
|
||||
|
|
|
|||
|
|
@ -1645,9 +1645,9 @@ compare_xml_nodes (xmlNodePtr node1, xmlNodePtr node2)
|
|||
*/
|
||||
|
||||
for (attr = node1->properties; attr != NULL; attr = attr->next) {
|
||||
g_assert (xmlNodeIsText (attr->node));
|
||||
g_assert (xmlNodeIsText (attr->val));
|
||||
|
||||
if (strcmp (xmlNodeGetContent (attr->node),
|
||||
if (strcmp (xmlNodeGetContent (attr->val),
|
||||
xmlGetProp (node2, attr->name)))
|
||||
return FALSE;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
2001-02-20 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* test-3.sh: Created
|
||||
* test-2.sh: Removed parts dealing with partial containment
|
||||
|
||||
2001-02-19 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* Added test-1.sh and test-2.sh, the first two tests in the test suite
|
||||
|
|
|
|||
|
|
@ -31,8 +31,6 @@
|
|||
# (this should pass the data through to default)
|
||||
# - Adds a backend to the new location (full containment)
|
||||
# - Stores data for that backend in the new location
|
||||
# - Adds a backend to the new location (partial containment)
|
||||
# - Stores data for that backend in the new location
|
||||
|
||||
XIMIAN_ARCHIVER=${XIMIAN_ARCHIVER:-'../ximian-archiver'}
|
||||
|
||||
|
|
@ -151,59 +149,14 @@ EOF
|
|||
run_command $archiver_test_data_file2 \
|
||||
--store --backend=keyboard-properties-capplet
|
||||
|
||||
# Test 4: Adding a backend (partial containment) and storing data that
|
||||
# should be stored in the child location
|
||||
|
||||
archiver_test_data_file3=`get_unused_tmpfile ximian-archiver-test-data`;
|
||||
|
||||
cat >$archiver_test_data_file3 <<EOF
|
||||
<?xml version="1.0"?>
|
||||
<mouse-properties>
|
||||
<acceleration>7</acceleration>
|
||||
<threshold>1</threshold>
|
||||
</mouse-properties>
|
||||
|
||||
EOF
|
||||
|
||||
run_command $archiver_test_data_file3 \
|
||||
--store --backend=mouse-properties-capplet
|
||||
|
||||
run_command /dev/null --add-backend --partial \
|
||||
--backend=mouse-properties-capplet
|
||||
|
||||
archiver_test_data_file4=`get_unused_tmpfile ximian-archiver-test-data`;
|
||||
|
||||
cat >$archiver_test_data_file4 <<EOF
|
||||
<?xml version="1.0"?>
|
||||
<mouse-properties>
|
||||
<acceleration>7</acceleration>
|
||||
<threshold>3</threshold>
|
||||
</mouse-properties>
|
||||
|
||||
EOF
|
||||
|
||||
run_command $archiver_test_data_file4 \
|
||||
--store --backend=mouse-properties-capplet --compare-parent
|
||||
|
||||
# This should be the resulting file:
|
||||
|
||||
archiver_test_data_file4_correct=`get_unused_tmpfile ximian-archiver-check`;
|
||||
|
||||
cat >$archiver_test_data_file4_correct <<EOF
|
||||
<?xml version="1.0"?>
|
||||
<mouse-properties>
|
||||
<threshold>3</threshold>
|
||||
</mouse-properties>
|
||||
EOF
|
||||
|
||||
# Test 5: Retrieve the background properties data previously stored
|
||||
# and compare it with the data we have here to see if everything is ok
|
||||
|
||||
archiver_test_data_file5=`get_unused_tmpfile ximian-archiver-test-data`
|
||||
archiver_test_data_file3=`get_unused_tmpfile ximian-archiver-test-data`
|
||||
|
||||
run_command /dev/null --rollback --show --last \
|
||||
--backend=background-properties-capplet \
|
||||
>$archiver_test_data_file5
|
||||
>$archiver_test_data_file3
|
||||
|
||||
##############################################################################
|
||||
# Results check
|
||||
|
|
@ -225,30 +178,11 @@ else
|
|||
echo "no -- error"
|
||||
fi
|
||||
|
||||
echo -n "Checking whether the XML data match the XML data given..."
|
||||
|
||||
differences_file=`get_unused_tmpfile differences`
|
||||
|
||||
diff -u "$archive_dir/Boston-Office/00000001.xml" \
|
||||
$archiver_test_data_file4_correct \
|
||||
>$differences_file
|
||||
|
||||
if [ ! -s $differences_file ]; then
|
||||
echo "yes -- good"
|
||||
else
|
||||
echo "no -- error"
|
||||
echo "Differences are as follows:"
|
||||
cat $differences_file
|
||||
echo
|
||||
fi
|
||||
|
||||
rm -f $differences_file
|
||||
|
||||
echo -n "Checking whether the XML data retrieved match the XML data given..."
|
||||
|
||||
differences_file=`get_unused_tmpfile differences`
|
||||
|
||||
diff -u $archiver_test_data_file5 $archiver_test_data_file1 >$differences_file
|
||||
diff -u $archiver_test_data_file3 $archiver_test_data_file1 >$differences_file
|
||||
|
||||
if [ ! -s $differences_file ]; then
|
||||
echo "yes -- good"
|
||||
|
|
@ -268,8 +202,6 @@ rm -f $differences_file
|
|||
rm -f $archiver_test_data_file1
|
||||
rm -f $archiver_test_data_file2
|
||||
rm -f $archiver_test_data_file3
|
||||
rm -f $archiver_test_data_file4
|
||||
rm -f $archiver_test_data_file5
|
||||
|
||||
results_dir="ximian-config-results-`date +%Y%m%d`"
|
||||
results_dir=`get_unused_tmpfile $results_dir`
|
||||
|
|
|
|||
245
archiver/tests/test-3.sh
Executable file
245
archiver/tests/test-3.sh
Executable file
|
|
@ -0,0 +1,245 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# test-3.sh
|
||||
# Copyright (C) 2001 Ximian, Inc.
|
||||
# Written by Bradford Hovinen <hovinen@ximian.com>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
# 02111-1307, USA.
|
||||
#
|
||||
# Test suite, part III
|
||||
#
|
||||
# Given an archive to work with (global or per-user):
|
||||
#
|
||||
# - Destroy the entire archive forcibly (rm -rf)
|
||||
# - Create a new location inheriting from the default location
|
||||
# (the default location should be created automatically in this case)
|
||||
# - Sets the new location as the current one
|
||||
# - Stores data for a particular backend, so that it should pass
|
||||
# through to the parent location
|
||||
# - Adds that backend to the new location (partial containment)
|
||||
# - Stores data for that backend in the new location, so that the
|
||||
# nodes should be subtracted
|
||||
# - Retrieves the data for that backend from the new location, so
|
||||
# that the nodes should be merged
|
||||
|
||||
XIMIAN_ARCHIVER=${XIMIAN_ARCHIVER:-'../ximian-archiver'}
|
||||
|
||||
function get_unused_tmpfile () {
|
||||
tmp_file_no=0
|
||||
|
||||
while [ -e "/tmp/$1-$tmp_file_no" ]; do
|
||||
let 'tmp_file_no=tmp_file_no+1'
|
||||
done
|
||||
|
||||
echo "/tmp/$1-$tmp_file_no";
|
||||
}
|
||||
|
||||
function run_command () {
|
||||
input_param=$1
|
||||
shift
|
||||
|
||||
if [ "x$use_gdb" == "xyes" ]; then
|
||||
commands_file=`get_unused_tmpfile gdb-commands-file`
|
||||
echo "set args $extra_args $@ <$input_param" >$commands_file
|
||||
gdb ../.libs/ximian-archiver -x $commands_file
|
||||
rm -f $commands_file
|
||||
else
|
||||
echo "Running archiver program with the following command line:" >&2
|
||||
echo "$XIMIAN_ARCHIVER $extra_args $@ <$input_param" >&2
|
||||
$XIMIAN_ARCHIVER $extra_args $@ <$input_param
|
||||
echo
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "x$1" == "x" ]; then
|
||||
echo "Usage: test-2.sh --global|--per-user [--gdb]"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for test_option; do
|
||||
case "$test_option" in
|
||||
--global)
|
||||
extra_args="--global"
|
||||
archive_dir=/usr/share/ximian-config
|
||||
;;
|
||||
|
||||
--per-user)
|
||||
extra_args=""
|
||||
archive_dir=$HOME/.gnome/ximian-config
|
||||
;;
|
||||
|
||||
--gdb)
|
||||
use_gdb=yes
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "Error -- invalid option: $test_option"
|
||||
exit 1
|
||||
esac
|
||||
done
|
||||
|
||||
if [ -d $archive_dir ]; then
|
||||
mv $archive_dir "$archive_dir-backup"
|
||||
fi
|
||||
|
||||
##############################################################################
|
||||
# Test proper
|
||||
##############################################################################
|
||||
|
||||
run_command /dev/null --add-location --parent=default --location=Boston-Office
|
||||
run_command /dev/null --change-location --location=Boston-Office
|
||||
|
||||
# Test 1: Adding a backend (partial containment) and storing data that
|
||||
# should be stored in the child location
|
||||
#
|
||||
# Note: These are not real data
|
||||
|
||||
archiver_test_data_file1=`get_unused_tmpfile ximian-archiver-test-data`;
|
||||
|
||||
cat >$archiver_test_data_file1 <<EOF
|
||||
<?xml version="1.0"?>
|
||||
<mouse-properties>
|
||||
<acceleration>7</acceleration>
|
||||
<threshold>1</threshold>
|
||||
<fake-node id="1">
|
||||
<another-node>data</another-node>
|
||||
</fake-node>
|
||||
<fake-node id="2">
|
||||
<my-node>blah blah blah</my-node>
|
||||
<another-node>more data</another-node>
|
||||
</fake-node>
|
||||
</mouse-properties>
|
||||
|
||||
EOF
|
||||
|
||||
run_command $archiver_test_data_file1 \
|
||||
--store --backend=mouse-properties-capplet
|
||||
|
||||
run_command /dev/null --add-backend --partial \
|
||||
--backend=mouse-properties-capplet
|
||||
|
||||
archiver_test_data_file2=`get_unused_tmpfile ximian-archiver-test-data`;
|
||||
|
||||
cat >$archiver_test_data_file2 <<EOF
|
||||
<?xml version="1.0"?>
|
||||
<mouse-properties>
|
||||
<acceleration>7</acceleration>
|
||||
<threshold>3</threshold>
|
||||
<fake-node id="1">
|
||||
<another-node>data</another-node>
|
||||
</fake-node>
|
||||
<fake-node id="2">
|
||||
<my-node>blah blah blah</my-node>
|
||||
<another-node>different data</another-node>
|
||||
</fake-node>
|
||||
</mouse-properties>
|
||||
|
||||
EOF
|
||||
|
||||
run_command $archiver_test_data_file2 \
|
||||
--store --backend=mouse-properties-capplet --compare-parent
|
||||
|
||||
# This should be the resulting file:
|
||||
|
||||
archiver_test_data_file2_correct=`get_unused_tmpfile ximian-archiver-check`;
|
||||
|
||||
cat >$archiver_test_data_file2_correct <<EOF
|
||||
<?xml version="1.0"?>
|
||||
<mouse-properties>
|
||||
<threshold>3</threshold>
|
||||
<fake-node id="2">
|
||||
<another-node>different data</another-node>
|
||||
</fake-node>
|
||||
</mouse-properties>
|
||||
EOF
|
||||
|
||||
# Test 2: Retrieve the mouse properties data from the location manager
|
||||
# to see if node merging works properly
|
||||
|
||||
archiver_test_data_file3=`get_unused_tmpfile ximian-archiver-test-data`
|
||||
|
||||
run_command /dev/null --rollback --last --show \
|
||||
--backend=mouse-properties-capplet >$archiver_test_data_file3
|
||||
|
||||
##############################################################################
|
||||
# Results check
|
||||
##############################################################################
|
||||
|
||||
echo -n "Checking whether the XML data match the XML data given..."
|
||||
|
||||
differences_file=`get_unused_tmpfile differences`
|
||||
|
||||
diff -u "$archive_dir/Boston-Office/00000000.xml" \
|
||||
$archiver_test_data_file2_correct \
|
||||
>$differences_file
|
||||
|
||||
if [ ! -s $differences_file ]; then
|
||||
echo "yes -- good"
|
||||
else
|
||||
echo "no -- error"
|
||||
echo "Differences are as follows:"
|
||||
cat $differences_file
|
||||
echo
|
||||
fi
|
||||
|
||||
rm -f $differences_file
|
||||
|
||||
echo -n "Checking whether the XML data retrieved match the XML data given..."
|
||||
|
||||
differences_file=`get_unused_tmpfile differences`
|
||||
|
||||
diff -u $archiver_test_data_file3 $archiver_test_data_file2 >$differences_file
|
||||
|
||||
if [ ! -s $differences_file ]; then
|
||||
echo "yes -- good"
|
||||
else
|
||||
echo "no -- error"
|
||||
echo "Check manually to see whether this is correct. Nodes may be"
|
||||
echo "out of order."
|
||||
echo "File retrieved is as follows:"
|
||||
cat $archiver_test_data_file3
|
||||
echo
|
||||
echo "File is supposed to be as follows:"
|
||||
cat $archiver_test_data_file2
|
||||
echo
|
||||
fi
|
||||
|
||||
rm -f $differences_file
|
||||
|
||||
##############################################################################
|
||||
# Putting the results together
|
||||
##############################################################################
|
||||
|
||||
rm -f $archiver_test_data_file1
|
||||
rm -f $archiver_test_data_file2
|
||||
rm -f $archiver_test_data_file3
|
||||
rm -f $archiver_test_data_file4
|
||||
rm -f $archiver_test_data_file5
|
||||
|
||||
results_dir="ximian-config-results-`date +%Y%m%d`"
|
||||
results_dir=`get_unused_tmpfile $results_dir`
|
||||
mkdir $results_dir
|
||||
|
||||
(cd $archive_dir && tar cf - *) | (cd $results_dir && tar xf -)
|
||||
rm -rf $archive_dir
|
||||
|
||||
if [ -d "$archive_dir-backup" ]; then
|
||||
mv "$archive_dir-backup" $archive_dir
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "Test complete"
|
||||
echo "Resulting archive data in $results_dir"
|
||||
Loading…
Add table
Add a link
Reference in a new issue