hlship 2005/04/04 08:20:38
Modified: framework/src/test/org/apache/hivemind/impl TestModule.java
TestRegistryInfrastructureConstructor.java
TestErrorHandler.java TestSymbolExpander.java
TestMessageFinder.java TestServicePoint.java
TestVisibility.java
library/src/test/org/apache/hivemind/lib/factory
TestBeanFactoryObjectProvider.java
framework/src/test/hivemind/test/services
TestEventLinker.java TestBuilderFactory.java
framework/src/test/org/apache/hivemind/service/impl
TestBuilderFactory.java TestObjectProviders.java
framework/src/test/hivemind/test/rules
TestEnumerationTranslator.java
TestInstanceTranslator.java
TestSmartTranslator.java
framework/src/java/org/apache/hivemind/test
HiveMindTestCase.java
framework/src/test/org/apache/hivemind/util
TestInstanceCreationUtils.java
framework/src/test/hivemind/test FrameworkTestCase.java
TestMisc.java
framework/src/test/org/apache/hivemind
TestApplicationRuntimeException.java
framework/src/test/org/apache/hivemind/conditional
TestEvaluationContext.java
framework/src/test/hivemind/test/parse
TestModuleDescriptor.java
. status.xml
framework/src/test/org/apache/hivemind/schema/rules
TestCreateObjectRule.java
framework/src/test/org/apache/hivemind/parse
TestXmlResourceProcessor.java
library/src/test/org/apache/hivemind/lib/groovy
TestGroovyModuleDescriptorProvider.java
TestHiveMindBuilder.java
library/src/test/org/apache/hivemind/lib/impl
TestServicePropertyFactory.java
library/src/test/org/apache/hivemind/lib/strategy
TestStrategyFactory.java
Log:
Added newLocation() method to HiveMindTestCase.
Revision Changes Path
1.5 +5 -3
jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestModule.java
Index: TestModule.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestModule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestModule.java 10 Feb 2005 01:04:32 -0000 1.4
+++ TestModule.java 4 Apr 2005 15:20:37 -0000 1.5
@@ -58,7 +58,7 @@
{
ModuleImpl module = new ModuleImpl();
module.setPackageName("org.apache.hivemind");
- module.setClassResolver(new DefaultClassResolver());
+ module.setClassResolver(getClassResolver());
assertSame(Locatable.class,
module.resolveType("org.apache.hivemind.Locatable"));
assertSame(ErrorLog.class, module.resolveType("ErrorLog"));
@@ -69,7 +69,7 @@
{
ModuleImpl module = new ModuleImpl();
module.setPackageName("org.apache.hivemind.order");
- module.setClassResolver(new DefaultClassResolver());
+ module.setClassResolver(getClassResolver());
try
{
@@ -78,7 +78,9 @@
}
catch (ApplicationRuntimeException ex)
{
- assertEquals("Unable to convert type 'Qbert' to a Java class,
either as is, or in package org.apache.hivemind.order.", ex.getMessage());
+ assertEquals(
+ "Unable to convert type 'Qbert' to a Java class, either
as is, or in package org.apache.hivemind.order.",
+ ex.getMessage());
}
}
}
\ No newline at end of file
1.6 +6 -6
jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructureConstructor.java
Index: TestRegistryInfrastructureConstructor.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructureConstructor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestRegistryInfrastructureConstructor.java 10 Feb 2005 01:04:32
-0000 1.5
+++ TestRegistryInfrastructureConstructor.java 4 Apr 2005 15:20:37
-0000 1.6
@@ -87,7 +87,7 @@
schema.setId("Baz");
schema.setVisibility(Visibility.PRIVATE);
- Location l = fabricateLocation(13);
+ Location l = newLocation();
eh.error(log, ImplMessages.schemaNotVisible("foo.bar.Baz",
"zip.zoop"), l, null);
@@ -125,7 +125,7 @@
Log log =
LogFactory.getLog(TestRegistryInfrastructureConstructor.class);
- Location l = fabricateLocation(13);
+ Location l = newLocation();
eh.error(log, ImplMessages.unableToResolveSchema("foo.bar.Baz"), l,
null);
@@ -168,7 +168,7 @@
replayControls();
- ModuleDescriptor md = new ModuleDescriptor(new
DefaultClassResolver(), eh);
+ ModuleDescriptor md = new ModuleDescriptor(getClassResolver(), eh);
md.setModuleId("zip.zoop");
ConfigurationPointDescriptor cpd = new
ConfigurationPointDescriptor();
@@ -209,7 +209,7 @@
replayControls();
- ModuleDescriptor md = new ModuleDescriptor(new
DefaultClassResolver(), eh);
+ ModuleDescriptor md = new ModuleDescriptor(getClassResolver(), eh);
md.setModuleId("zip.zoop");
ConfigurationPointDescriptor cpd = new
ConfigurationPointDescriptor();
@@ -246,7 +246,7 @@
Log log =
LogFactory.getLog(TestRegistryInfrastructureConstructor.class);
- Location location = fabricateLocation(1);
+ Location location = newLocation();
eh.error(
log,
@@ -258,7 +258,7 @@
replayControls();
- ModuleDescriptor md = new ModuleDescriptor(new
DefaultClassResolver(), eh);
+ ModuleDescriptor md = new ModuleDescriptor(getClassResolver(), eh);
md.setModuleId("zip.zoop");
ConfigurationPointDescriptor cpd = new
ConfigurationPointDescriptor();
1.6 +2 -2
jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestErrorHandler.java
Index: TestErrorHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestErrorHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestErrorHandler.java 5 Jan 2005 18:04:51 -0000 1.5
+++ TestErrorHandler.java 4 Apr 2005 15:20:37 -0000 1.6
@@ -34,7 +34,7 @@
{
Log log = (Log) newMock(Log.class);
- Resource r = new ClasspathResource(new DefaultClassResolver(),
"/foo/bar/Baz.module");
+ Resource r = new ClasspathResource(getClassResolver(),
"/foo/bar/Baz.module");
Location l = new LocationImpl(r, 13);
Throwable ex = new IllegalArgumentException();
@@ -88,7 +88,7 @@
{
ErrorHandler eh = new StrictErrorHandler();
Throwable cause = new NullPointerException();
- Location l = fabricateLocation(21);
+ Location l = newLocation();
try
{
1.3 +1 -1
jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestSymbolExpander.java
Index: TestSymbolExpander.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestSymbolExpander.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestSymbolExpander.java 6 Jan 2005 01:45:16 -0000 1.2
+++ TestSymbolExpander.java 4 Apr 2005 15:20:37 -0000 1.3
@@ -84,7 +84,7 @@
public void testMissingSymbol()
{
ErrorHandler eh = (ErrorHandler) newMock(ErrorHandler.class);
- Location l = fabricateLocation(2828);
+ Location l = newLocation();
MockControl control = newControl(SymbolSource.class);
SymbolSource source = (SymbolSource) control.getMock();
1.2 +1 -1
jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestMessageFinder.java
Index: TestMessageFinder.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestMessageFinder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestMessageFinder.java 11 Feb 2005 15:29:52 -0000 1.1
+++ TestMessageFinder.java 4 Apr 2005 15:20:37 -0000 1.2
@@ -27,7 +27,7 @@
{
private MessageFinder newFinder()
{
- ClasspathResource r = new ClasspathResource(new
DefaultClassResolver(),
+ ClasspathResource r = new ClasspathResource(getClassResolver(),
"org/apache/hivemind/impl/MessageFinder.xml");
return new MessageFinderImpl(r);
1.6 +37 -36
jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestServicePoint.java
Index: TestServicePoint.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestServicePoint.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestServicePoint.java 28 Feb 2005 12:35:43 -0000 1.5
+++ TestServicePoint.java 4 Apr 2005 15:20:37 -0000 1.6
@@ -40,15 +40,16 @@
{
ModuleImpl result = new ModuleImpl();
- result.setClassResolver(new DefaultClassResolver());
+ result.setClassResolver(getClassResolver());
result.setPackageName("");
- result.setRegistry(new RegistryInfrastructureImpl( new
StrictErrorHandler(), Locale.getDefault()));
+ result.setRegistry(new RegistryInfrastructureImpl(new
StrictErrorHandler(), Locale
+ .getDefault()));
return result;
}
public void testUnknownInterfaceClass()
{
- Location l = fabricateLocation(12);
+ Location l = newLocation();
Module module = newModule();
replayControls();
@@ -76,7 +77,7 @@
public void testDefaultInterceptorOrdering()
{
- Location l = fabricateLocation(12);
+ Location l = newLocation();
Module module = newModule();
replayControls();
@@ -87,23 +88,23 @@
sp.setExtensionPointId("zip.zap");
sp.setLocation(l);
final ServiceInterceptorContributionImpl interceptor1 = new
ServiceInterceptorContributionImpl();
- interceptor1.setFactoryServiceId( "SomeFactory1" );
- sp.addInterceptorContribution( interceptor1 );
+ interceptor1.setFactoryServiceId("SomeFactory1");
+ sp.addInterceptorContribution(interceptor1);
final ServiceInterceptorContributionImpl interceptor2 = new
ServiceInterceptorContributionImpl();
- interceptor2.setFactoryServiceId( "SomeFactory2" );
- sp.addInterceptorContribution( interceptor2 );
- sp.setExtensionPointId( "ExtensionPointId" );
+ interceptor2.setFactoryServiceId("SomeFactory2");
+ sp.addInterceptorContribution(interceptor2);
+ sp.setExtensionPointId("ExtensionPointId");
final List ordered = sp.getOrderedInterceptorContributions();
- assertNotNull( ordered );
- assertEquals( 2, ordered.size() );
- assertEquals( interceptor1, ordered.get( 0 ) );
- assertEquals( interceptor2, ordered.get( 1 ) );
+ assertNotNull(ordered);
+ assertEquals(2, ordered.size());
+ assertEquals(interceptor1, ordered.get(0));
+ assertEquals(interceptor2, ordered.get(1));
verifyControls();
}
public void testCustomInterceptorOrdering()
{
- Location l = fabricateLocation(12);
+ Location l = newLocation();
Module module = newModule();
replayControls();
@@ -114,24 +115,24 @@
sp.setExtensionPointId("zip.zap");
sp.setLocation(l);
final ServiceInterceptorContributionImpl interceptor1 = new
ServiceInterceptorContributionImpl();
- interceptor1.setFactoryServiceId( "SomeFactory1" );
- sp.addInterceptorContribution( interceptor1 );
+ interceptor1.setFactoryServiceId("SomeFactory1");
+ sp.addInterceptorContribution(interceptor1);
final ServiceInterceptorContributionImpl interceptor2 = new
ServiceInterceptorContributionImpl();
- interceptor2.setFactoryServiceId( "SomeFactory2" );
+ interceptor2.setFactoryServiceId("SomeFactory2");
interceptor2.setFollowingInterceptorIds("SomeFactory1");
- sp.addInterceptorContribution( interceptor2 );
- sp.setExtensionPointId( "ExtensionPointId" );
+ sp.addInterceptorContribution(interceptor2);
+ sp.setExtensionPointId("ExtensionPointId");
final List ordered = sp.getOrderedInterceptorContributions();
- assertNotNull( ordered );
- assertEquals( 2, ordered.size() );
- assertEquals( interceptor2, ordered.get( 0 ) );
- assertEquals( interceptor1, ordered.get( 1 ) );
+ assertNotNull(ordered);
+ assertEquals(2, ordered.size());
+ assertEquals(interceptor2, ordered.get(0));
+ assertEquals(interceptor1, ordered.get(1));
verifyControls();
}
public void testInterceptorOrderingByName()
{
- Location l = fabricateLocation(12);
+ Location l = newLocation();
Module module = newModule();
replayControls();
@@ -142,25 +143,25 @@
sp.setExtensionPointId("zip.zap");
sp.setLocation(l);
final ServiceInterceptorContributionImpl interceptor1 = new
ServiceInterceptorContributionImpl();
- interceptor1.setFactoryServiceId( "SomeFactory1" );
- interceptor1.setName( "Interceptor1" );
- sp.addInterceptorContribution( interceptor1 );
+ interceptor1.setFactoryServiceId("SomeFactory1");
+ interceptor1.setName("Interceptor1");
+ sp.addInterceptorContribution(interceptor1);
final ServiceInterceptorContributionImpl interceptor2 = new
ServiceInterceptorContributionImpl();
- interceptor2.setFactoryServiceId( "SomeFactory2" );
+ interceptor2.setFactoryServiceId("SomeFactory2");
interceptor2.setFollowingInterceptorIds("Interceptor1");
- sp.addInterceptorContribution( interceptor2 );
- sp.setExtensionPointId( "ExtensionPointId" );
+ sp.addInterceptorContribution(interceptor2);
+ sp.setExtensionPointId("ExtensionPointId");
final List ordered = sp.getOrderedInterceptorContributions();
- assertNotNull( ordered );
- assertEquals( 2, ordered.size() );
- assertEquals( interceptor2, ordered.get( 0 ) );
- assertEquals( interceptor1, ordered.get( 1 ) );
+ assertNotNull(ordered);
+ assertEquals(2, ordered.size());
+ assertEquals(interceptor2, ordered.get(0));
+ assertEquals(interceptor1, ordered.get(1));
verifyControls();
}
-
+
public void testResultNotAssignableToServiceInterface()
{
- Location l = fabricateLocation(187);
+ Location l = newLocation();
ServicePointImpl sp = new ServicePointImpl();
MockControl modulec = newControl(Module.class);
1.8 +1 -3
jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestVisibility.java
Index: TestVisibility.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestVisibility.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestVisibility.java 6 Jan 2005 01:45:16 -0000 1.7
+++ TestVisibility.java 4 Apr 2005 15:20:37 -0000 1.8
@@ -284,9 +284,7 @@
RegistryAssemblyImpl assembly = new RegistryAssemblyImpl();
- ClassResolver resolver = new DefaultClassResolver();
-
- XmlResourceProcessor parser = new XmlResourceProcessor(resolver,
errorHandler);
+ XmlResourceProcessor parser = new
XmlResourceProcessor(getClassResolver(), errorHandler);
RegistryInfrastructureConstructor cons = new
RegistryInfrastructureConstructor(
errorHandler, LOG, assembly);
1.4 +2 -2
jakarta-hivemind/library/src/test/org/apache/hivemind/lib/factory/TestBeanFactoryObjectProvider.java
Index: TestBeanFactoryObjectProvider.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/library/src/test/org/apache/hivemind/lib/factory/TestBeanFactoryObjectProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestBeanFactoryObjectProvider.java 5 Jan 2005 18:05:50 -0000
1.3
+++ TestBeanFactoryObjectProvider.java 4 Apr 2005 15:20:38 -0000
1.4
@@ -39,7 +39,7 @@
public void testNoServiceId()
{
ObjectProvider op = new BeanFactoryObjectProvider();
- Location l = fabricateLocation(97);
+ Location l = newLocation();
try
{
@@ -59,7 +59,7 @@
public void testNoLocator()
{
ObjectProvider op = new BeanFactoryObjectProvider();
- Location l = fabricateLocation(12);
+ Location l = newLocation();
try
{
1.9 +4 -10
jakarta-hivemind/framework/src/test/hivemind/test/services/TestEventLinker.java
Index: TestEventLinker.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/services/TestEventLinker.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestEventLinker.java 5 Jan 2005 18:05:07 -0000 1.8
+++ TestEventLinker.java 4 Apr 2005 15:20:38 -0000 1.9
@@ -76,15 +76,9 @@
assertSame(e, c.getLastEvent());
}
- private Location createLocation()
- {
- Resource r = new ClasspathResource(new DefaultClassResolver(),
"/foo/bar");
- return new LocationImpl(r, 67);
- }
-
public void testNoMatch() throws Exception
{
- Location location = createLocation();
+ Location location = newLocation();
EventProducer p = new EventProducer();
Object c = "NeverwinterNights";
@@ -109,7 +103,7 @@
public void testNoMatchingName() throws Exception
{
- Location location = createLocation();
+ Location location = newLocation();
EventProducer p = new EventProducer();
Object c = "SoulCailiburII";
@@ -130,7 +124,7 @@
public void testIncompatible() throws Exception
{
- Location location = createLocation();
+ Location location = newLocation();
EventProducer p = new EventProducer();
Object c = "SplinterCell";
@@ -155,7 +149,7 @@
public void testNoProducer() throws Exception
{
- Location location = createLocation();
+ Location location = newLocation();
Object p = "DanceDanceRevolution";
Object c = "SplinterCell";
1.25 +5 -8
jakarta-hivemind/framework/src/test/hivemind/test/services/TestBuilderFactory.java
Index: TestBuilderFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/services/TestBuilderFactory.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- TestBuilderFactory.java 14 Mar 2005 22:28:48 -0000 1.24
+++ TestBuilderFactory.java 4 Apr 2005 15:20:38 -0000 1.25
@@ -190,7 +190,6 @@
Module module = (Module) c.getMock();
ErrorHandler eh = (ErrorHandler) newMock(ErrorHandler.class);
- ClassResolver cr = new DefaultClassResolver();
MockControl logc = newControl(Log.class);
Log log = (Log) logc.getMock();
@@ -225,9 +224,9 @@
fpc.setReturnValue(module);
module.getClassResolver();
- c.setReturnValue(cr);
+ c.setReturnValue(getClassResolver());
- debug(fpc, fp, logc, log, "Autowired property classResolver to " +
cr);
+ debug(fpc, fp, logc, log, "Autowired property classResolver to " +
getClassResolver());
fp.getInvokingModule();
fpc.setReturnValue(module);
@@ -270,7 +269,7 @@
AutowireTarget t = (AutowireTarget) execute(fp, p);
assertSame(eh, t.getErrorHandler());
- assertSame(cr, t.getClassResolver());
+ assertSame(getClassResolver(), t.getClassResolver());
assertSame(messages, t.getMessages());
assertSame(log, t.getLog());
assertEquals("foo.bar.Baz", t.getServiceId());
@@ -493,8 +492,6 @@
fp.getInvokingModule();
fpc.setReturnValue(module, MockControl.ONE_OR_MORE);
- ClassResolver classResolver = new DefaultClassResolver();
-
module.resolveType("hivemind.test.services.ConstructorAutowireTarget");
mc.setReturnValue(ConstructorAutowireTarget.class);
@@ -510,7 +507,7 @@
mc.setReturnValue(h);
module.getClassResolver();
- mc.setReturnValue(classResolver);
+ mc.setReturnValue(getClassResolver());
replayControls();
@@ -523,7 +520,7 @@
ConstructorAutowireTarget service = (ConstructorAutowireTarget)
execute(fp, parameter);
assertSame(h, service.getStringHolder());
- assertSame(classResolver, service.getClassResolver());
+ assertSame(getClassResolver(), service.getClassResolver());
verifyControls();
}
1.5 +1 -1
jakarta-hivemind/framework/src/test/org/apache/hivemind/service/impl/TestBuilderFactory.java
Index: TestBuilderFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/service/impl/TestBuilderFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestBuilderFactory.java 1 Mar 2005 15:05:44 -0000 1.4
+++ TestBuilderFactory.java 4 Apr 2005 15:20:38 -0000 1.5
@@ -42,7 +42,7 @@
*/
public void testErrorInInitializer() throws Exception
{
- Location l = fabricateLocation(17);
+ Location l = newLocation();
MockControl fpc =
newControl(ServiceImplementationFactoryParameters.class);
ServiceImplementationFactoryParameters fp =
(ServiceImplementationFactoryParameters) fpc
1.10 +2 -3
jakarta-hivemind/framework/src/test/org/apache/hivemind/service/impl/TestObjectProviders.java
Index: TestObjectProviders.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/service/impl/TestObjectProviders.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestObjectProviders.java 19 Feb 2005 17:57:40 -0000 1.9
+++ TestObjectProviders.java 4 Apr 2005 15:20:38 -0000 1.10
@@ -24,7 +24,6 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
-import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.impl.ModuleImpl;
import org.apache.hivemind.internal.Module;
import org.apache.hivemind.test.HiveMindTestCase;
@@ -40,7 +39,7 @@
private Module newModule()
{
ModuleImpl result = new ModuleImpl();
- result.setClassResolver(new DefaultClassResolver());
+ result.setClassResolver(getClassResolver());
return result;
}
@@ -154,7 +153,7 @@
public void testServicePropertyObjectProviderWithInvalidLocator()
{
ServicePropertyObjectProvider p = new
ServicePropertyObjectProvider();
- Location l = fabricateLocation(187);
+ Location l = newLocation();
try
{
1.13 +1 -2
jakarta-hivemind/framework/src/test/hivemind/test/rules/TestEnumerationTranslator.java
Index: TestEnumerationTranslator.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/rules/TestEnumerationTranslator.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TestEnumerationTranslator.java 1 Mar 2005 15:05:24 -0000 1.12
+++ TestEnumerationTranslator.java 4 Apr 2005 15:20:38 -0000 1.13
@@ -17,7 +17,6 @@
import hivemind.test.FrameworkTestCase;
import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.impl.ModuleImpl;
import org.apache.hivemind.internal.Module;
import org.apache.hivemind.schema.rules.EnumerationTranslator;
@@ -33,7 +32,7 @@
private Module newModule()
{
ModuleImpl result = new ModuleImpl();
- result.setClassResolver(new DefaultClassResolver());
+ result.setClassResolver(getClassResolver());
return result;
}
1.2 +2 -2
jakarta-hivemind/framework/src/test/hivemind/test/rules/TestInstanceTranslator.java
Index: TestInstanceTranslator.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/rules/TestInstanceTranslator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestInstanceTranslator.java 19 Feb 2005 02:40:54 -0000 1.1
+++ TestInstanceTranslator.java 4 Apr 2005 15:20:38 -0000 1.2
@@ -101,7 +101,7 @@
e.setLocation(l);
ModuleImpl m = new ModuleImpl();
- m.setClassResolver(new DefaultClassResolver());
+ m.setClassResolver(getClassResolver());
replayControls();
@@ -139,7 +139,7 @@
public void testClassTranslator() throws Exception
{
ModuleImpl m = new ModuleImpl();
- m.setClassResolver(new DefaultClassResolver());
+ m.setClassResolver(getClassResolver());
replayControls();
1.9 +1 -1
jakarta-hivemind/framework/src/test/hivemind/test/rules/TestSmartTranslator.java
Index: TestSmartTranslator.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/rules/TestSmartTranslator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestSmartTranslator.java 10 Jan 2005 13:14:59 -0000 1.8
+++ TestSmartTranslator.java 4 Apr 2005 15:20:38 -0000 1.9
@@ -116,7 +116,7 @@
public void testNoEditor()
{
Translator t = new SmartTranslator();
- Location l = fabricateLocation(22);
+ Location l = newLocation();
try
{
1.25 +41 -3
jakarta-hivemind/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java
Index: HiveMindTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- HiveMindTestCase.java 25 Feb 2005 08:42:42 -0000 1.24
+++ HiveMindTestCase.java 4 Apr 2005 15:20:38 -0000 1.25
@@ -57,6 +57,12 @@
{
///CLOVER:OFF
+ /**
+ * An instance of [EMAIL PROTECTED] DefaultClassResolver} that can
be used by tests.
+ */
+
+ private ClassResolver _classResolver;
+
protected String _interceptedLoggerName;
protected StoreAppender _appender;
@@ -410,7 +416,7 @@
*/
protected Registry buildFrameworkRegistry(String[] files) throws
Exception
{
- ClassResolver resolver = new DefaultClassResolver();
+ ClassResolver resolver = getClassResolver();
List descriptorResources = new ArrayList();
for (int i = 0; i < files.length; i++)
@@ -433,7 +439,7 @@
*/
protected Registry buildFrameworkRegistry(ModuleDescriptorProvider
customProvider)
{
- ClassResolver resolver = new DefaultClassResolver();
+ ClassResolver resolver = getClassResolver();
RegistryBuilder builder = new RegistryBuilder();
@@ -536,15 +542,47 @@
}
}
+ /**
+ * @deprecated To be removed in 1.2. Use XXX instead.
+ */
protected Location fabricateLocation(int line)
{
String path = "/" + getClass().getName().replace('.', '/');
- Resource r = new ClasspathResource(new DefaultClassResolver(), path);
+ Resource r = new ClasspathResource(getClassResolver(), path);
return new LocationImpl(r, line);
}
+ private int _line = 1;
+
+ /**
+ * Returns a new [EMAIL PROTECTED] Location} instance. The resource
is the test class, and the line
+ * number increments by one from one for each invocation (thus each call
will get a unique
+ * instance not equal to any previously obtained instance).
+ *
+ * @since 1.1
+ */
+ protected Location newLocation()
+ {
+ return fabricateLocation(_line++);
+ }
+
+ /**
+ * Returns a [EMAIL PROTECTED] DefaultClassResolver}. Repeated calls in
the same test return the same
+ * value.
+ *
+ * @since 1.1
+ */
+
+ protected ClassResolver getClassResolver()
+ {
+ if (_classResolver == null)
+ _classResolver = new DefaultClassResolver();
+
+ return _classResolver;
+ }
+
protected boolean matches(String input, String pattern) throws Exception
{
setupMatcher();
1.3 +2 -2
jakarta-hivemind/framework/src/test/org/apache/hivemind/util/TestInstanceCreationUtils.java
Index: TestInstanceCreationUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/util/TestInstanceCreationUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestInstanceCreationUtils.java 19 Feb 2005 21:49:59 -0000 1.2
+++ TestInstanceCreationUtils.java 4 Apr 2005 15:20:38 -0000 1.3
@@ -83,7 +83,7 @@
public void testSetLocation()
{
- Location l = fabricateLocation(11);
+ Location l = newLocation();
Module module = newModule("Holder", BaseLocatable.class);
replayControls();
@@ -100,7 +100,7 @@
public void testFailure()
{
- Location l = fabricateLocation(11);
+ Location l = newLocation();
Module module = newModule("Bean", Bean.class);
replayControls();
1.20 +4 -4
jakarta-hivemind/framework/src/test/hivemind/test/FrameworkTestCase.java
Index: FrameworkTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/FrameworkTestCase.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FrameworkTestCase.java 6 Jan 2005 01:45:14 -0000 1.19
+++ FrameworkTestCase.java 4 Apr 2005 15:20:38 -0000 1.20
@@ -67,7 +67,7 @@
result.setModuleId(moduleId);
result.setVersion(version);
- result.setLocation(fabricateLocation(0));
+ result.setLocation(newLocation());
return result;
}
@@ -81,7 +81,7 @@
result.setModuleId(moduleId);
result.setVersion(version);
- result.setLocation(fabricateLocation(0));
+ result.setLocation(newLocation());
return result;
}
@@ -96,7 +96,7 @@
result.setId(pointId);
result.setInterfaceClassName(serviceInterface.getName());
- result.setLocation(fabricateLocation(0));
+ result.setLocation(newLocation());
return result;
}
@@ -109,7 +109,7 @@
ConfigurationPointDescriptor result = new
ConfigurationPointDescriptor();
result.setId(pointId);
- result.setLocation(fabricateLocation(0));
+ result.setLocation(newLocation());
return result;
}
1.26 +1 -2
jakarta-hivemind/framework/src/test/hivemind/test/TestMisc.java
Index: TestMisc.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/TestMisc.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TestMisc.java 1 Mar 2005 15:04:38 -0000 1.25
+++ TestMisc.java 4 Apr 2005 15:20:38 -0000 1.26
@@ -23,7 +23,6 @@
import org.apache.hivemind.SymbolSource;
import org.apache.hivemind.impl.ContributionImpl;
import org.apache.hivemind.impl.CreateClassServiceConstructor;
-import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.impl.InvokeFactoryServiceConstructor;
import org.apache.hivemind.impl.ModuleImpl;
import org.apache.hivemind.impl.ServicePointImpl;
@@ -41,7 +40,7 @@
private Module newModule()
{
ModuleImpl result = new ModuleImpl();
- result.setClassResolver(new DefaultClassResolver());
+ result.setClassResolver(getClassResolver());
return result;
}
1.4 +1 -1
jakarta-hivemind/framework/src/test/org/apache/hivemind/TestApplicationRuntimeException.java
Index: TestApplicationRuntimeException.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/TestApplicationRuntimeException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestApplicationRuntimeException.java 5 Jan 2005 18:05:59 -0000
1.3
+++ TestApplicationRuntimeException.java 4 Apr 2005 15:20:38 -0000
1.4
@@ -33,7 +33,7 @@
public void testToStringWithLocation()
{
- Location l = fabricateLocation(22);
+ Location l = newLocation();
ApplicationRuntimeException ex = new ApplicationRuntimeException("my
message", l, null);
1.5 +2 -5
jakarta-hivemind/framework/src/test/org/apache/hivemind/conditional/TestEvaluationContext.java
Index: TestEvaluationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/conditional/TestEvaluationContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestEvaluationContext.java 6 Jan 2005 01:45:11 -0000 1.4
+++ TestEvaluationContext.java 4 Apr 2005 15:20:38 -0000 1.5
@@ -14,9 +14,6 @@
package org.apache.hivemind.conditional;
-import org.apache.hivemind.conditional.EvaluationContext;
-import org.apache.hivemind.conditional.EvaluationContextImpl;
-import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.test.HiveMindTestCase;
/**
@@ -28,7 +25,7 @@
{
public void testProperty()
{
- EvaluationContext ec = new EvaluationContextImpl(new
DefaultClassResolver());
+ EvaluationContext ec = new EvaluationContextImpl(getClassResolver());
System.setProperty("property-set-for-evaluation-context", "true");
@@ -38,7 +35,7 @@
public void testClass()
{
- EvaluationContext ec = new EvaluationContextImpl(new
DefaultClassResolver());
+ EvaluationContext ec = new EvaluationContextImpl(getClassResolver());
assertEquals(true, ec.doesClassExist("java.lang.Object"));
assertEquals(true,
ec.doesClassExist(EvaluationContext.class.getName()));
1.5 +2 -4
jakarta-hivemind/framework/src/test/hivemind/test/parse/TestModuleDescriptor.java
Index: TestModuleDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/parse/TestModuleDescriptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestModuleDescriptor.java 1 Mar 2005 15:05:03 -0000 1.4
+++ TestModuleDescriptor.java 4 Apr 2005 15:20:38 -0000 1.5
@@ -16,7 +16,6 @@
import org.apache.hivemind.Location;
import org.apache.hivemind.Resource;
-import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.impl.DefaultErrorHandler;
import org.apache.hivemind.impl.LocationImpl;
import org.apache.hivemind.parse.ModuleDescriptor;
@@ -33,11 +32,10 @@
{
public void testAddDupeSchema() throws Exception
{
- ModuleDescriptor md = new ModuleDescriptor(new
DefaultClassResolver(),
- new DefaultErrorHandler());
+ ModuleDescriptor md = new ModuleDescriptor(getClassResolver(), new
DefaultErrorHandler());
md.setModuleId("foo");
- Resource r = new ClasspathResource(new DefaultClassResolver(),
"/foo/bar");
+ Resource r = new ClasspathResource(getClassResolver(), "/foo/bar");
Location l1 = new LocationImpl(r, 20);
Location l2 = new LocationImpl(r, 97);
1.121 +3 -2 jakarta-hivemind/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/status.xml,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- status.xml 4 Apr 2005 14:08:50 -0000 1.120
+++ status.xml 4 Apr 2005 15:20:38 -0000 1.121
@@ -35,9 +35,10 @@
<action type="fix" dev="JC" fixes-bug="HIVEMIND-103" >Core service
implementations which implement RegistryShutdownListener are not notified for
primitive and singleton service models.</action>
<action type="update" dev="HLS"> Rename AdapterRegistry to
StrategyRegistry, and AdapterRegistryFactory to StrategyFactory, to better
reflect the relationship to the Gang-of-Four Strategy pattern.</action>
<action type="update" dev="HLS"> Make the interface attribute of
<service-point> optional, and default to the service point's id. </action>
- <action type="fix" dev="HLS" fixes-bug="HIVEMIND-104">Remove a
potential deadlock related to the pooled service model.</action>
+ <action type="fix" dev="HLS" fixes-bug="HIVEMIND-104">Removed a
potential deadlock related to the pooled service model.</action>
<action type="fix" dev="HLS" fixes-bug="HIVEMIND-83"> Allow for
running with multiple Registries. </action>
- <action type="add" dev="HLS"> Add an AbstractArgumentMatcher that
allows ArgumentMatcher to be used as ArgumentsMatcher (that is, comparing all
arguments). </action>
+ <action type="add" dev="HLS"> Added an AbstractArgumentMatcher that
allows ArgumentMatcher to be used as ArgumentsMatcher (that is, comparing all
arguments). </action>
+ <action type="add" dev="HLS"> Added newLocation() method to
HiveMindTestCase. </action>
</release>
<release version="1.1-alpha-3" date="Mar 22 2005">
<action type="fix" dev="JC" fixes-bug="HIVEMIND-96" >Interceptors can
now be ordered by name rather than interceptor factory id.</action>
1.3 +1 -1
jakarta-hivemind/framework/src/test/org/apache/hivemind/schema/rules/TestCreateObjectRule.java
Index: TestCreateObjectRule.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/schema/rules/TestCreateObjectRule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestCreateObjectRule.java 4 Apr 2005 14:08:50 -0000 1.2
+++ TestCreateObjectRule.java 4 Apr 2005 15:20:38 -0000 1.3
@@ -55,7 +55,7 @@
public void testCreateWithInitializer()
{
- final Location l = fabricateLocation(123);
+ final Location l = newLocation();
Module module = newModule("Bean", Bean.class);
Element element = newElement(l);
1.5 +2 -3
jakarta-hivemind/framework/src/test/org/apache/hivemind/parse/TestXmlResourceProcessor.java
Index: TestXmlResourceProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/parse/TestXmlResourceProcessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestXmlResourceProcessor.java 31 Mar 2005 15:35:05 -0000 1.4
+++ TestXmlResourceProcessor.java 4 Apr 2005 15:20:38 -0000 1.5
@@ -20,7 +20,6 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Resource;
-import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.impl.DefaultErrorHandler;
import org.apache.hivemind.util.FileResource;
import org.apache.hivemind.util.URLResource;
@@ -29,7 +28,7 @@
{
public void testMissingURLResource() throws Exception
{
- XmlResourceProcessor processor = new XmlResourceProcessor(new
DefaultClassResolver(),
+ XmlResourceProcessor processor = new
XmlResourceProcessor(getClassResolver(),
new DefaultErrorHandler());
Resource[] missingResources = new Resource[]
@@ -49,4 +48,4 @@
}
}
}
-}
+}
\ No newline at end of file
1.5 +2 -3
jakarta-hivemind/library/src/test/org/apache/hivemind/lib/groovy/TestGroovyModuleDescriptorProvider.java
Index: TestGroovyModuleDescriptorProvider.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/library/src/test/org/apache/hivemind/lib/groovy/TestGroovyModuleDescriptorProvider.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestGroovyModuleDescriptorProvider.java 5 Jan 2005 18:05:33 -0000
1.4
+++ TestGroovyModuleDescriptorProvider.java 4 Apr 2005 15:20:38 -0000
1.5
@@ -18,7 +18,6 @@
import java.util.List;
import org.apache.hivemind.ErrorHandler;
-import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.impl.DefaultErrorHandler;
import org.apache.hivemind.parse.ModuleDescriptor;
import org.apache.hivemind.test.HiveMindTestCase;
@@ -28,7 +27,7 @@
public void testBasicScript() throws Exception
{
GroovyModuleDescriptorProvider provider = new
GroovyModuleDescriptorProvider(
- new DefaultClassResolver(), getResource("basic.groovy"));
+ getClassResolver(), getResource("basic.groovy"));
ErrorHandler errorHandler = new DefaultErrorHandler();
@@ -49,7 +48,7 @@
resources.add(getResource("calculator.groovy"));
GroovyModuleDescriptorProvider provider = new
GroovyModuleDescriptorProvider(
- new DefaultClassResolver(), resources);
+ getClassResolver(), resources);
ErrorHandler errorHandler = new DefaultErrorHandler();
1.7 +1 -2
jakarta-hivemind/library/src/test/org/apache/hivemind/lib/groovy/TestHiveMindBuilder.java
Index: TestHiveMindBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/library/src/test/org/apache/hivemind/lib/groovy/TestHiveMindBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestHiveMindBuilder.java 1 Feb 2005 11:59:01 -0000 1.6
+++ TestHiveMindBuilder.java 4 Apr 2005 15:20:38 -0000 1.7
@@ -22,7 +22,6 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.ErrorHandler;
import org.apache.hivemind.Resource;
-import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.impl.DefaultErrorHandler;
import org.apache.hivemind.parse.DescriptorParser;
import org.apache.hivemind.test.HiveMindTestCase;
@@ -68,7 +67,7 @@
ErrorHandler handler = new DefaultErrorHandler();
DescriptorParser parser = new DescriptorParser(handler);
- parser.initialize(resource, new DefaultClassResolver());
+ parser.initialize(resource, getClassResolver());
GroovyCodeSource source = new
GroovyCodeSource(resource.getResourceURL());
1.9 +1 -1
jakarta-hivemind/library/src/test/org/apache/hivemind/lib/impl/TestServicePropertyFactory.java
Index: TestServicePropertyFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/library/src/test/org/apache/hivemind/lib/impl/TestServicePropertyFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestServicePropertyFactory.java 6 Jan 2005 01:45:11 -0000 1.8
+++ TestServicePropertyFactory.java 4 Apr 2005 15:20:38 -0000 1.9
@@ -47,7 +47,7 @@
p.setService(service);
p.setPropertyName(propertyName);
- p.setLocation(fabricateLocation(99));
+ p.setLocation(newLocation());
return Collections.singletonList(p);
}
1.2 +2 -2
jakarta-hivemind/library/src/test/org/apache/hivemind/lib/strategy/TestStrategyFactory.java
Index: TestStrategyFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/library/src/test/org/apache/hivemind/lib/strategy/TestStrategyFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestStrategyFactory.java 30 Mar 2005 15:19:32 -0000 1.1
+++ TestStrategyFactory.java 4 Apr 2005 15:20:38 -0000 1.2
@@ -103,7 +103,7 @@
public void testBuildRegistryWrongAdapterType()
{
- Location l = fabricateLocation(3);
+ Location l = newLocation();
StrategyRegistry ar = (StrategyRegistry)
newMock(StrategyRegistry.class);
ToStringStrategy adapter = (ToStringStrategy)
newMock(ToStringStrategy.class);
@@ -202,7 +202,7 @@
public void testBuildImplementationClassImproperMethod()
{
- Location l = fabricateLocation(31);
+ Location l = newLocation();
MockControl factoryControl = newControl(ClassFactory.class);
ClassFactory factory = (ClassFactory) factoryControl.getMock();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
