Ticket #532: c3.diff

tests/run.scm

@@ -1 @@
-(use tinyclos c3 testeez)
+(use tinyclos c3 test)
 
+(define O <object>)
+(define-class F (O) ())
+(define-class E (O) ())
+(define-class D (O) ())
+(define-class C (D F) ())
+(define-class B (D E) ())
+(define-class A (B C) ())
 
-(testeez
- "c3"
- (test/equal   "Michele Simionato's example 1"
-               (begin
-                 (define O <object>)
-                 (define-class F (O) ())
-                 (define-class E (O) ())
-                 (define-class D (O) ())
-                 (define-class C (D F) ())
-                 (define-class B (D E) ())
-                 (define-class A (B C) ())
-                 (class-cpl A))
-               (list A B C D E F <object> <top>))
- (test/equal   "Michele Simionato's example 2"
-               (begin
-                 (define O <object>)
-                 (define-class F (O) ())
-                 (define-class E (O) ())
-                 (define-class D (O) ())
-                 (define-class C (D F) ())
-                 (define-class B (E D) ())
-                 (define-class A (B C) ())
-                 (class-cpl A))
-               (list A B E C D F <object> <top>))
- (test/equal   "Pedroni's example"
-               (begin
-                 (define O <object>)
-                 (define-class A(O) ())
-                 (define-class B(O) ())
-                 (define-class C(O) ())
-                 (define-class D(O) ())
-                 (define-class E(O) ())
-                 (define-class K1(A B C) ())
-                 (define-class K2(D B E) ())
-                 (define-class K3(D A) ())
-                 (define-class Z(K1 K2 K3) ())
-                 (class-cpl Z))
-               (list Z K1 K2 K3 D A B C E <object> <top>))
-)
- No newline at end of file
+(test-begin "c3")
+
+(test "Michele Simionato's example 1"
+      (list A B C D E F <object> <top>)
+      (class-cpl A))
+
+(define O <object>)
+(define-class F (O) ())
+(define-class E (O) ())
+(define-class D (O) ())
+(define-class C (D F) ())
+(define-class B (E D) ())
+(define-class A (B C) ())
+
+(test "Michele Simionato's example 2"
+      (list A B E C D F <object> <top>)
+      (class-cpl A))
+
+(define O <object>)
+(define-class A(O) ())
+(define-class B(O) ())
+(define-class C(O) ())
+(define-class D(O) ())
+(define-class E(O) ())
+(define-class K1(A B C) ())
+(define-class K2(D B E) ())
+(define-class K3(D A) ())
+(define-class Z(K1 K2 K3) ())
+
+(test "Pedroni's example"
+      (list Z K1 K2 K3 D A B C E <object> <top>)
+      (class-cpl Z))
+
+(test-end)
+
+(test-exit)

c3.meta

@@ -6 +6 @@
  (category oop)
  (license "BSD")
  (doc-from-wiki)
- (test-depends testeez tinyclos)
+ (test-depends test tinyclos)
  (files "c3.setup" "c3.scm")
  (author "Alex Shinn"))