You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemind.apache.org by hl...@apache.org on 2004/10/05 19:45:25 UTC
cvs commit: jakarta-hivemind/framework/src/java/org/apache/hivemind/test HiveMindTestCase.java
hlship 2004/10/05 10:45:25
Modified: framework/src/test/hivemind/test TestSubModule.java
TestDependency.java TestRegistryBuilder.java
framework/src/test/org/apache/hivemind/impl
TestVisibility.java
framework/src/java/org/apache/hivemind/test
HiveMindTestCase.java
Log:
Cleanup a few compiiler warnings.
Revision Changes Path
1.5 +6 -5 jakarta-hivemind/framework/src/test/hivemind/test/TestSubModule.java
Index: TestSubModule.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/TestSubModule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestSubModule.java 6 Sep 2004 09:19:47 -0000 1.4
+++ TestSubModule.java 5 Oct 2004 17:45:25 -0000 1.5
@@ -20,7 +20,7 @@
/**
* Tests the ability for a module to include <sub-module>s.
- *
+ *
* @author Howard Lewis Ship
*/
public class TestSubModule extends FrameworkTestCase
@@ -29,8 +29,9 @@
{
Registry r = buildFrameworkRegistry("OuterModule.xml");
- SimpleService s =
- (SimpleService) r.getService("hivemind.test.outer.Simple", SimpleService.class);
+ SimpleService s = (SimpleService) r.getService(
+ "hivemind.test.outer.Simple",
+ SimpleService.class);
assertEquals(11, s.add(4, 7));
@@ -40,9 +41,9 @@
{
interceptLogging();
- Registry r = buildFrameworkRegistry("MissingSubModule.xml");
+ buildFrameworkRegistry("MissingSubModule.xml");
assertLoggedMessagePattern("Sub-module .*?/DoesNotExist\\.xml does not exist\\.");
}
-}
+}
\ No newline at end of file
1.4 +15 -15 jakarta-hivemind/framework/src/test/hivemind/test/TestDependency.java
Index: TestDependency.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/TestDependency.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestDependency.java 27 Sep 2004 15:50:47 -0000 1.3
+++ TestDependency.java 5 Oct 2004 17:45:25 -0000 1.4
@@ -29,12 +29,12 @@
public void testMissingRequiredModule() throws Exception
{
ModuleDescriptor dependingModule = createModuleDescriptor(
- "dependency.declaring.module",
- null);
+ "dependency.declaring.module",
+ null);
DependencyDescriptor unresolvableDependency = createDependencyDescriptor(
- "required.module",
- null);
+ "required.module",
+ null);
dependingModule.addDependency(unresolvableDependency);
SimpleModuleDescriptorProvider provider = new SimpleModuleDescriptorProvider();
@@ -42,7 +42,7 @@
interceptLogging();
- Registry r = buildFrameworkRegistry(provider);
+ buildFrameworkRegistry(provider);
assertLoggedMessage("Required module required.module does not exist.");
}
@@ -50,32 +50,32 @@
public void testDependencyWithoutVersion() throws Exception
{
ModuleDescriptor dependingModule = createModuleDescriptor(
- "dependency.declaring.module",
- null);
+ "dependency.declaring.module",
+ null);
ModuleDescriptor requiredModule = createModuleDescriptor("required.module", "1.0.0");
DependencyDescriptor unversionedDependency = createDependencyDescriptor(
- "required.module",
- null);
+ "required.module",
+ null);
dependingModule.addDependency(unversionedDependency);
SimpleModuleDescriptorProvider provider = new SimpleModuleDescriptorProvider();
provider.addModuleDescriptor(dependingModule);
provider.addModuleDescriptor(requiredModule);
- Registry r = buildFrameworkRegistry(provider);
+ buildFrameworkRegistry(provider);
}
public void testVersionMismatch() throws Exception
{
ModuleDescriptor dependingModule = createModuleDescriptor(
- "dependency.declaring.module",
- null);
+ "dependency.declaring.module",
+ null);
ModuleDescriptor requiredModuleOfWrongVersion = createModuleDescriptor(
- "required.module",
- "1.0.1");
+ "required.module",
+ "1.0.1");
DependencyDescriptor dependency = createDependencyDescriptor("required.module", "1.0.0");
dependingModule.addDependency(dependency);
@@ -86,7 +86,7 @@
interceptLogging();
- Registry r = buildFrameworkRegistry(provider);
+ buildFrameworkRegistry(provider);
assertLoggedMessage("Version of required module required.module does not match expected version 1.0.0.");
}
1.21 +1 -1 jakarta-hivemind/framework/src/test/hivemind/test/TestRegistryBuilder.java
Index: TestRegistryBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/TestRegistryBuilder.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TestRegistryBuilder.java 4 Oct 2004 15:16:03 -0000 1.20
+++ TestRegistryBuilder.java 5 Oct 2004 17:45:25 -0000 1.21
@@ -96,7 +96,7 @@
interceptLogging();
- Registry r = buildFrameworkRegistry(provider);
+ buildFrameworkRegistry(provider);
assertLoggedMessagePattern("Module " + duplicateModuleId + " is duplicated!");
}
1.3 +0 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestVisibility.java 27 Sep 2004 13:51:37 -0000 1.2
+++ TestVisibility.java 5 Oct 2004 17:45:25 -0000 1.3
@@ -225,9 +225,6 @@
*/
public void testGetServiceMatchesPublicOnly()
{
- MockControl mc = newControl(Module.class);
- Module m = (Module) mc.getMock();
-
MockControl spc1 = newControl(ServicePoint.class);
ServicePoint sp1 = (ServicePoint) spc1.getMock();
1.17 +0 -2 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- HiveMindTestCase.java 28 Sep 2004 10:24:02 -0000 1.16
+++ HiveMindTestCase.java 5 Oct 2004 17:45:25 -0000 1.17
@@ -391,8 +391,6 @@
*/
protected Registry buildMinimalRegistry(Resource l) throws Exception
{
- ClassResolver resolver = new DefaultClassResolver();
-
RegistryBuilder builder = new RegistryBuilder();
return builder.constructRegistry(Locale.getDefault());
---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org