[107485] branches/gsoc13-tests/tests/test/checksums-1

1 Jul 2013

Revision: 107485
          https://trac.macports.org/changeset/107485
Author:   marius@macports.org
Date:     2013-07-01 01:44:24 -0700 (Mon, 01 Jul 2013)
Log Message:
-----------
Merged checksum.tcl and test_checksum.tcl.

Added Paths:
-----------
    branches/gsoc13-tests/tests/test/checksums-1/test.tcl

Removed Paths:
-------------
    branches/gsoc13-tests/tests/test/checksums-1/checksum.tcl
    branches/gsoc13-tests/tests/test/checksums-1/test_checksum.tcl

Deleted: branches/gsoc13-tests/tests/test/checksums-1/checksum.tcl
===================================================================

--- branches/gsoc13-tests/tests/test/checksums-1/checksum.tcl	2013-07-01 08:15:12 UTC (rev 107484)
+++ branches/gsoc13-tests/tests/test/checksums-1/checksum.tcl	2013-07-01 08:44:24 UTC (rev 107485)
@@ -1,32 +0,0 @@
-set autoconf "../../../Mk/macports.autoconf.mk"
-
-source ../library.tcl
-
-proc get_md5 {filename} {
-    set md5 "debug: calculated (md5)"
-
-    set line [get_line $filename $md5]
-    set result [lrange [split $line " "] 4 4]
-
-    return $result
-}
-
-
-proc get_sha {filename} {
-    set sha "debug: calculated (sha1)"
-
-    set line [get_line $filename $sha]
-    set result [lrange [split $line " "] 4 4]
-
-    return $result
-}
-
-
-proc get_rmd {filename} {
-    set sha "debug: calculated (rmd160)"
-
-    set line [get_line $filename $sha]
-    set result [lrange [split $line " "] 4 4]
-
-    return $result
-}

Added: branches/gsoc13-tests/tests/test/checksums-1/test.tcl
===================================================================
--- branches/gsoc13-tests/tests/test/checksums-1/test.tcl	                        (rev 0)
+++ branches/gsoc13-tests/tests/test/checksums-1/test.tcl	2013-07-01 08:44:24 UTC (rev 107485)
@@ -0,0 +1,80 @@
+package require tcltest 2
+namespace import tcltest::*
+
+source [file dirname $argv0]/../library.tcl
+
+set file "output"
+set dir "work"
+set path [file dirname $argv0]
+
+# Useful procs
+proc get_md5 {filename} {
+    global path
+    set md5 "debug: calculated (md5)"
+
+    set line [get_line $path/$filename $md5]
+    set result [lrange [split $line " "] 4 4]
+
+    return $result
+}
+
+
+proc get_sha {filename} {
+    global path
+    set sha "debug: calculated (sha1)"
+
+    set line [get_line $path/$filename $sha]
+    set result [lrange [split $line " "] 4 4]
+
+    return $result
+}
+
+
+proc get_rmd {filename} {
+    global path
+    set sha "debug: calculated (rmd160)"
+
+    set line [get_line $path/$filename $sha]
+    set result [lrange [split $line " "] 4 4]
+
+    return $result
+}
+
+# Initial setup
+load_variables
+port_clean [file dirname $argv0]
+port_run [file dirname $argv0]
+
+# Test cases
+test md5_checksum {
+    Regression test for MD5 Checksum.
+} -constraints {
+    root
+} -body {
+    get_md5 $file
+} -result "d41d8cd98f00b204e9800998ecf8427e"
+
+
+test sha1_checksum {
+    Regression test for SHA1 Checksum.
+} -constraints {
+    root
+} -body {
+    get_sha $file
+} -result "da39a3ee5e6b4b0d3255bfef95601890afd80709"
+
+
+test rmd160_checksum {
+    Regression test for RMD160 Checksum.
+} -constraints {
+    root
+} -body {
+    get_rmd $file
+} -result "9c1185a5c5e9fc54612808977ee8f548b2258d31"
+
+
+# remove output file and print results
+removeFile $file
+removeDirectory $dir
+
+cleanupTests

Deleted: branches/gsoc13-tests/tests/test/checksums-1/test_checksum.tcl
===================================================================
--- branches/gsoc13-tests/tests/test/checksums-1/test_checksum.tcl	2013-07-01 08:15:12 UTC (rev 107484)
+++ branches/gsoc13-tests/tests/test/checksums-1/test_checksum.tcl	2013-07-01 08:44:24 UTC (rev 107485)
@@ -1,46 +0,0 @@
-package require tcltest 2
-namespace import tcltest::*
-
-source ./checksum.tcl
-
-set file "output"
-set dir "work"
-
-# Initial setup
-load_variables
-port_clean
-port_run
-
-
-test md5_checksum {
-    Regression test for MD5 Checksum.
-} -constraints {
-    root
-} -body {
-    get_md5 $file
-} -result "d41d8cd98f00b204e9800998ecf8427e"
-
-
-test sha1_checksum {
-    Regression test for SHA1 Checksum.
-} -constraints {
-    root
-} -body {
-    get_sha $file
-} -result "da39a3ee5e6b4b0d3255bfef95601890afd80709"
-
-
-test rmd160_checksum {
-    Regression test for RMD160 Checksum.
-} -constraints {
-    root
-} -body {
-    get_rmd $file
-} -result "9c1185a5c5e9fc54612808977ee8f548b2258d31"
-
-
-# remove output file and print results
-removeFile $file
-removeDirectory $dir
-
-cleanupTests

    

[107485] branches/gsoc13-tests/tests/test/checksums-1

marius＠macports.org