aboutsummaryrefslogtreecommitdiffstats
path: root/actionservice/test
diff options
context:
space:
mode:
Diffstat (limited to 'actionservice/test')
-rw-r--r--actionservice/test/abstract_client.rb4
-rw-r--r--actionservice/test/base_test.rb8
-rw-r--r--actionservice/test/client_soap_test.rb2
-rw-r--r--actionservice/test/client_xmlrpc_test.rb2
-rw-r--r--actionservice/test/container_test.rb20
-rw-r--r--actionservice/test/invocation_test.rb4
-rw-r--r--actionservice/test/protocol_soap_test.rb14
-rw-r--r--actionservice/test/protocol_xmlrpc_test.rb8
-rw-r--r--actionservice/test/router_action_controller_test.rb14
-rw-r--r--actionservice/test/router_wsdl_test.rb8
10 files changed, 42 insertions, 42 deletions
diff --git a/actionservice/test/abstract_client.rb b/actionservice/test/abstract_client.rb
index 662bdd9431..70d2d21124 100644
--- a/actionservice/test/abstract_client.rb
+++ b/actionservice/test/abstract_client.rb
@@ -26,7 +26,7 @@ module ClientTest
end
class Container < ActionController::Base
- service_api API
+ web_service_api API
attr :value_void
attr :value_normal
@@ -71,7 +71,7 @@ module ClientTest
end
def dispatch_request(protocol_request)
- dispatch_service_request(protocol_request)
+ dispatch_web_service_request(protocol_request)
end
end
diff --git a/actionservice/test/base_test.rb b/actionservice/test/base_test.rb
index 21456f6c5a..a9fbdd1a8b 100644
--- a/actionservice/test/base_test.rb
+++ b/actionservice/test/base_test.rb
@@ -14,7 +14,7 @@ module BaseTest
end
class Service < ActionService::Base
- service_api API
+ web_service_api API
def add(a, b)
end
@@ -24,7 +24,7 @@ module BaseTest
end
class PristineService < ActionService::Base
- service_api PristineAPI
+ web_service_api PristineAPI
def add
end
@@ -36,7 +36,7 @@ end
class TC_Base < Test::Unit::TestCase
def test_options
- assert(BaseTest::PristineService.service_api.inflect_names == false)
- assert(BaseTest::Service.service_api.inflect_names == true)
+ assert(BaseTest::PristineService.web_service_api.inflect_names == false)
+ assert(BaseTest::Service.web_service_api.inflect_names == true)
end
end
diff --git a/actionservice/test/client_soap_test.rb b/actionservice/test/client_soap_test.rb
index e802812cc1..80fae90543 100644
--- a/actionservice/test/client_soap_test.rb
+++ b/actionservice/test/client_soap_test.rb
@@ -23,7 +23,7 @@ module ClientSoapTest
end
class ClientContainer < ActionController::Base
- client_api :client, :soap, "http://localhost:#{PORT}/client/api", :api => ClientTest::API
+ web_client_api :client, :soap, "http://localhost:#{PORT}/client/api", :api => ClientTest::API
def get_client
client
diff --git a/actionservice/test/client_xmlrpc_test.rb b/actionservice/test/client_xmlrpc_test.rb
index 9c6abc3520..35768adf32 100644
--- a/actionservice/test/client_xmlrpc_test.rb
+++ b/actionservice/test/client_xmlrpc_test.rb
@@ -22,7 +22,7 @@ module ClientXmlRpcTest
end
class ClientContainer < ActionController::Base
- client_api :client, :xmlrpc, "http://localhost:#{PORT}/client/api", :api => ClientTest::API
+ web_client_api :client, :xmlrpc, "http://localhost:#{PORT}/client/api", :api => ClientTest::API
def get_client
client
diff --git a/actionservice/test/container_test.rb b/actionservice/test/container_test.rb
index b222138087..8c66651b64 100644
--- a/actionservice/test/container_test.rb
+++ b/actionservice/test/container_test.rb
@@ -6,7 +6,7 @@ module ContainerTest
$deferred_service = Object.new
class DelegateContainer < ActionController::Base
- service_dispatching_mode :delegated
+ web_service_dispatching_mode :delegated
attr :flag
attr :previous_flag
@@ -16,12 +16,12 @@ module ContainerTest
@flag = true
end
- service :immediate_service, $immediate_service
- service(:deferred_service) { @previous_flag = @flag; @flag = false; $deferred_service }
+ web_service :immediate_service, $immediate_service
+ web_service(:deferred_service) { @previous_flag = @flag; @flag = false; $deferred_service }
end
class DirectContainer < ActionController::Base
- service_dispatching_mode :direct
+ web_service_dispatching_mode :direct
end
end
@@ -32,22 +32,22 @@ class TC_Container < Test::Unit::TestCase
end
def test_registration
- assert(ContainerTest::DelegateContainer.has_service?(:immediate_service))
- assert(ContainerTest::DelegateContainer.has_service?(:deferred_service))
- assert(!ContainerTest::DelegateContainer.has_service?(:fake_service))
+ assert(ContainerTest::DelegateContainer.has_web_service?(:immediate_service))
+ assert(ContainerTest::DelegateContainer.has_web_service?(:deferred_service))
+ assert(!ContainerTest::DelegateContainer.has_web_service?(:fake_service))
end
def test_service_object
assert(@delegate_container.flag == true)
- assert(@delegate_container.service_object(:immediate_service) == $immediate_service)
+ assert(@delegate_container.web_service_object(:immediate_service) == $immediate_service)
assert(@delegate_container.previous_flag.nil?)
assert(@delegate_container.flag == true)
- assert(@delegate_container.service_object(:deferred_service) == $deferred_service)
+ assert(@delegate_container.web_service_object(:deferred_service) == $deferred_service)
assert(@delegate_container.previous_flag == true)
assert(@delegate_container.flag == false)
end
def test_direct_container
- assert(ContainerTest::DirectContainer.service_dispatching_mode == :direct)
+ assert(ContainerTest::DirectContainer.web_service_dispatching_mode == :direct)
end
end
diff --git a/actionservice/test/invocation_test.rb b/actionservice/test/invocation_test.rb
index d8ecdc4e0b..e4c82a35f8 100644
--- a/actionservice/test/invocation_test.rb
+++ b/actionservice/test/invocation_test.rb
@@ -13,7 +13,7 @@ module InvocationTest
end
class Service < ActionService::Base
- service_api API
+ web_service_api API
before_invocation :intercept_before, :except => [:no_before]
after_invocation :intercept_after, :except => [:no_after]
@@ -150,7 +150,7 @@ class TC_Invocation < Test::Unit::TestCase
private
def perform_invocation(method_name, *args, &block)
- public_method_name = @service.class.service_api.public_api_method_name(method_name)
+ public_method_name = @service.class.web_service_api.public_api_method_name(method_name)
args ||= []
request = InvocationRequest.new(ConcreteInvocation, public_method_name, method_name, args)
@service.perform_invocation(request, &block)
diff --git a/actionservice/test/protocol_soap_test.rb b/actionservice/test/protocol_soap_test.rb
index eaccd64e4e..164d06bbd6 100644
--- a/actionservice/test/protocol_soap_test.rb
+++ b/actionservice/test/protocol_soap_test.rb
@@ -23,7 +23,7 @@ module ProtocolSoapTest
end
class Service < ActionService::Base
- service_api API
+ web_service_api API
attr :int
attr :string
@@ -85,18 +85,18 @@ module ProtocolSoapTest
end
def dispatch_request(protocol_request)
- dispatch_service_request(protocol_request)
+ dispatch_web_service_request(protocol_request)
end
end
class DelegatedContainer < AbstractContainer
- service_dispatching_mode :delegated
- service :protocol_soap_service, Service.new
+ web_service_dispatching_mode :delegated
+ web_service :protocol_soap_service, Service.new
end
class DirectContainer < AbstractContainer
- service_api API
- service_dispatching_mode :direct
+ web_service_api API
+ web_service_dispatching_mode :direct
attr :int
attr :string
@@ -207,7 +207,7 @@ class TC_ProtocolSoap < AbstractSoapTest
end
def service
- @container == @direct_container ? @container : @container.service_object(:protocol_soap_service)
+ @container == @direct_container ? @container : @container.web_service_object(:protocol_soap_service)
end
def in_all_containers(&block)
diff --git a/actionservice/test/protocol_xmlrpc_test.rb b/actionservice/test/protocol_xmlrpc_test.rb
index a9cafc0a73..a8a6efc07e 100644
--- a/actionservice/test/protocol_xmlrpc_test.rb
+++ b/actionservice/test/protocol_xmlrpc_test.rb
@@ -35,7 +35,7 @@ module ProtocolXmlRpcTest
end
class Service < ActionService::Base
- service_api API
+ web_service_api API
attr :result
attr :hashvalue
@@ -90,11 +90,11 @@ module ProtocolXmlRpcTest
end
def dispatch_request(protocol_request)
- dispatch_service_request(protocol_request)
+ dispatch_web_service_request(protocol_request)
end
- service :xmlrpc, $service
- service_dispatching_mode :delegated
+ web_service :xmlrpc, $service
+ web_service_dispatching_mode :delegated
end
end
diff --git a/actionservice/test/router_action_controller_test.rb b/actionservice/test/router_action_controller_test.rb
index b541b46542..e26d67c194 100644
--- a/actionservice/test/router_action_controller_test.rb
+++ b/actionservice/test/router_action_controller_test.rb
@@ -7,7 +7,7 @@ module RouterActionControllerTest
end
class Service < ActionService::Base
- service_api API
+ web_service_api API
attr :added
@@ -17,9 +17,9 @@ module RouterActionControllerTest
end
class DelegatedController < ActionController::Base
- service_dispatching_mode :delegated
+ web_service_dispatching_mode :delegated
- service(:test_service) { @service ||= Service.new; @service }
+ web_service(:test_service) { @service ||= Service.new; @service }
end
class DirectAPI < ActionService::API::Base
@@ -30,8 +30,8 @@ module RouterActionControllerTest
end
class DirectController < ActionController::Base
- service_api DirectAPI
- service_dispatching_mode :direct
+ web_service_api DirectAPI
+ web_service_dispatching_mode :direct
before_filter :alwaysfail, :only => [:before_filtered]
after_filter :alwaysok, :only => [:after_filtered]
@@ -116,7 +116,7 @@ class TC_RouterActionController < AbstractSoapTest
exception = result.detail
assert(exception.cause.is_a?(RuntimeError))
assert_equal("Hi, I'm a SOAP exception", exception.cause.message)
- @container.service_exception_reporting = false
+ @container.web_service_exception_reporting = false
assert_raises(SoapTestError) do
do_soap_call('Thrower')
end
@@ -128,7 +128,7 @@ class TC_RouterActionController < AbstractSoapTest
end
def service
- @container.service_object(:test_service)
+ @container.web_service_object(:test_service)
end
def do_soap_call(public_method_name, *args)
diff --git a/actionservice/test/router_wsdl_test.rb b/actionservice/test/router_wsdl_test.rb
index b141d8304b..6812d25579 100644
--- a/actionservice/test/router_wsdl_test.rb
+++ b/actionservice/test/router_wsdl_test.rb
@@ -16,7 +16,7 @@ module RouterWsdlTest
end
class Service < ActionService::Base
- service_api API
+ web_service_api API
def add(a, b)
a + b
@@ -37,7 +37,7 @@ module RouterWsdlTest
end
class DirectController < AbstractController
- service_api API
+ web_service_api API
def add
end
@@ -50,8 +50,8 @@ module RouterWsdlTest
end
class DelegatedController < AbstractController
- service_dispatching_mode :delegated
- service(:test_service) { Service.new }
+ web_service_dispatching_mode :delegated
+ web_service(:test_service) { Service.new }
end
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 17:48:59 +0000