[jboss-svn-commits] JBL Code SVN: r12180 - in labs/jbossesb/workspace/rearch2/core/src: test/java/org/jboss/soa/esb/domain and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: mark.little at jboss.com
Date: 2007-05-28 12:44:00 -0400 (Mon, 28 May 2007)
New Revision: 12180

Modified:
   labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/domain/Domain.java
   labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/domain/DomainUnitTest.java
Log:


Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/domain/Domain.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/domain/Domain.java	2007-05-28 16:38:55 UTC (rev 12179)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/domain/Domain.java	2007-05-28 16:44:00 UTC (rev 12180)
@@ -48,22 +48,22 @@
 			_status = ACTIVE;
 		}
 		
-		public Object getService ()
+		public final Object getService ()
 		{
 			return _service;
 		}
 		
-		public int status ()
+		public final int status ()
 		{
 			return _status;
 		}
 		
-		public void suspend ()
+		public final void suspend ()
 		{
 			_status = SUSPENDED;
 		}
 		
-		public void resume ()
+		public final void resume ()
 		{
 			_status = ACTIVE;
 		}
@@ -72,7 +72,7 @@
 		private int _status;
 	}
 	
-	public void activateService (Object service, URI name) throws LifecycleException, IllegalStateException
+	public final void activateService (Object service, URI name) throws LifecycleException, IllegalStateException
 	{
 		if ((service == null) || (name == null))
 			throw new IllegalArgumentException();
@@ -90,7 +90,7 @@
 		_objects.put(name, new ServiceManager(service));
 	}
 	
-	public void deactivateService (URI serviceName) throws LifecycleException, IllegalStateException
+	public final void deactivateService (URI serviceName) throws LifecycleException, IllegalStateException
 	{
 		if (serviceName == null)
 			throw new IllegalArgumentException();
@@ -112,7 +112,7 @@
 		}
 	}
 	
-	public void suspendService (URI serviceName) throws LifecycleException, IllegalStateException
+	public final void suspendService (URI serviceName) throws LifecycleException, IllegalStateException
 	{
 		if (serviceName == null)
 			throw new IllegalArgumentException();
@@ -133,7 +133,7 @@
 		wrapper.suspend();
 	}
 	
-	public void resumeService (URI serviceName) throws LifecycleException, IllegalStateException
+	public final void resumeService (URI serviceName) throws LifecycleException, IllegalStateException
 	{
 		if (serviceName == null)
 			throw new IllegalArgumentException();
@@ -149,8 +149,21 @@
 		wrapper.resume();
 	}
 	
-	public URI getName ()
+	public final int getServiceStatus (URI serviceName) throws LifecycleException
 	{
+		if (serviceName == null)
+			throw new IllegalArgumentException();
+		
+		ServiceManager wrapper = _objects.get(serviceName);
+		
+		if (wrapper == null)
+			throw new LifecycleException("No such object.");
+		else
+			return wrapper.status();
+	}
+	
+	public final URI getName ()
+	{
 		return _name;
 	}
 

Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/domain/DomainUnitTest.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/domain/DomainUnitTest.java	2007-05-28 16:38:55 UTC (rev 12179)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/domain/DomainUnitTest.java	2007-05-28 16:44:00 UTC (rev 12180)
@@ -94,4 +94,46 @@
 		{
 		}
 	}
+	
+	public void testDomainBeforeActivation () throws Exception
+	{
+		URI domainName = new URI("urn:domain2");
+		URI serviceName = new URI("urn:service1");
+		
+		DomainManager.getInstance().reset();
+		
+		Domain domain = DomainManager.getInstance().createDomain(domainName);
+		
+		try
+		{
+			domain.activateService(new Object(), serviceName);
+			
+			fail();
+		}
+		catch (Exception ex)
+		{
+		}
+	}
+	
+	public void testDomainAfterActivation () throws Exception
+	{
+		DomainManager.getInstance().reset();
+		
+		URI domainName = new URI("urn:domain2");
+		URI serviceName = new URI("urn:service1");
+		
+		Domain domain = DomainManager.getInstance().createDomain(domainName);
+		
+		assertEquals(domain.status(), Domain.CREATED);
+		
+		domain.activate();
+		
+		assertEquals(domain.status(), Domain.ACTIVE);
+		
+		domain.activateService(new Object(), serviceName);
+		
+		domain.suspend();
+		
+		assertEquals(domain.status(), Domain.SUSPENDED);
+	}
 }