geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r438910 - in /geronimo/server/branches/sachin/modules: geronimo-connector-builder/ geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ geronimo-kernel/src/test/java/org/apache/geronimo/kernel/ geronimo-kernel/...
Date Thu, 31 Aug 2006 13:29:28 GMT
Author: sppatel
Date: Thu Aug 31 06:29:27 2006
New Revision: 438910

URL: http://svn.apache.org/viewvc?rev=438910&view=rev
Log:
merge from head

Modified:
    geronimo/server/branches/sachin/modules/geronimo-connector-builder/pom.xml
    geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java
    geronimo/server/branches/sachin/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/GBeanTest.java
    geronimo/server/branches/sachin/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationUtilTest.java
    geronimo/server/branches/sachin/modules/geronimo-testsupport/pom.xml
    geronimo/server/branches/sachin/modules/geronimo-testsupport/src/main/java/org/apache/geronimo/testsupport/TestSupport.java
    geronimo/server/branches/sachin/modules/geronimo-util/src/test/java/org/apache/geronimo/util/SimpleEncryptionTest.java

Modified: geronimo/server/branches/sachin/modules/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-connector-builder/pom.xml?rev=438910&r1=438909&r2=438910&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-connector-builder/pom.xml Thu Aug 31
06:29:27 2006
@@ -127,7 +127,7 @@
                     <systemProperties>
                         <property>
                             <name>java.security.auth.login.config</name>
-                            <value>${basedir}/src/test-data/data/login.config</value>
+                            <value>${basedir}/src/test/data/data/login.config</value>
                         </property>
                     </systemProperties>
                     

