Changeset 6127 for branches/1.5/gui/test

Timestamp:

Mar 15, 2016 2:56:40 PM (8 years ago)

Author:

ldelgass

Message:

Merge r6052:6053,r6066:6069,r6080 from trunk

Location:

branches/1.5

Files:

• . (modified) (1 prop)
• gui/test/gauge.test (modified) (2 diffs)
• gui/test/vtkisosurfaceviewer.test (modified) (4 diffs)

branches/1.5/gui/test/gauge.test

@@ -61 +61 @@
 } -result {4}
 
-test gauge.value.4 {value command, just -check flag, value is returned} \
+test gauge.value.4 {value command, just -check flag, error is returned} \
 -setup {
     set w [Rappture::Gauge .#auto]
@@ -69 +69 @@
     destroy $w
     catch {unset w}
-} -result {0}
+} -returnCodes {
+    error
+} -result {wrong # args: should be "value ?-check? ?newval?"}
 
-test gauge.value.5 {value command, invalid flag, return error} \
+test gauge.value.5 {value command, -check flag, orig value is unchanged} \
+-setup {
+    set w [Rappture::Gauge .#auto]
+    $w value 2
+} -body  {
+    $w value -check 4
+    $w value
+} -cleanup {
+    destroy $w
+    catch {unset w}
+} -result {2}
+
+test gauge.value.6 {value command, invalid flag, return error} \
 -setup {
     set w [Rappture::Gauge .#auto]
 } -body  {
-    list [catch {$w value -chcek} msg] $msg
+    $w value -chcek
 } -cleanup {
     destroy $w
     catch {unset w}
-} -result {1 {bad value "-chcek": should be a real number}}
+} -returnCodes {
+    error
+} -result {bad value "-chcek": should be a real number}
 
 ::tcltest::cleanupTests

branches/1.5/gui/test/vtkisosurfaceviewer.test

@@ -1 +1 @@
 # Commands covered:
-# Rappture::Gauge
-# Rappture::Gauge::value
+# Rappture::VtkIsosurfaceViewer
 #
 # This file contains a collection of tests for one of the Rappture Tcl
@@ -8 +7 @@
 #
 # ======================================================================
-# AUTHOR:  Derrick Kearney, Purdue University
-# Copyright (c) 2004-2012  HUBzero Foundation, LLC
+# AUTHORS:
+#   Derrick Kearney, Purdue University
+#   Leif Delgass, Purdue University
+# Copyright (c) 2004-2016  HUBzero Foundation, LLC
 #
 # See the file "license.terms" for information on usage and redistribution
@@ -17 +18 @@
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
+    package require Rappture
     package require RapptureGUI
     namespace import -force ::tcltest::*
 }
 
-set servers [Rappture::VisViewer::GetServerList "vtkvis"]
-
-Rappture::VtkIsosurfaceViewer .#auto $servers
+Rappture::resources::load
 
 #----------------------------------------------------------
@@ -31 +31 @@
 # Rappture::VtkIsosurfaceViewer <name> <servers>
 #----------------------------------------------------------
-test vtkisosurfaceviewer.constructor.1 {
-    value command, 0 args, missing server list error
+test vtkisosurfaceviewer.constructor.0 {
+    constructor, 0 args, auto named
 } -setup {
 } -body  {
-    list [catch {Rappture::VtkIsosurfaceViewer .#auto} msg] $msg
+    Rappture::VtkIsosurfaceViewer .#auto
 } -cleanup {
-} -result {1 {wrong # args: should be "::Rappture::VtkIsosurfaceViewer .vtkIsosurfaceViewer1 hostlist ?arg arg ...?"}}
+} -match glob \
+-result {.vtkIsosurfaceViewer*} \
+-errorOutput {connecting to *:2010...
+Render server is VtkVis * (build *)
+}
+
+test vtkisosurfaceviewer.constructor.1 {
+    constructor, 0 args, explicit name
+} -setup {
+} -body  {
+    Rappture::VtkIsosurfaceViewer .foo
+} -cleanup {
+} -match glob \
+-result {.foo} \
+-errorOutput {connecting to *:2010...
+Render server is VtkVis * (build *)
+}
 
 test vtkisosurfaceviewer.constructor.2 {
-    value command, 1 args empty hostlist, empty hostlist uses visviewer defaults
+    value command, auto name, -plotbackground option
 } -setup {
 } -body  {
-    catch {Rappture::VtkIsosurfaceViewer .#auto {}} msg
+    Rappture::VtkIsosurfaceViewer .#auto -plotbackground red
 } -cleanup {
-} -result {0}
+} -match glob \
+-result {.vtkIsosurfaceViewer*} \
+-errorOutput {connecting to *:2010...
+Render server is VtkVis * (build *)
+}
 
 test vtkisosurfaceviewer.constructor.3 {
-    value command, 1 args valid hostlist
+    value command, bad option
 } -setup {
 } -body  {
-    catch {Rappture::VtkIsosurfaceViewer .#auto $servers} msg
+    Rappture::VtkIsosurfaceViewer .#auto -nonexistent foo
 } -cleanup {
-} -result {0}
-
-#test vtkisosurfaceviewer.constructor.5 {
-#    value command, 1 args valid hostlist
-#} -setup {
-#} -body  {
-#    set w [Rappture::VtkIsosurfaceViewer .#auto $servers]
-#} -cleanup {
-#    destroy $w
-#    catch {unset w}
-#} -result {}
+} -returnCodes {
+    error
+} -result {unknown option "-nonexistent"}
 
 ::tcltest::cleanupTests