From 77ead806e0cef90f72932aa78f1af45d6afe8c4b Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Mon, 10 Dec 2007 03:46:48 -0500
Subject: [PATCH] Fix store unit tests
---
extra/store/store-tests.factor | 26 ++++++++++----------------
extra/store/store.factor | 2 +-
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/extra/store/store-tests.factor b/extra/store/store-tests.factor
index 97b39bcffd..6f33d66101 100644
--- a/extra/store/store-tests.factor
+++ b/extra/store/store-tests.factor
@@ -4,8 +4,6 @@ IN: temporary
SYMBOL: store
SYMBOL: foo
-SYMBOL: bar
-
: the-store ( -- path )
"store-test.store" resource-path ;
@@ -14,28 +12,24 @@ SYMBOL: bar
[ the-store delete-file ] catch drop ;
: load-the-store ( -- )
- the-store load-store store set ;
+ the-store load-store store set-global ;
: save-the-store ( -- )
- store get save-store ;
+ store save-store ;
delete-the-store
-the-store load-store store set
+load-the-store
-[ f ] [ foo store get store-data at ] unit-test
+[ f ] [ foo store get-persistent ] unit-test
-[ ] [ 100 foo store get store-variable ] unit-test
+USE: prettyprint
+store get-global store-data .
+
+[ ] [ 100 foo store set-persistent ] unit-test
[ ] [ save-the-store ] unit-test
-[ 100 ] [ foo store get store-data at ] unit-test
-
-1000 foo set
-
-[ ] [ save-the-store ] unit-test
-
-[ ] [ load-the-store ] unit-test
-
-[ 1000 ] [ foo store get store-data at ] unit-test
+[ 100 ] [ foo store get-persistent ] unit-test
delete-the-store
+f store set-global
diff --git a/extra/store/store.factor b/extra/store/store.factor
index 639b6d3fab..46b1a09568 100644
--- a/extra/store/store.factor
+++ b/extra/store/store.factor
@@ -27,7 +27,7 @@ C: <store> store
get-global store-data at ;
: set-persistent ( value key store -- )
- get-global [ store-data set-at ] keep save-store ;
+ [ get-global store-data set-at ] keep save-store ;
: init-persistent ( value key store -- )
2dup get-persistent [ 3drop ] [ set-persistent ] if ;