From 2569285472365527bdedb1208338ec8d309721c2 Mon Sep 17 00:00:00 2001
From: Eli Barzilay <eli@barzilay.org>
Date: Thu, 24 May 2012 11:27:13 -0400
Subject: [PATCH] Streamline more test suits.

original commit: 6260b4c2398829dead24869eb8fcbbcf149576b8
---
 collects/tests/profile/main.rkt    | 110 ++---------------------------
 collects/tests/profile/topsort.rkt |   5 +-
 2 files changed, 7 insertions(+), 108 deletions(-)

diff --git a/collects/tests/profile/main.rkt b/collects/tests/profile/main.rkt
index 27f9397..3ca589c 100644
--- a/collects/tests/profile/main.rkt
+++ b/collects/tests/profile/main.rkt
@@ -1,108 +1,6 @@
-#lang scheme/base
+#lang racket/base
 
-(require tests/eli-tester profile/structs profile/analyzer
-         scheme/match scheme/list "topsort.rkt")
+(require tests/eli-tester "topsort.rkt" "analyze.rkt")
 
-(define A '(A . #f))
-(define B '(B . #f))
-(define C '(C . #f))
-
-(define (analyze cpu+lists)
-  (profile->sexpr
-   (analyze-samples
-    (cons (car cpu+lists)
-          (map (lambda (x) (append (take x 2) (reverse (drop x 2))))
-               (reverse (cdr cpu+lists)))))))
-
-(define (profile->sexpr prof)
-  (define (node-id* node)
-    (or (node-id node) (if (node-src node) '??? '*)))
-  (define (edges->sexprs node get get-time)
-    (for/list ([edge (get node)])
-      `(,(node-id* (edge-caller edge)) -> ,(node-id* (edge-callee edge))
-        time=  ,(get-time edge)
-        total= ,(edge-total edge))))
-  (define (node->sexpr node)
-    `(,(node-id* node)
-          total=   ,(node-total node)
-          self=    ,(node-self node)
-          callers: ,@(edges->sexprs node node-callers edge-caller-time)
-          callees: ,@(edges->sexprs node node-callees edge-callee-time)
-          threads= ,(node-thread-ids node)))
-  `(total=   ,(profile-total-time    prof)
-    samples= ,(profile-sample-number prof)
-    cpu=     ,(profile-cpu-time      prof)
-    thread-times= ,(profile-thread-times prof)
-    ,@(map node->sexpr (cons (profile-*-node prof) (profile-nodes prof)))))
-
-(test
-
- do (topological-sort-tests)
-
- (match (analyze `(10
-                   [0 0 ,A]
-                   [0 1 ,A]))
-   [`(total= 2 samples= 2 cpu= 10 thread-times= ([0 . 2])
-      [* total= 2 self= 0
-         callers: [A -> * time= 2 total= 2]
-         callees: [* -> A time= 2 total= 2]
-         threads= ()]
-      [A total= 2 self= 2
-         callers: [* -> A time= 2 total= 2]
-         callees: [A -> * time= 2 total= 2]
-         threads= (0)])
-    'ok]
-   [bad (error 'test ">>> ~s" bad)])
-
- ;; demonstrates different edge-caller/lee-times
- (match (analyze `(10
-                   [0 0 ,A ,B ,A]
-                   [0 1 ,A ,B ,A]))
-   [`(total= 2 samples= 2 cpu= 10 thread-times= ([0 . 2])
-      [* total= 2 self= 0
-         callers: [A -> * time= 2 total= 2]
-         callees: [* -> A time= 2 total= 2]
-         threads= ()]
-      [A total= 2 self= 2
-         callers: [B -> A time= 2/2 total= 2]
-                  [* -> A time= 2/2 total= 2]
-         callees: [A -> B time= 2/2 total= 2]
-                  [A -> * time= 2/2 total= 2]
-         threads= (0)]
-      [B total= 2 self= 0
-         callers: [A -> B time= 2 total= 2]
-         callees: [B -> A time= 2 total= 2]
-         threads= (0)])
-    'ok]
-   [bad (error 'test ">>> ~s" bad)])
-
- (match (analyze `(10
-                   [0 0 ,A ,B ,A]
-                   [0 1 ,A ,C ,A]
-                   [0 2 ,A ,C ,A]
-                   [0 3 ,A ,C ,A]))
-   [`(total= 4 samples= 4 cpu= 10 thread-times= ([0 . 4])
-      [* total= 4 self= 0
-         callers: [A -> * time= 4 total= 4]
-         callees: [* -> A time= 4 total= 4]
-         threads= ()]
-      [A total= 4 self= 4
-         callers: [* -> A time= 4/2 total= 4]
-                  [C -> A time= 3/2 total= 3]
-                  [B -> A time= 1/2 total= 1]
-         callees: [A -> * time= 4/2 total= 4]
-                  [A -> C time= 3/2 total= 3]
-                  [A -> B time= 1/2 total= 1]
-         threads= (0)]
-      [C total= 3 self= 0
-         callers: [A -> C time= 3 total= 3]
-         callees: [C -> A time= 3 total= 3]
-         threads= (0)]
-      [B total= 1 self= 0
-         callers: [A -> B time= 1 total= 1]
-         callees: [B -> A time= 1 total= 1]
-         threads= (0)])
-    'ok]
-   [bad (error 'test ">>> ~s" bad)])
-
- )
+(test do (topological-sort-tests)
+      do (analyze-tests))
diff --git a/collects/tests/profile/topsort.rkt b/collects/tests/profile/topsort.rkt
index e4f3f79..3420ce8 100644
--- a/collects/tests/profile/topsort.rkt
+++ b/collects/tests/profile/topsort.rkt
@@ -1,7 +1,7 @@
-#lang scheme/base
+#lang racket/base
 
 (require tests/eli-tester profile/structs profile/utils
-         scheme/list scheme/match)
+         racket/list racket/match)
 
 (define arrow-sym->times
   ;; arrows with caller/callee times
@@ -67,6 +67,7 @@
 ;; to see a result: (sort-graph '(* -> A)) (exit)
 
 (provide topological-sort-tests)
+(module+ main (topological-sort-tests))
 (define (topological-sort-tests)
   (test