tc_server.rb in t2-server-0.9.0

- old
+ new

@@ -1,6 +1,6 @@
-# Copyright (c) 2010, 2011 The University of Manchester, UK.
+# Copyright (c) 2010-2012 The University of Manchester, UK.
 #
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -12,11 +12,11 @@
 #    this list of conditions and the following disclaimer in the documentation
 #    and/or other materials provided with the distribution.
 #
 #  * Neither the names of The University of Manchester nor the names of its
 #    contributors may be used to endorse or promote products derived from this
-#    software without specific prior written permission. 
+#    software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
@@ -32,36 +32,38 @@
 
 require 't2-server'
 
 class TestServer < Test::Unit::TestCase
 
-  def test_server
-    # connection
+  def test_server_connection
     assert_nothing_raised(T2Server::ConnectionError) do
-      @server = T2Server::Server.connect($address)
+      T2Server::Server.new($uri, $conn_params)
     end
-    assert_not_nil(@server)
+  end
 
-    # run creation
-    assert_nothing_raised(T2Server::T2ServerError) do
-      @run = @server.create_run($wkf_pass)
+  def test_run_creation_deletion
+    T2Server::Server.new($uri, $conn_params) do |server|
+      assert_nothing_raised(T2Server::T2ServerError) do
+        run = server.create_run($wkf_pass, $creds)
+        server.delete_run(run, $creds)
+      end
     end
+  end
 
-    # capacity
-    limit = @server.run_limit
-    assert_instance_of(Fixnum, limit)
-    assert_raise(T2Server::ServerAtCapacityError) do
-      limit.times do
-        @server.create_run($wkf_pass)
+  # Need to do these together so testing the limit is cleaned up!
+  def test_server_limits_delete_all
+    T2Server::Server.new($uri, $conn_params) do |server|
+      limit = server.run_limit($creds)
+      assert_instance_of(Fixnum, limit)
+      assert_raise(T2Server::ServerAtCapacityError) do
+        # add 1 just in case there are no runs at this point
+        (limit + 1).times do
+          server.create_run($wkf_pass, $creds)
+        end
       end
-    end
-  
-    # deleting
-    assert_nothing_raised(T2Server::T2ServerError) do
-      @run.delete
-    end
 
-    assert_nothing_raised(T2Server::T2ServerError) do
-      @server.delete_all_runs
+      assert_nothing_raised(T2Server::T2ServerError) do
+        server.delete_all_runs($creds)
+      end
     end
   end
 end