From: Niels Möller <nisse@lysator.liu.se>
Date: Sun, 29 Sep 2002 21:12:26 +0000 (+0200)
Subject: (test_main): Updated calls to
X-Git-Tag: nettle_1.6_release_20021003~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd229411f23c127dfa7a32dce54466da0d8cc72e;p=thirdparty%2Fnettle.git

(test_main): Updated calls to
sexp_iterator_assoc.

Rev: src/nettle/testsuite/sexp-test.c:1.4
---

diff --git a/testsuite/sexp-test.c b/testsuite/sexp-test.c
index 5b208c0b..1a633a6a 100644
--- a/testsuite/sexp-test.c
+++ b/testsuite/sexp-test.c
@@ -35,12 +35,11 @@ test_main(void)
 	 && i.atom_length == 1 && MEMEQ(1, "x", i.atom));
 
   {
-    struct sexp_assoc_key keys[2] =
-      { { LDATA("n") }, { LDATA("e") } };
+    static const uint8_t *keys[2] = { "n", "e" };
     struct sexp_iterator v[2];
     
     sexp_iterator_init(&i, LDATA("((1:n2:xx3:foo)0:(1:y)(1:e))"));
-    ASSERT(sexp_iterator_next(&i)
+    ASSERT(sexp_iterator_next(&i) && sexp_iterator_enter_list(&i)
 	   && sexp_iterator_assoc(&i, 2, keys, v));
 
     ASSERT(sexp_iterator_next(&v[0]) && v[0].type == SEXP_ATOM
@@ -56,12 +55,13 @@ test_main(void)
     ASSERT(sexp_iterator_next(&v[1]) && v[1].type == SEXP_END);
 
     sexp_iterator_init(&i, LDATA("((1:n))"));
-    ASSERT(sexp_iterator_next(&i)
+    ASSERT(sexp_iterator_next(&i) && sexp_iterator_enter_list(&i)
 	   && !sexp_iterator_assoc(&i, 2, keys, v));
 
     sexp_iterator_init(&i, LDATA("((1:n)(1:n3:foo))"));
-    ASSERT(sexp_iterator_next(&i)
-	   && !sexp_iterator_assoc(&i, 2, keys, v));
+    ASSERT(sexp_iterator_next(&i) && sexp_iterator_enter_list(&i)
+	   && !sexp_iterator_assoc(&i, 2, keys, v));    
   }
+
   SUCCESS();
 }