Merge pull request #8 from Conaclos/working

Tests - Update syntax and improve implementation

Author: jvelilla

test/autotest/test_suite/author.e

@@ -1,24 +1,33 @@
-class AUTHOR
+
+class
+	AUTHOR
 
 create
     make
 
 feature {NONE} -- Initialization
 
     make (a_name: STRING_32)
+			-- Create an author with `a_name' as `name'.
         do
             set_name (a_name)
+        ensure
+			name_set: name = a_name
         end
 
 feature -- Access
 
     name: STRING_32
+		-- Author name
 
-feature -- Status setting
+feature -- Change
 
     set_name (a_name: STRING_32)
+			-- Set `name' with `a_name'.
         do
             name := a_name
+        ensure
+			name_set: name = a_name
         end
 
 end -- class AUTHOR

test/autotest/test_suite/book.e

@@ -1,40 +1,60 @@
-class BOOK
+
+class
+	BOOK
 
 create
     make
 
 feature {NONE} -- Initialization
 
-    make (a_title: STRING_32; an_author: AUTHOR; an_isbn: STRING_32)
+    make (a_title: STRING_32; a_author: AUTHOR; a_isbn: STRING_32)
+			-- Create a book with `a_title' as `title',
+			-- `a_author' as `author', and `a_isbn' as `isbn',
         do
             set_title (a_title)
-            set_author (an_author)
-            set_isbn (an_isbn)
+            set_author (a_author)
+            set_isbn (a_isbn)
+        ensure
+			title_set: title = a_title
+			author_set: author = a_author
+			isbn_set: isbn = a_isbn
         end
 
 feature -- Access
 
     title: STRING_32
+			-- Main title.
 
     isbn: STRING_32
+			-- ISBN.
 
     author: AUTHOR
+			-- Author.
 
-feature -- Status setting
+feature -- Change
 
     set_title (a_title: STRING_32)
+			-- Set `title' with `a_title'.
         do
             title := a_title
+        ensure
+			title_set: title = a_title
         end
 
-    set_author (an_author: AUTHOR)
+    set_author (a_author: AUTHOR)
+			-- Set `author' with `a_author'.
         do
-            author := an_author
+            author := a_author
+        ensure
+			author_set: author = a_author
         end
 
-    set_isbn (an_isbn: STRING_32)
+    set_isbn (a_isbn: STRING_32)
+			-- Set `isbn' with `a_isbn'.
         do
-            isbn := an_isbn
+            isbn := a_isbn
+        ensure
+			isbn_set: isbn = a_isbn
         end
 
 end -- class BOOK

test/autotest/test_suite/book_collection.e

@@ -1,80 +1,78 @@
-class BOOK_COLLECTION
+class
+	BOOK_COLLECTION
 
 create
     make
 
 feature {NONE} -- Initialization
 
     make (a_name: STRING_32)
+			-- Create a collection of book with `a_name' as `name'
         do
             set_name (a_name)
             create book_index.make (10)
+        ensure
+			name_set: name = a_name
         end
 
 feature -- Access
 
     name: STRING_32
+			-- Name.
 
     books: LIST [BOOK]
+			-- collection of book.
         do
-            from
-                create {LINKED_LIST [BOOK]} Result.make
-				book_index.start
-            until
-                book_index.after
-            loop
-                Result.append (book_index.item_for_iteration)
-                book_index.forth
+            create {LINKED_LIST [BOOK]} Result.make
+			across book_index as it loop
+				Result.append (it.item)
             end
         end
 
-    books_by_author (an_author: STRING_32): detachable LIST [BOOK]
+    books_by_author (a_author: STRING_32): LIST [BOOK]
+			-- Books wrote by `a_author' in this collection.
         do
-            if book_index.has (an_author) then
-                Result := book_index @ an_author
+            if attached book_index [a_author] as l_result then
+                Result := l_result
             else
                 create {LINKED_LIST [BOOK]} Result.make
             end
         end
 
-feature -- Status setting
+feature -- Change
 
     set_name (a_name: STRING_32)
+			-- Set `name' with `a_name'.
         do
             name := a_name
+        ensure
+			name_set: name = a_name
         end
 
     add_book (a_book: BOOK)
+			-- Extend collection with `a_book'.
         local
             l: detachable LIST [BOOK]
         do
-            if book_index.has (a_book.author.name) then
-                l := book_index.at ( a_book.author.name )
-            else
+            l := book_index.at (a_book.author.name )
+            if l = Void then
                 create {LINKED_LIST [BOOK]} l.make
                 book_index.put (l, a_book.author.name)
             end
-            if attached l as la then
-           	 	la.force (a_book)
-            end
-
+            l.force (a_book)
         end
 
     add_books (book_list: like books)
-
+			-- Append collection with `book_list'.
         do
-            from
-                book_list.start
-            until
-                book_list.after
-            loop
-                add_book (book_list.item)
-                book_list.forth
+            across book_list as it loop
+				add_book (it.item)
             end
         end
 
 feature {NONE} -- Implementation
 
     book_index: HASH_TABLE [LIST [BOOK], STRING_32]
+			-- Association of author name and its books.
 
 end -- class BOOK_COLLECTION

