notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r869 - trunk/main/depot/library/common/src/test/net/dpml/library/impl

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r869 - trunk/main/depot/library/common/src/test/net/dpml/library/impl
Date: Sat, 7 Jan 2006 18:11:03 +0100

Author: mcconnell
Date: 2006-01-07 18:11:02 +0100 (Sat, 07 Jan 2006)
New Revision: 869

Modified:

trunk/main/depot/library/common/src/test/net/dpml/library/impl/AbstractTestCase.java

trunk/main/depot/library/common/src/test/net/dpml/library/impl/AnonymousTestCase.java

trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultDictionaryTestCase.java

trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java

trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultModuleTestCase.java

trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
Log:
remove redundant imports

Modified:
trunk/main/depot/library/common/src/test/net/dpml/library/impl/AbstractTestCase.java
===================================================================
---
trunk/main/depot/library/common/src/test/net/dpml/library/impl/AbstractTestCase.java
2006-01-07 16:40:05 UTC (rev 868)
+++
trunk/main/depot/library/common/src/test/net/dpml/library/impl/AbstractTestCase.java
2006-01-07 17:11:02 UTC (rev 869)
@@ -27,17 +27,13 @@
import java.io.FileOutputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.beans.Encoder;
import java.beans.XMLDecoder;
import java.beans.XMLEncoder;
import java.beans.ExceptionListener;
-import java.beans.Expression;

import junit.framework.TestCase;

import net.dpml.library.model.Resource;
-import net.dpml.library.info.ModuleDirective;
import net.dpml.library.info.Scope;

import net.dpml.transit.Logger;

Modified:
trunk/main/depot/library/common/src/test/net/dpml/library/impl/AnonymousTestCase.java
===================================================================
---
trunk/main/depot/library/common/src/test/net/dpml/library/impl/AnonymousTestCase.java
2006-01-07 16:40:05 UTC (rev 868)
+++
trunk/main/depot/library/common/src/test/net/dpml/library/impl/AnonymousTestCase.java
2006-01-07 17:11:02 UTC (rev 869)
@@ -18,24 +18,10 @@

package net.dpml.library.impl;

-import java.io.File;
-import java.io.FileInputStream;
-import java.io.BufferedInputStream;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
import net.dpml.library.model.Module;
-import net.dpml.library.model.Library;
import net.dpml.library.model.Resource;
-import net.dpml.library.model.Type;
-import net.dpml.library.info.LibraryDirective;
-import net.dpml.library.info.ResourceDirective;
import net.dpml.library.info.Scope;