Modified: geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java?rev=438910&r1=438909&r2=438910&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java
(original)
+++ geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java
Thu Aug 31 06:29:27 2006
@@ -23,7 +23,6 @@
 
     public void testLoadGeronimoDeploymentDescriptor10() throws Exception {
         URL srcXml = classLoader.getResource("connector_1_0/geronimo-ra.xml");
-//        File geronimoDD = new File(basedir, "src/test-data/connector_1_0/geronimo-ra.xml");
         XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         GerConnectorDocument connectorDocument = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         GerConnectorType connector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(connectorDocument,
CONNECTOR_QNAME, GerConnectorType.type);
@@ -33,8 +32,6 @@
 
     public void testLoadJ2eeDeploymentDescriptor() throws Exception {
         URL srcXml = classLoader.getResource("connector_1_5/ra.xml");
-//        File j2eeDD = new File(basedir, "src/test-data/connector_1_5/ra.xml");
-//        assertTrue(j2eeDD.exists());
         XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         ConnectorDocument connectorDocument = (ConnectorDocument) plan.changeType(ConnectorDocument.type);
         assertNotNull(connectorDocument.getConnector().getResourceadapter());
@@ -43,8 +40,6 @@
 
     public void testLoadGeronimoDeploymentDescriptor15() throws Exception {
         URL srcXml = classLoader.getResource("connector_1_5/geronimo-ra.xml");
-//        File geronimoDD = new File(basedir, "src/test-data/connector_1_5/geronimo-ra.xml");
-//        assertTrue(geronimoDD.exists());
         XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         GerConnectorDocument connectorDocument = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         GerConnectorType connector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(connectorDocument,
CONNECTOR_QNAME, GerConnectorType.type);
@@ -53,9 +48,6 @@
 
     public void testResourceAdapterNameUniqueness() throws Exception {
         URL srcXml = classLoader.getResource("data/dup-resourceadapter-name.xml");
-//        File resourcePlan = new File(basedir, "src/test-data/data/dup-resourceadapter-name.xml");
-//        assertTrue(resourcePlan.exists());
-
         XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         if (doc == null) {
@@ -71,9 +63,6 @@
 
     public void testConnectionFactoryNameUniqueness() throws Exception {
         URL srcXml = classLoader.getResource("data/dup-connectionfactoryinstance-name.xml");
-//        File resourcePlan = new File(basedir, "src/test-data/data/dup-connectionfactoryinstance-name.xml");
-//        assertTrue(resourcePlan.exists());
-
         XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         if (doc == null) {
@@ -89,9 +78,6 @@
 
     public void testAdminObjectNameUniqueness() throws Exception {
         URL srcXml = classLoader.getResource("data/dup-admin-object-name.xml");
-//        File resourcePlan = new File(basedir, "src/test-data/data/dup-admin-object-name.xml");
-//        assertTrue(resourcePlan.exists());
-
         XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         if (doc == null) {
@@ -107,9 +93,6 @@
 
     public void testRectifyPlan() throws Exception {
         URL srcXml = classLoader.getResource("data/old-schema-plan.xml");
-//        File resourcePlan = new File(basedir, "src/test-data/data/old-schema-plan.xml");
-//        assertTrue(resourcePlan.exists());
-
         XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         if (doc == null) {
@@ -119,5 +102,4 @@
         ConnectorPlanRectifier.rectifyPlan(gerConnector);
         gerConnector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(gerConnector,
CONNECTOR_QNAME, GerConnectorType.type);
     }
-
 }

Modified: geronimo/server/branches/sachin/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/GBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/GBeanTest.java?rev=438910&r1=438909&r2=438910&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/GBeanTest.java
(original)
+++ geronimo/server/branches/sachin/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/GBeanTest.java
Thu Aug 31 06:29:27 2006
@@ -25,6 +25,7 @@
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
@@ -34,10 +35,6 @@
 import org.apache.geronimo.kernel.proxy.ProxyFactory;
 import org.apache.geronimo.kernel.proxy.ProxyManager;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
 
 /**
  * @version $Rev:386515 $ $Date$
@@ -527,8 +524,6 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        Logger.getRootLogger().addAppender(new ConsoleAppender(new PatternLayout("%p [%t]
%m %n")));
-        Logger.getRootLogger().setLevel(Level.DEBUG);
         realKernel = KernelFactory.newInstance().createKernel("test");
         realKernel.boot();
         kernel = kernelWraper.wrap(realKernel);

Modified: geronimo/server/branches/sachin/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationUtilTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationUtilTest.java?rev=438910&r1=438909&r2=438910&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationUtilTest.java
(original)
+++ geronimo/server/branches/sachin/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationUtilTest.java
Thu Aug 31 06:29:27 2006
@@ -19,12 +19,14 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+
 import java.util.Collections;
 import java.util.List;
 
 import javax.xml.namespace.QName;
 
 import junit.framework.TestCase;
+
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
@@ -48,7 +50,8 @@
         assertEquals(data, configurationData);
 
         configurationData = createConfigurationData(xstreamConfigurationMarshaler);
-        xstreamConfigurationMarshaler.writeConfigurationData(configurationData, System.out);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        xstreamConfigurationMarshaler.writeConfigurationData(configurationData, out);
         data = copy(configurationData, xstreamConfigurationMarshaler, xstreamConfigurationMarshaler);
         assertEquals(data, configurationData);
 

Modified: geronimo/server/branches/sachin/modules/geronimo-testsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-testsupport/pom.xml?rev=438910&r1=438909&r2=438910&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-testsupport/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-testsupport/pom.xml Thu Aug 31 06:29:27
2006
@@ -40,6 +40,11 @@
         </dependency>
         
         <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>compile</scope>

Modified: geronimo/server/branches/sachin/modules/geronimo-testsupport/src/main/java/org/apache/geronimo/testsupport/TestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-testsupport/src/main/java/org/apache/geronimo/testsupport/TestSupport.java?rev=438910&r1=438909&r2=438910&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-testsupport/src/main/java/org/apache/geronimo/testsupport/TestSupport.java
(original)
+++ geronimo/server/branches/sachin/modules/geronimo-testsupport/src/main/java/org/apache/geronimo/testsupport/TestSupport.java
Thu Aug 31 06:29:27 2006
@@ -47,12 +47,24 @@
      */
     protected Log log = LogFactory.getLog(getClass());
     
+    /**
+     * Constructor for tests that specify a specific test name.
+     *
+     * @see #TestSupport()  This is the prefered constructor for sub-classes to use.
+     */
     protected TestSupport(final String name) {
         super(name);
+        
+        log.info("Initialized");
     }
     
+    /**
+     * Default constructor.
+     */
     protected TestSupport() {
         super();
+        
+        log.info("Initialized");
     }
     
     /**

Modified: geronimo/server/branches/sachin/modules/geronimo-util/src/test/java/org/apache/geronimo/util/SimpleEncryptionTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-util/src/test/java/org/apache/geronimo/util/SimpleEncryptionTest.java?rev=438910&r1=438909&r2=438910&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-util/src/test/java/org/apache/geronimo/util/SimpleEncryptionTest.java
(original)
+++ geronimo/server/branches/sachin/modules/geronimo-util/src/test/java/org/apache/geronimo/util/SimpleEncryptionTest.java
Thu Aug 31 06:29:27 2006
@@ -16,12 +16,12 @@
  */
 package org.apache.geronimo.util;
 
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
 
 /**
  * @version $Rev$ $Date$
  */
-public class SimpleEncryptionTest extends TestCase {
+public class SimpleEncryptionTest extends TestSupport {
     public void testSimpleEncryption() {
         Object[] source = new Object[]{"This is a test", new Integer(14)};
         String text = SimpleEncryption.encrypt(source);



Mime
View raw message