You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/02/14 15:23:13 UTC
cvs commit: jakarta-turbine-fulcrum/factory/impl project.xml
epugh 2004/02/14 06:23:13
Modified: factory/impl/src/test/org/apache/fulcrum/factory
FactoryServiceTest.java
dvsl/impl/src/test/org/apache/fulcrum/dvsl
DvslBasicTest.java
dvsl/impl/conf block.xml
dvsl/impl project.xml
factory/impl project.xml
Log:
Update merlin issues
Revision Changes Path
1.2 +8 -10 jakarta-turbine-fulcrum/factory/impl/src/test/org/apache/fulcrum/factory/FactoryServiceTest.java
Index: FactoryServiceTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/factory/impl/src/test/org/apache/fulcrum/factory/FactoryServiceTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FactoryServiceTest.java 15 Nov 2003 16:13:57 -0000 1.1
+++ FactoryServiceTest.java 14 Feb 2004 14:23:13 -0000 1.2
@@ -31,11 +31,10 @@
super.setUp();
try
{
- factoryService = (FactoryService) this.resolve( "factory" );
+ factoryService = (FactoryService) this.resolve( "/test/factory" );
}
catch (Throwable e)
{
- getLogger().error( "Setup error.", e );
fail(e.getMessage());
}
}
@@ -54,7 +53,6 @@
{
Object object = factoryService.getInstance("java.lang.StringBuffer", StringBuffer.class.getClassLoader());
assertTrue(object instanceof StringBuffer);
- getLogger().info( "OK" );
}
/*
* Class to test for Object getInstance(String, Object[], String[])
@@ -62,14 +60,14 @@
public void testGetInstanceStringObjectArrayStringArray() throws Exception
{
Object params[] = new Object[1];
- String sourceValu = "testing";
- params[0] = sourceValu;
+ String sourceValue = "testing";
+ params[0] = sourceValue;
String signature[] = new String[1];
signature[0] = "java.lang.String";
Object object = factoryService.getInstance("java.lang.StringBuffer", params, signature);
assertTrue(object instanceof StringBuffer);
- assertEquals(sourceValu, object.toString());
- getLogger().info( "OK" );
+ assertEquals(sourceValue, object.toString());
+
}
/*
* Class to test for Object getInstance(String, ClassLoader, Object[], String[])
@@ -89,7 +87,7 @@
signature);
assertTrue(object instanceof StringBuffer);
assertEquals(sourceValu, object.toString());
- getLogger().info( "OK" );
+
}
/**
* @todo Need to run a test where the loader is NOT supported.
@@ -98,7 +96,7 @@
public void testIsLoaderSupported() throws Exception
{
assertTrue(factoryService.isLoaderSupported("java.lang.String"));
- getLogger().info( "OK" );
+
}
public void testGetSignature() throws Exception
{
@@ -117,6 +115,6 @@
results = factoryService.getSignature(ArrayList.class, params, signature);
assertEquals(1, results.length);
assertTrue("Result:" + results[0].getName(),results[0].equals(Integer.class));
- getLogger().info( "OK" );
+
}
}
1.2 +4 -9 jakarta-turbine-fulcrum/dvsl/impl/src/test/org/apache/fulcrum/dvsl/DvslBasicTest.java
Index: DvslBasicTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/dvsl/impl/src/test/org/apache/fulcrum/dvsl/DvslBasicTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DvslBasicTest.java 19 Nov 2003 11:19:37 -0000 1.1
+++ DvslBasicTest.java 14 Feb 2004 14:23:13 -0000 1.2
@@ -68,12 +68,7 @@
private DvslService dvslService = null;
public DvslBasicTest(String name)
{
- super(
- MAVEN_TARGET_CLASSES_DIR,
- MERLIN_DEFAULT_CONFIG_FILE,
- MERLIN_INFO_OFF,
- MERLIN_DEBUG_OFF,
- name );
+ super( name );
}
public void setUp() throws Exception
@@ -81,11 +76,11 @@
super.setUp();
try
{
- dvslService = (DvslService) this.resolve( "dvsl" );
+ dvslService = (DvslService) this.resolve( "/test/dvsl" );
}
catch (Throwable e)
{
- getLogger().error( "Setup failure.", e );
+
fail(e.getMessage());
}
}
@@ -102,6 +97,6 @@
StringWriter sw = new StringWriter();
dvslService.transform("style", new StringReader(input), sw);
assertEquals("Hello from element! Foo",sw.toString());
- getLogger().info( "OK" );
+
}
}
1.2 +1 -1 jakarta-turbine-fulcrum/dvsl/impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/dvsl/impl/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 19 Nov 2003 11:19:37 -0000 1.1
+++ block.xml 14 Feb 2004 14:23:13 -0000 1.2
@@ -4,7 +4,7 @@
<classloader>
<classpath>
<repository>
- <resource id="fulcrum:fulcrum-dvsl-api" version="1.0-alpha-3"/>
+ <resource id="fulcrum:fulcrum-dvsl-api" version="1.0-alpha-4"/>
</repository>
</classpath>
</classloader>
1.3 +1 -1 jakarta-turbine-fulcrum/dvsl/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/dvsl/impl/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 21 Jan 2004 19:33:55 -0000 1.2
+++ project.xml 14 Feb 2004 14:23:13 -0000 1.3
@@ -49,7 +49,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.2.2-dev</version>
+ <version>3.2.10</version>
</dependency>
</dependencies>
1.2 +6 -1 jakarta-turbine-fulcrum/factory/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/factory/impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 15 Nov 2003 16:13:57 -0000 1.1
+++ project.xml 14 Feb 2004 14:23:13 -0000 1.2
@@ -12,13 +12,18 @@
<artifactId>fulcrum-factory-api</artifactId>
<version>1.0-alpha-2</version>
</dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.1.5</version>
+ </dependency>
<!-- Needed only for testing -->
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.2.2-dev</version>
+ <version>3.2.10</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org