Imported Upstream version 0.8.2upstream/0.8.2

2 files changed, 10 insertions, 192 deletions

diff --git a/configure b/configure
index 34606d4..dad3d25 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for sugar-datastore 0.8.1.
+# Generated by GNU Autoconf 2.61 for sugar-datastore 0.8.2.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sugar-datastore'
 PACKAGE_TARNAME='sugar-datastore'
-PACKAGE_VERSION='0.8.1'
-PACKAGE_STRING='sugar-datastore 0.8.1'
+PACKAGE_VERSION='0.8.2'
+PACKAGE_STRING='sugar-datastore 0.8.2'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="configure.ac"
@@ -1152,7 +1152,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sugar-datastore 0.8.1 to adapt to many kinds of systems.
+\`configure' configures sugar-datastore 0.8.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1218,7 +1218,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sugar-datastore 0.8.1:";;
+     short | recursive ) echo "Configuration of sugar-datastore 0.8.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1282,7 +1282,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sugar-datastore configure 0.8.1
+sugar-datastore configure 0.8.2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1296,7 +1296,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sugar-datastore $as_me 0.8.1, which was
+It was created by sugar-datastore $as_me 0.8.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1971,7 +1971,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sugar-datastore'
- VERSION='0.8.1'
+ VERSION='0.8.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2681,7 +2681,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sugar-datastore $as_me 0.8.1, which was
+This file was extended by sugar-datastore $as_me 0.8.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2724,7 +2724,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sugar-datastore config.status 0.8.1
+sugar-datastore config.status 0.8.2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/tests/test_sugar.py b/tests/test_sugar.py
deleted file mode 100644
index 39a0e8c..0000000
--- a/tests/test_sugar.py
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright (C) 2007 One Laptop Per Child
-#
-# 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 of the License, 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-""" These tests try to cover how the DS is being used inside Sugar.
-"""
-
-import sys
-import os
-import unittest
-import time
-import tempfile
-import shutil
-from datetime import datetime
-
-import dbus
-
-DS_DBUS_SERVICE = "org.laptop.sugar.DataStore"
-DS_DBUS_INTERFACE = "org.laptop.sugar.DataStore"
-DS_DBUS_PATH = "/org/laptop/sugar/DataStore"
-
-PROPS_WITHOUT_PREVIEW = {'activity_id': '37fa2f4013b17ae7fc6448f10fe5df53ef92de18',
-        'title_set_by_user': '0',
-        'title': 'Write Activity',
-        'timestamp': int(time.time()),
-        'activity': 'org.laptop.AbiWordActivity',
-        'share-scope': 'private',
-        'keep': '0',
-        'icon-color': '#00588C,#00EA11',
-        'mtime': datetime.now().isoformat(),
-        'preview': '',
-        'mime_type': ''}
-
-PROPS_WITH_PREVIEW = {'activity_id': 'e8594bea74faa80539d93ef1a10de3c712bb2eac',
-        'title_set_by_user': '0',
-        'title': 'Write Activity',
-        'share-scope': 'private',
-        'timestamp': int(time.time()),
-        'activity': 'org.laptop.AbiWordActivity',
-        'fulltext': 'mec mac',
-        'keep': '0',
-        'icon-color': '#00588C,#00EA11',
-        'mtime': datetime.now().isoformat(), 
-        'preview': dbus.ByteArray('\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\xd8\x00\x00\x00\xa2\x08\x02\x00\x00\x00\xac\xfb\x94\x1d\x00\x00\x00\x03sBIT\x08\x08\x08\xdb\xe1O\xe0\x00\x00\x03\x1dIDATx\x9c\xed\xd6\xbfJci\x00\xc6\xe1\xc4\xb5Qb\xb0Qa\xfc\xb3\x0cV\xda\xc8,\xa4\xf0^,\xbc;\xef@\x04kA\xb3(\x16b\x97 3("\xc9\x14\'\x13\xc5\x9c\x9cq\x8bmg\xdcj\x93\x17\xf3<\xedw\x8a\xf7\x83\x1f\xe7\x9c\xfa\xd1\xd1\xd1\xc6\xc6F\r\xa6\xe4\xf1\xf1\xf1\xfe\xfe~~{{\xbb\xd5jM{\x0c\xb3\xeb\xe1\xe1\xa1\xddn\xcf\xbf\xf3D\xaf\xd7\xbb\xbd\xbdm4\x1aooo\xbb\xbb\xbb\x97\x97\x97;;;\xa3\xd1\xa8\xd3\xe9\xb4Z\xad\xaa\xaa...\x96\x96\x96\xca\xb2\xdc\xdf\xdf???_[[[^^\xbe\xb9\xb9\xd9\xdb\xdbk6\x9b\x13\xbb\t\x1f\xc0{!\xd6\xeb\xf5n\xb7\xfb\xf4\xf4\xb4\xb0\xb0p}}\xbd\xbe\xbe~rrR\x14\xc5\xc1\xc1AY\x96\x8dF\xe3\xea\xea\xaa\xaa\xaa\xc5\xc5\xc5V\xab\xd5\xe9tNOOWVV\x0e\x0f\x0f\x87\xc3\xe1\xc4.\xc0\xc70\xf7\xce\xd9`0(\xcb\xf2\xc7`\xf0\xbd\xdf\xffsk\xebgU\xfd\xf5\xe5K\xb3\xd9\xfc\xbb\xdd\xfecn\xee\xf9\xf9\xf9\xf5\xf5\xb5(\x8a\xe1pxww\xd7\xef\xf7\x8b\xa2X]]=;;\x9b\xd8z>\x8cz\xbb\xdd\xfe\xed?\xe2\xb7o\xb5\xaf_\x7f}\xf4\xe9S\xed\xf3\xe7\xffo\x16\xb3\xe3\xbf\xff\x11k\x9b\x9b\xb5\xcd\xcdI\xeda\xa6\xbd\xf7i\x86\x89\x11"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!\x12A\x88D\x10"\x11\x84H\x04!2e\xe3\xf1x<\x1e\xcfO{\x06\xb3\xee\xf8\xf8\xb8\xd7\xeby#2e///UU\t\x91\x08B$\x82\x10\x89 D"\x08\x91\x08B$\x82\x10\x89 D"\x08\x91\x08B$\x82\x10\x89 D"\x08\x91\x08B$\x82\x10\x89 D"\x08\x91\x08B$\x82\x10\x89 D"\x08\x91\x08B$\x82\x10\x89 D"\x08\x91\x08B$\x82\x10\x89 D"\x08\x91\x08B$\x82\x10\x89 D"\x08\x91\x08B$\x82\x10\x89 D"\x08\x91\x08B$\x82\x10\x89 D"\x08\x91\x08B$\x82\x10\x89 D"\x08\x91\x08B$\x82\x10\x89 D"\x08\x91\x08B$\x82\x10\x89 D"\x08\x91\x08B$\x82\x10\x89 D"\xccw\xbb\xdd\xd1h4\xed\x19\xcc\xae\x7f\xf3\xfb\x07q8\x9emk8\x97\xda\x00\x00\x00\x00IEND\xaeB`\x82'),
-        'mime_type': 'application/vnd.oasis.opendocument.text'}
-
-class CommonTest(unittest.TestCase):
-
-    def setUp(self):
-        bus = dbus.SessionBus()
-        proxy = bus.get_object(DS_DBUS_SERVICE, DS_DBUS_PATH)
-        self._data_store = dbus.Interface(proxy, DS_DBUS_INTERFACE)
-
-    def create(self):
-        file_path = self._prepare_file()
-        
-        t = time.time()
-        uid = self._data_store.create(PROPS_WITHOUT_PREVIEW, file_path, True)
-        t = time.time() - t
-        return t, uid
-
-    def update(self, uid):
-        file_path = self._prepare_file()
-        t = time.time()
-        self._data_store.update(uid, PROPS_WITH_PREVIEW, file_path, True)
-        t = time.time() - t
-        return t
-
-    def find(self):
-        query = {'order_by': ['-mtime'],
-                 'limit': 80}
-        t = time.time()
-        results, count = self._data_store.find(query, [])
-        t = time.time() - t
-        return t
-
-    def _prepare_file(self):
-        file_path = os.path.join(os.getcwd(), 'tests/funkyabi.odt')
-        f, tmp_path = tempfile.mkstemp()
-        os.close(f)
-        shutil.copyfile(file_path, tmp_path)
-        return tmp_path
-
-class FunctionalityTest(CommonTest):
-
-    def testcreation(self):
-        t, uid = self.create()
-        assert uid
-
-    def testupdate(self):
-        t, uid = self.create()
-        t = self.update(uid)
-
-    def testresume(self):
-        t, uid = self.create()
-        props = self._data_store.get_properties(uid, byte_arrays=True)
-        #del props['uid']
-        assert props == PROPS_WITHOUT_PREVIEW
-
-        t = self.update(uid)
-        props = self._data_store.get_properties(uid, byte_arrays=True)
-        #del props['uid']
-        assert props == PROPS_WITH_PREVIEW
-
-        file_name = self._data_store.get_filename(uid)
-
-        assert os.path.exists(file_name)
-        f = open(file_name, 'r')
-        f.close()
-
-    """
-    def testcustomproperties(self):
-        t, uid = self.create()
-        props = self._data_store.get_properties(uid)
-        props['custom_property'] = 'test'
-        self._data_store.update(uid, props, '', True)
-
-        props = self._data_store.get_properties(uid)
-        assert props['custom_property'] == 'test'
-
-        results, count = self._data_store.find({'custom_property': 'test'}, [])
-        assert count > 1
-        for entry in results:
-            assert entry['custom_property'] == 'test'
-            uid = entry['uid']
-            props = self._data_store.get_properties(uid)
-            assert props['custom_property'] == 'test'
-    """
-
-    def testfind(self):
-        t = self.find()
-
-class PerformanceTest(CommonTest):
-
-    def _avg(self, l):
-        total = 0
-        for i in l:
-            total += i
-        return total / len(l)
-
-    def _test_perf(self, label, function, iterations):    
-        t_max = 0
-        t_min = sys.maxint
-        times = []
-        for i in range(1, iterations):
-            t = function()
-            t_max = max(t, t_max)
-            t_min = min(t, t_min)
-            times.append(t)
-            
-        print '%s max: %.3fms min: %.3fms avg: %.3fms' % \
-                (label, t_max * 1000, t_min * 1000, self._avg(times) * 1000)
-
-    def testperformance(self):
-        iterations = 100
-
-        self._test_perf('Create', lambda: self.create()[0], iterations)
-
-        t, uid = self.create()
-        self._test_perf('Update', lambda: self.update(uid), iterations)
-
-        self._test_perf('Find', lambda: self.find(), iterations)
-
-
-if __name__ == '__main__':
-    suite = unittest.TestSuite()
-    #suite.addTest(unittest.makeSuite(FunctionalityTest))
-    suite.addTest(unittest.makeSuite(PerformanceTest))
-    unittest.TextTestRunner().run(suite)
-