-import net.dpml.transit.Logger;
-import net.dpml.transit.monitor.LoggingAdapter;
-
/**
* Test DefaultLibrary implementation.
*
@@ -44,6 +30,10 @@
*/
public class AnonymousTestCase extends AbstractTestCase
{
+ /**
+ * Testcase setup.
+ * @exception Exception if a setup error occurs
+ */
public void setUp() throws Exception
{
setUp( "test.xml" );
@@ -51,7 +41,7 @@

/**
* Test anonymous resource providers.
- * @exception if a test error occurs
+ * @exception Exception if a test error occurs
*/
public void testAnonymousResourceProviders() throws Exception
{
@@ -62,7 +52,7 @@

/**
* Test anonymous module providers.
- * @exception if a test error occurs
+ * @exception Exception if a test error occurs
*/
public void testAnonymousModuleProviders() throws Exception
{
@@ -73,7 +63,7 @@

/**
* Test expanded anonymous module providers.
- * @exception if a test error occurs
+ * @exception Exception if a test error occurs
*/
public void testExpandedAnonymousModuleProviders() throws Exception
{

Modified:
trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultDictionaryTestCase.java
===================================================================
---
trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultDictionaryTestCase.java
2006-01-07 16:40:05 UTC (rev 868)
+++
trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultDictionaryTestCase.java
2006-01-07 17:11:02 UTC (rev 869)
@@ -18,28 +18,8 @@

package net.dpml.library.impl;

-import java.io.File;
-import java.io.FileInputStream;
-import java.io.BufferedInputStream;
-import java.net.URI;
-import java.util.Properties;
-import java.util.Date;
-
-import junit.framework.TestCase;
-
-import net.dpml.library.model.Module;
-import net.dpml.library.model.Library;
import net.dpml.library.model.Resource;
-import net.dpml.library.model.Type;
-import net.dpml.library.info.LibraryDirective;
-import net.dpml.library.info.ResourceDirective;
-import net.dpml.library.info.Scope;

-import net.dpml.transit.Artifact;
-import net.dpml.transit.Logger;
-import net.dpml.transit.Category;
-import net.dpml.transit.monitor.LoggingAdapter;
-
/**
* Testing the DefaultDictionary implementation.
*

Modified:
trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
===================================================================
---
trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
2006-01-07 16:40:05 UTC (rev 868)
+++
trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
2006-01-07 17:11:02 UTC (rev 869)
@@ -18,23 +18,10 @@

package net.dpml.library.impl;

-import java.io.File;
-import java.io.FileInputStream;
-import java.io.BufferedInputStream;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
import net.dpml.library.model.Module;
-import net.dpml.library.model.Library;
import net.dpml.library.model.Resource;
import net.dpml.library.model.Type;
-import net.dpml.library.info.LibraryDirective;
-import net.dpml.library.info.ResourceDirective;

-import net.dpml.transit.Logger;
-import net.dpml.transit.monitor.LoggingAdapter;
-
/**
* Test DefaultLibrary implementation.
*
@@ -45,7 +32,6 @@
{
/**
* Test library properties.
- * @exception Exception if the test fails
*/
public void testProperties()
{
@@ -55,7 +41,6 @@

/**
* Test correct resolution of top-level modules from the library.
- * @exception Exception if the test fails
*/
public void testRootModuleCount()
{
@@ -136,6 +121,9 @@
assertEquals( "spec-to-path", spec, path );
}

+ /**
+ * Mock type class.
+ */
private static class MockType implements Type
{
private String m_name;

Modified:
trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultModuleTestCase.java
===================================================================
---
trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultModuleTestCase.java
2006-01-07 16:40:05 UTC (rev 868)
+++
trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultModuleTestCase.java
2006-01-07 17:11:02 UTC (rev 869)
@@ -18,25 +18,10 @@

package net.dpml.library.impl;

-import java.io.File;
-import java.io.FileInputStream;
-import java.io.BufferedInputStream;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
import net.dpml.library.model.Module;
-import net.dpml.library.model.Library;
import net.dpml.library.model.Resource;
-import net.dpml.library.model.ResourceNotFoundException;
-import net.dpml.library.model.ModuleNotFoundException;
-import net.dpml.library.info.LibraryDirective;
-import net.dpml.library.info.ResourceDirective;
import net.dpml.library.info.Scope;

-import net.dpml.transit.Logger;
-import net.dpml.transit.monitor.LoggingAdapter;
-
/**
* Testing the DefaultModule implementation.
*
@@ -45,6 +30,10 @@
*/
public class DefaultModuleTestCase extends AbstractTestCase
{
+ /**
+ * Test expanded anonymous module providers.
+ * @exception Exception if a test error occurs
+ */
public void testExpandedAnonymousModuleProviders() throws Exception
{
Module module = (Module) getLibrary().getResource( "dpml/transit" );

Modified:
trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
===================================================================
---
trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
2006-01-07 16:40:05 UTC (rev 868)
+++
trunk/main/depot/library/common/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
2006-01-07 17:11:02 UTC (rev 869)
@@ -19,26 +19,13 @@
package net.dpml.library.impl;

import java.io.File;
-import java.io.FileInputStream;
-import java.io.BufferedInputStream;
-import java.net.URI;
-import java.util.Properties;
-import java.util.Date;

-import junit.framework.TestCase;
-
-import net.dpml.library.model.Module;
-import net.dpml.library.model.Library;
import net.dpml.library.model.Resource;
import net.dpml.library.model.Type;
-import net.dpml.library.info.LibraryDirective;
-import net.dpml.library.info.ResourceDirective;
import net.dpml.library.info.Scope;

import net.dpml.transit.Artifact;
-import net.dpml.transit.Logger;
import net.dpml.transit.Category;
-import net.dpml.transit.monitor.LoggingAdapter;

/**
* Testing the DefaultResource implementation.
@@ -68,7 +55,6 @@
Resource resource = getLibrary().getResource( "junit/junit" );
String version = resource.getVersion();
assertEquals( "version", "@JUNIT_VERSION@", version );
- //System.out.println( "# version: " + version );
}

/**
@@ -144,10 +130,6 @@
String path = "dpml/metro/dpml-composition-runtime";
Resource resource = getLibrary().getResource( path );
Type[] types = resource.getTypes();
- //for( int i=0; i<types.length; i++ )
- //{
- // System.out.println( "# type: " + types[i] );
- //}
Type jar = types[0];
Type plugin = types[1];
assertEquals( "types-length", 2, types.length );
@@ -437,7 +419,7 @@
System.out.println( "# " + path + ", " +
category.getName().toUpperCase() );
for( int i=0; i<chain.length; i++ )
{
- System.out.println( "# (" + (i+1) + ") " + chain[i] );
+ System.out.println( "# (" + ( i+1 ) + ") " + chain[i] );
}
}
return chain.length;

r869 - trunk/main/depot/library/common/src/test/net/dpml/library/impl, mcconnell at BerliOS, 01/07/2006