rwdtinker 1.62 → 1.63

data/Readme.txt

@@ -227,6 +227,11 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+Version 1.63
+ changed handling of application name returned
+ added jump seletion options
+ added some unit tests
+
 version 1.62
  improve distro release script
  code cleanup

data/code/01rwdcore/01rwdcore.rb

@@ -17,6 +17,6 @@ class RwdTinker  < RWDialog
 	end
 
 	def inspect
-		"Rwdtinker Application " 
+		"#{$rwdapplicationidentity}" 
 	end
 

data/code/01rwdcore/jumplinkcommand.rb

@@ -3,7 +3,9 @@ JumpLink = Hash.new { |hh, kk| hh[kk] = "ERROR: link not found: #{kk.inspect}.";
     locationlink = {
     :helpscreen=> "runhelpwindow",
     :tinkerbackwindow=>"runrwdtinkerbackwindow",
-    :returntomain=>"returntomain"
+    :returntomain=>"returntomain",
+    :opendocuments=>"runtinkerdocuments",
+    :editconfiguration=>"runeditconfiguration"
     }
     locationlink.each { |kk, vv| JumpLink[kk] = vv }
     
@@ -13,18 +15,12 @@ runjumplocation = "#{JumpLink[:"#{@a_jumplinkinput}"]}"
 
 self.send(runjumplocation)
  
- 
- 
-	
-  end
+   end
 
-	
 
 # list the remote control options on the screen
 def showjumplinkoptions
   
-  
-
 	@jumplinkoptions = $rwdjumplink.rwd_options
 	
 end

data/code/01rwdcore/rundocuments.rb

@@ -0,0 +1,10 @@
+# Application menu orginally (c) 2004 Steven Gibson under GPL. 
+# 
+# For more information about  see http://www.rubyforge.net/projects/rwdapplications
+  
+  # call the window  
+       def runtinkerdocuments
+   @rwd_window = "main"
+   @rwd_tab = "documentsrwdtinkerone"
+   end 
+   

data/code/01rwdcore/runeditconfiguration.rb

@@ -0,0 +1,10 @@
+# Application menu orginally (c) 2004 Steven Gibson under GPL. 
+# 
+# For more information about  see http://www.rubyforge.net/projects/rwdapplications
+  
+  # call the window  
+       def runeditconfiguration
+   @rwd_window = "tinkerbackwindow"
+   @rwd_tab = "editconfigurationfile"
+   end 
+   

data/code/01rwdcore/runhelpabout.rb

@@ -0,0 +1,10 @@
+# Application menu orginally (c) 2004 Steven Gibson under GPL. 
+# 
+# For more information about  see http://www.rubyforge.net/projects/rwdapplications
+  
+  # call the window  
+   def runtinkerhelpabout
+   @rwd_window = "rwdtinkerhelpwindow"
+  
+   end 
+   

data/code/01rwdcore/selectiontab.rb

@@ -0,0 +1,9 @@
+# this code is to return to the window back from the help window
+def runselectiontab
+
+	
+	@rwd_tab = "selectiontab"
+end
+
+
+

data/code/01rwdcore/test_cases.rb

@@ -1,112 +1,106 @@
 # test harness
+
+	
+require 'test/unit/testcase'
+require 'test/unit/assertions'
+include Test::Unit::Assertions
+include Test::Unit  
 def rwdtinker_all_tests 
 	print "in rwdtinker all tests\n"
+  $testrwdtinkertestcase = TestSuite.new
 	test_runrwdtinkerbackwindow
 end
 
 def test_runrwdtinkerbackwindow
 
-	require 'test/unit' 
-	begin
 
+	begin
+  testasserts = 0
+  print "Starting rwdtinker tests!\n"
 		runrwdtinkerbackwindow
-
-		raise NotImplementedError, 'Need to write test_runrwdtinkerbackwindow'
-
-	rescue  NotImplementedError
+    
+    assert_equal("tinkerbackwindow",@rwd_window) ; testasserts += 1 
+     runselectiontab
+     assert_equal("selectiontab",@rwd_tab) ; testasserts += 1
+    showjumplinkoptions
+    @a_jumplinkinput = "returntomain"
+   runjumplinkcommand
+    assert_equal("main",@rwd_window) ; testasserts += 1 
+		@a_jumplinkinput = "helpscreen"
+    runjumplinkcommand 
+    
+     assert_equal("rwdtinkerhelpwindow",@rwd_window)  ; testasserts += 1
+     returntomain
+     assert_equal("main",@rwd_window)  ; testasserts += 1
+     runtinkerdocuments
+     assert_equal("documentsrwdtinkerone",@rwd_tab)  ; testasserts += 1
+     	runrwdtinkerbackwindow
+    
+    assert_equal("tinkerbackwindow",@rwd_window) ; testasserts += 1 
+    @a_installapplet="/usr/src/rwdapplets/rwdtinker/zips/rwdahelloworld-0.5"
+    viewgemappletcontents
+    assert_not_nil(@appletcontentstext)  ; testasserts += 1
+    runrwdtinkerwin2version
+      assert_equal("applicationversion",@rwd_window) ; testasserts += 1 
+        returntomain
+     assert_equal("main",@rwd_window)  ; testasserts += 1
+      	runrwdtinkerbackwindow
+    
+    assert_equal("tinkerbackwindow",@rwd_window) ; testasserts += 1 
+    runremotezipsinstall
+     assert_equal("superantcomremotezipsinstall",@rwd_tab) ; testasserts += 1
+    runeditconfiguration   
+    assert_equal("editconfigurationfile",@rwd_tab) ; testasserts += 1    
+    
+     
+ $stderr.print "tests completed succesfully!\n"
+ $stderr.print testasserts, " asserts performed\n"
+
+	rescue  NotImplementedError, Exception
 		$stderr.print $!
 
 	end
+  
 end
 
 
 
-def test_choosenewhelptopic
+def teststobedown
+ runtinkerhelpabout
+          assert_equal("rwdtinkerhelpwindow",@rwd_tab)  ; testasserts += 1
 	raise NotImplementedError, 'Need to write test_choosenewhelptopic'
-end
-
-
-def test_listinstalledfiles
 	raise NotImplementedError, 'Need to write test_listinstalledfiles'
-end
-
-
-def test_listzipfilestoinstall
 	raise NotImplementedError, 'Need to write test_listzipfilestoinstall'
-end
-
-def test_loadconfigurationrecord
 	raise NotImplementedError, 'Need to write test_loadconfigurationrecord'
-end
-
-def test_loadconfigurationvariables
 	raise NotImplementedError, 'Need to write test_loadconfigurationvariables'
-end
-
 
-
-def test_main
 	raise NotImplementedError, 'Need to write test_main'
-end
 
-def test_network_demon
 	raise NotImplementedError, 'Need to write test_network_demon'
-end
 
-def test_network_start
 	raise NotImplementedError, 'Need to write test_network_start'
-end
 
-def test_openappletname
 	raise NotImplementedError, 'Need to write test_openappletname'
-end
 
-def test_removeapplet
 	raise NotImplementedError, 'Need to write test_removeapplet'
-end
 
-def test_returntomain
 	raise NotImplementedError, 'Need to write test_returntomain'
-end
 
-def test_runcontrolcommand
 	raise NotImplementedError, 'Need to write test_runcontrolcommand'
-end
-
 
-def test_runhelpwindow
 	raise NotImplementedError, 'Need to write test_runhelpwindow'
-end
-
-
 
-
-def test_runrwdtinkerversion
 	raise NotImplementedError, 'Need to write test_runrwdtinkerversion'
-end
 
-def test_runrwdtinkerwin2version
 	raise NotImplementedError, 'Need to write test_runrwdtinkerwin2version'
-end
 
-def test_runviewplatform
 	raise NotImplementedError, 'Need to write test_runviewplatform'
-end
 
-def test_rwdtinkerversiondiagnostic
 	raise NotImplementedError, 'Need to write test_rwdtinkerversiondiagnostic'
-end
 
-def test_rwdwindowreturn
 	raise NotImplementedError, 'Need to write test_rwdwindowreturn'
-end
-
-def test_saveconfigurationrecord
 	raise NotImplementedError, 'Need to write test_saveconfigurationrecord'
-end
-
 
-def test_viewappletcontents
 	raise NotImplementedError, 'Need to write test_viewappletcontents'
 end
 

data/code/01rwdcore/test_harness.rb

@@ -2,6 +2,7 @@
 def rwdtest_harness
 
 	print "in test harness\n"
+  
 	$testharnessarray.each { |x| 
 		print "calling #{x}\n"
 		eval("#{x}")

data/code/superant.com.rwdtinkerbackwindow/runremoteinstall.rb

@@ -0,0 +1,11 @@
+# Application RwdTinker orginally (c) 2004 Steven Gibson under GPL. 
+# This application is a framework for writing programs from RubyWebDialogs
+# For information  see http://www.rubyforge.net/projects/rwdapplications
+
+# call the rwdtinker helpwindow  
+
+def runremotezipsinstall
+	@rwd_window = "tinkerbackwindow"
+	@rwd_tab = "superantcomremotezipsinstall"
+end   
+

data/configuration/rwdapplicationidentity.dist

@@ -1,3 +1,3 @@
-##VERSION:1.62
+##VERSION:1.63
 $rwdapplicationidentity = "rwdtinker main application"
 

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION:1.62
+##VERSION:1.63
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
@@ -11,5 +11,5 @@ LangDir = "lang"
   $prevouswindow ="main" 
    $rwdcontrolports =["13713","13714","13715","13716","13717","13718"]
  $port = 7705
-$rwdjumplink = ["helpscreen","tinkerbackwindow","returntomain"]
-RwdTinkerVersion = "1.62"
+$rwdjumplink = ["helpscreen","tinkerbackwindow","returntomain","opendocuments","editconfiguration"]
+RwdTinkerVersion = "1.63"

data/configuration/tinkerwin2variables.dist

@@ -1,4 +1,4 @@
-##VERSION:1.62
+##VERSION:1.63
 TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
 ##NAME:$zipslocation:0
 $zipslocation = "zips" # location of applets to add

data/rwd_files/HowTo_Tinker.txt

@@ -227,6 +227,11 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+Version 1.63
+ changed handling of application name returned
+ added jump seletion options
+ added some unit tests
+
 version 1.62
  improve distro release script
  code cleanup

data/rwdconfig.dist

@@ -1,4 +1,4 @@
-##VERSION:1.62
+##VERSION:1.63
 # rwdtinker core configuration file
 ##NAME: ConfigLocation:0
 ConfigLocation=""
@@ -7,4 +7,6 @@ ConfigLocation=""
 ##NAME:$testharnessarray:0
 $testharnessarray = ["rwdtinker_all_tests"]
 ##NAME:TestNow:0
-TestNow=false
+TestNow=false  # turning this on will run the unit tests
+##NAME:$testharness:0
+$testharness=true

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: rwdtinker
 version: !ruby/object:Gem::Version 
-  version: "1.62"
-date: 2005-03-30
+  version: "1.63"
+date: 2005-04-03
 summary: rwdtinker application is a framework to program for RubyWebDialogs.
 require_paths: 
   - "."
@@ -39,6 +39,10 @@ files:
   - code/01rwdcore/test_cases.rb
   - code/01rwdcore/test_harness.rb
   - code/01rwdcore/jumplinkcommand.rb
+  - code/01rwdcore/selectiontab.rb
+  - code/01rwdcore/rundocuments.rb
+  - code/01rwdcore/runhelpabout.rb
+  - code/01rwdcore/runeditconfiguration.rb
   - code/dd0viewphoto/dd0viewphoto.rb
   - code/superant.com.rwdtinkerbackwindow/controlclient.rb
   - code/superant.com.rwdtinkerbackwindow/diagnostictab.rb
@@ -62,6 +66,7 @@ files:
   - code/superant.com.rwdtinkerbackwindow/remotegemlist.rb
   - code/superant.com.rwdtinkerbackwindow/installremotegem.rb
   - code/superant.com.rwdtinkerbackwindow/listgemzips.rb
+  - code/superant.com.rwdtinkerbackwindow/runremoteinstall.rb
   - code/zz0applicationend/zz0end.rb
   - configuration/tinkerwin2variables.dist
   - configuration/rwdtinker.dist
@@ -136,8 +141,6 @@ files:
   - rwd_files/rwdindex.html
   - rwd_files/tinker.png
   - zips/rwdahelloworld-0.5.zip
-  - tests/rwdtinkertestEN.rb
-  - tests/test.result
   - tests/totranslate.lang
   - tests/cleancnf.sh
   - tests/rdep.rb

data/tests/rwdtinkertestEN.rb

@@ -1,163 +0,0 @@
-#-------------------------------------------------------------------------------------------------------------#
-# test with the WATIR controller                                                              
-#                                                                                                                  
-#  Simple  test based on Google/watir demo                                               
-# 
-#------------------------------------------------------------------------------------------------------------ #
-
-#includes
-require '../watir'   # the controller
-
-#test::unit includes
-require 'test/unit' 
-require 'test/unit/ui/console/testrunner'
-require '../unittests/testUnitAddons'
-
-#code to set your current path in Windows
-$myDir = File.dirname(__FILE__)
-$LOAD_PATH << $myDir
-
-class TC_rwdtinker_suite < Test::Unit::TestCase
-
-
-
- def test_a_Open1
-  #--------------------------------------------------------
-  # test case that shows basic WATIR functionality:
-  #   * enter text in a field
-  #   * click a button
-  #
-
-   #variables
-   testSite = 'http://localhost:7705'
-
-   #open the IE browser
-   $ie = IE.new
-
-   puts '## Beginning of test: rwdtinker'
-   puts '  '
-  
-
-      $ie.goto(testSite)
-   puts '  Action: entered ' + testSite + 'in the address bar.'
-   sleep 1
-     
-   $ie.link(:url, 'javascript:document.bodyform.rwd_action.value="rwd_help";document.bodyform.submit();').click
-
-   $ie.button(:caption, 'Click for Version').click
-  
-   $ie.button(:caption, 'Cancel').click
-  
-
-
-   sleep 1
-   $ie.link(:url, 'javascript:document.bodyform.rwd_action.value="rwd_tab_selectiontab";document.bodyform.submit();').click
-   
-
-  
-  $ie.button(:caption, 'RwdTinker Help Window').click
-    puts '  Action: clicked the Help Window  link'
-
-end   
-
- def test_b_Buttons1
-
-
- sleep 1
-   $ie.link(:url, 'javascript:document.bodyform.rwd_action.value="rwd_tab_nexttab";document.bodyform.submit();').click
-   puts '  Action: clicked the nexttab link'
-
-  
-   $ie.link(:url, 'javascript:document.bodyform.rwd_action.value="rwd_tab_main";document.bodyform.submit();').click
-   puts '  Action: clicked the main tab link'
-
-
-  $ie.button(:caption, "Cancel").click
-    puts '  Action: clicked the cancel button'
-
-
-
-end
-
-def test_c_tabs
-
- $ie.link(:url, 'javascript:document.bodyform.rwd_action.value="rwd_tab_one";document.bodyform.submit();').click
-  puts '  Action:  clicked tab one'
-
-  
-end
-
-def test_d_tabs
-
-   $ie.link(:url, 'javascript:document.bodyform.rwd_action.value="rwd_tab_selectiontab";document.bodyform.submit();').click
-   puts '  Action: clicked the selectiontab'
-
-
-  $ie.button(:caption, 'RwdTinker Back Window').click
-    puts '  Action: clicked the Help Window  link'
-
- $ie.link(:url, 'javascript:document.bodyform.rwd_action.value="rwd_tab_backone";document.bodyform.submit();').click
-   puts '  Action: clicked the backone tab'
-  
-    
-   assert($ie.pageContainsText("previous window") )
- 
- $ie.link(:url, 'javascript:document.bodyform.rwd_action.value="rwd_tab_diagnostictab";document.bodyform.submit();').click
-   puts '  Action: clicked the diagnostictab top link'
-
-
-   $ie.button(:caption, "View Ruby Version").click
-   puts '  Action: clicked  Ruby Version button.'
-
-   assert($ie.pageContainsText("Version") )
-
-$ie.button(:caption, "view platform").click
-   puts '  Action: clicked platform button.'
-
-assert($ie.pageContainsText("Platform is") )
-
-   $ie.button(:caption, "View rwdtinker Version").click
-   puts '  Action: clicked  rwdtinker version button.'
-
-   assert($ie.pageContainsText("rwdtinker version") )
-    
-end  # end of test_d
-
-def test_e_tabs
- 
-
- $ie.link(:url, 'javascript:document.bodyform.rwd_action.value="rwd_tab_filelister";document.bodyform.submit();').click
-   
- 
-   assert($ie.pageContainsText("View the list") )
- 
-   $ie.button(:caption, "List Files").click
-   puts '  Action: clicked the list files button.'
-
-  $ie.link(:url, 'javascript:document.bodyform.rwd_action.value="fillappletname/rwdviewlogo-0.4.inf";document.bodyform.submit();').click
-
- 
-   $ie.button(:caption, "View Install Text").click
-   puts '  Action: clicked the View Install Text button.'
-
-assert($ie.pageContainsText("rwdviewlogo") )
- 
- 
- end
-
-def test_f_tabs
-
-	$ie.link(:url, 'javascript:document.bodyform.rwd_action.value="rwd_tab_zipslister";document.bodyform.submit();').click
-
-	 assert($ie.pageContainsText("File Name") )
- 
-	assert($ie.pageContainsText("view the list of zip files") )
-
- $ie.button(:caption, "List applets available for installing").click
-   puts '  Action: clicked the List applets available for installing button.'
-
-  $ie.link(:url, 'javascript:document.bodyform.rwd_action.value="fillziptoinstallname/rwdhelloworld-0.3.zip";document.bodyform.submit();').click
-
- end
-
-end  #end of class TC_google_suite

data/tests/test.result

@@ -1,32 +0,0 @@
-Loaded suite C:/ruby/sample/watir/examples/rwdtinkertestEN
-Started
-## Beginning of test: rwdtinker
-
-  Action: entered http://localhost:7705in the address bar.
-  Action: clicked the Help Window  link
-  Action: clicked the nexttab link
-  Action: clicked the main tab link
-  Action: clicked the cancel button
-  Action:  clicked tab one
-  Action: clicked the selectiontab
-  Action: clicked the Help Window  link
-  Action: clicked the backone tab
-pageContainsText: Looking for: previous window (string) - found it ok
-  Action: clicked the diagnostictab top link
-  Action: clicked  Ruby Version button.
-pageContainsText: Looking for: Version (string) - found it ok
-  Action: clicked platform button.
-pageContainsText: Looking for: Platform is (string) - found it ok
-  Action: clicked  rwdtinker version button.
-pageContainsText: Looking for: rwdtinker version (string) - found it ok
-pageContainsText: Looking for: View the list (string) - found it ok
-  Action: clicked the list files button.
-  Action: clicked the View Install Text button.
-pageContainsText: Looking for: rwdviewlogo (string) - found it ok
-pageContainsText: Looking for: File Name (string) - found it ok
-pageContainsText: Looking for: view the list of zip files (string) - found it ok
- Action: clicked the List applets available for installing button.
-
-Finished in 32.716 seconds.
-
-6 tests, 8 assertions, 0 failures, 0 errors