From 88c0ca84ef4145b7825c53843d039889a145984d Mon Sep 17 00:00:00 2001 From: Alex Chapman Date: Thu, 13 Mar 2008 15:41:51 +1100 Subject: [PATCH] semantic-db: fix a unit test and USE a missing vocab --- extra/semantic-db/hierarchy/hierarchy.factor | 2 +- extra/semantic-db/semantic-db-tests.factor | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/extra/semantic-db/hierarchy/hierarchy.factor b/extra/semantic-db/hierarchy/hierarchy.factor index 7465d67664..be0789ba5e 100644 --- a/extra/semantic-db/hierarchy/hierarchy.factor +++ b/extra/semantic-db/hierarchy/hierarchy.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Alex Chapman ! See http://factorcode.org/license.txt for BSD license. USING: accessors db.tuples hashtables kernel new-slots -semantic-db semantic-db.relations sorting sequences ; +semantic-db semantic-db.relations sequences sequences.deep ; IN: semantic-db.hierarchy TUPLE: tree id children ; diff --git a/extra/semantic-db/semantic-db-tests.factor b/extra/semantic-db/semantic-db-tests.factor index 6c2c4d3e9e..257133c67f 100644 --- a/extra/semantic-db/semantic-db-tests.factor +++ b/extra/semantic-db/semantic-db-tests.factor @@ -1,6 +1,7 @@ -USING: accessors arrays continuations db db.sqlite db.tuples io.files -kernel math namespaces semantic-db semantic-db.context -semantic-db.hierarchy semantic-db.relations sequences tools.test +USING: accessors arrays continuations db db.sqlite +db.tuples io.files kernel math namespaces semantic-db +semantic-db.context semantic-db.hierarchy +semantic-db.relations sequences sorting tools.test tools.walker ; IN: semantic-db.tests @@ -63,7 +64,7 @@ test-db [ [ { "bob" "fran" } ] [ "eve" get children [ node-content ] map ] unit-test [ { "adam" "eve" } ] [ "bob" get parents [ node-content ] map ] unit-test [ "fran" { "charlie" } ] [ "fran" get get-node-hierarchy dup tree-id node-content swap tree-children [ tree-id node-content ] map ] unit-test - [ { "adam" "eve" } ] [ "charlie" get get-root-nodes [ node-content ] map ] unit-test + [ { "adam" "eve" } ] [ "charlie" get get-root-nodes [ node-content ] map natural-sort >array ] unit-test [ { } ] [ "fran" get "charlie" get tuck un-parent-child parents [ node-content ] map ] unit-test ] with-context ] with-db