test/autotest/test_suite/json_author_converter.e

@@ -4,7 +4,8 @@ note
     date: "$Date$"
     revision: "$Revision$"
 
-class JSON_AUTHOR_CONVERTER
+class
+	JSON_AUTHOR_CONVERTER
 
 inherit
     JSON_CONVERTER
@@ -29,12 +30,10 @@ feature -- Access
 feature -- Conversion
 
     from_json (j: like to_json): detachable like object
-        local
-            ucs: detachable STRING_32
         do
-            ucs ?= json.object (j.item (name_key), Void)
-            check ucs /= Void end
-            create Result.make (ucs)
+            if attached {STRING_32} json.object (j.item (name_key), Void) as l_name then
+				create Result.make (l_name)
+            end
         end
 
     to_json (o: like object): JSON_OBJECT
@@ -43,9 +42,10 @@ feature -- Conversion
             Result.put (json.value (o.name), name_key)
         end
 
-feature    {NONE} -- Implementation
+feature {NONE} -- Implementation
 
     name_key: JSON_STRING
+			-- Author's name label.
         once
             create Result.make_json ("name")
         end

test/autotest/test_suite/json_book_collection_converter.e

@@ -4,7 +4,8 @@ note
     date: "$Date$"
     revision: "$Revision$"
 
-class JSON_BOOK_COLLECTION_CONVERTER
+class
+	JSON_BOOK_COLLECTION_CONVERTER
 
 inherit
     JSON_CONVERTER
@@ -30,30 +31,32 @@ feature -- Conversion
 
     from_json (j: like to_json): detachable like object
         local
-            ucs: detachable STRING_32
-            ll: LINKED_LIST [BOOK]
-            b: detachable BOOK
-            ja: detachable JSON_ARRAY
-            i: INTEGER
+            l_books: LINKED_LIST [BOOK]
         do
-            ucs ?= json.object (j.item (name_key), Void)
-            check ucs /= Void end
-            create Result.make (ucs)
-            ja ?= j.item (books_key)
-            check ja /= Void end
-            from
-                i := 1
-                create ll.make
-            until
-                i > ja.count
-            loop
-                b ?= json.object (ja [i], "BOOK")
-                check b /= Void end
-                ll.force (b)
-                i := i + 1
+            if
+				attached {STRING_32} json.object (j.item (name_key), Void) as l_name and
+				attached {JSON_ARRAY} j.item (books_key) as l_json_array
+            then
+				create Result.make (l_name)
+				create l_books.make
+
+				across
+					l_json_array as it
+				until
+					Result = Void
+				loop
+					if attached {BOOK} json.object (it.item, "BOOK") as l_book then
+						l_books.extend (l_book)
+					else
+						Result := Void
+							-- Failed
+					end
+				end
+
+				if Result /= Void then
+					Result.add_books (l_books)
+				end
             end
-            check ll /= Void end
-            Result.add_books (ll)
         end
 
     to_json (o: like object): JSON_OBJECT
@@ -66,11 +69,13 @@ feature -- Conversion
 feature    {NONE} -- Implementation
 
     name_key: JSON_STRING
+			-- Collection's name label.
         once
             create Result.make_json ("name")
         end
 
     books_key: JSON_STRING
+			-- Book list label.
         once
             create Result.make_json ("books")
         end

test/autotest/test_suite/json_book_converter.e

@@ -4,7 +4,8 @@ note
     date: "$Date$"
     revision: "$Revision$"
 
-class JSON_BOOK_CONVERTER
+class
+	JSON_BOOK_CONVERTER
 
 inherit
     JSON_CONVERTER
@@ -31,17 +32,14 @@ feature -- Access
 feature -- Conversion
 
     from_json (j: like to_json): detachable like object
-        local
-            ucs1, ucs2: detachable STRING_32
-            a: detachable AUTHOR
         do
-            ucs1 ?= json.object (j.item (title_key), Void)
-            check ucs1 /= Void end
-            ucs2 ?= json.object (j.item (isbn_key), Void)
-            check ucs2 /= Void end
-            a ?= json.object (j.item (author_key), "AUTHOR")
-            check a /= Void end
-            create Result.make (ucs1, a, ucs2)
+            if
+				attached {STRING_32} json.object (j.item (title_key), Void) as l_title and
+				attached {STRING_32} json.object (j.item (isbn_key), Void) as l_isbn and
+				attached {AUTHOR} json.object (j.item (author_key), "AUTHOR") as l_author
+            then
+				create Result.make (l_title, l_author, l_isbn)
+            end
         end
 
     to_json (o: like object): JSON_OBJECT
@@ -52,19 +50,22 @@ feature -- Conversion
             Result.put (json.value (o.author), author_key)
         end
 
-feature    {NONE} -- Implementation
+feature {NONE} -- Implementation
 
     title_key: JSON_STRING
+			-- Book's title label.
         once
             create Result.make_json ("title")
         end
 
     isbn_key: JSON_STRING
+			-- Book ISBN label.
         once
             create Result.make_json ("isbn")
         end
 
     author_key: JSON_STRING
+			-- Author label.
         once
             create Result.make_json ("author")
         end