Update of 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3949/plugin-struts/src/test/java/org/xdoclet/plugin/struts

Modified Files:
        AbstractStrutsConfigTestCase.java 
        AbstractStrutsValidationTestCase.java 
        StrutsValidationTest.java 
Added Files:
        AbstractLocaleBundleTestBase.java 
        AbstractStrutsTilesTestCase.java CountryLocaleBundleTest.java 
        DefaultLocaleBundleTest.java LanguageLocaleBundleTest.java 
        MergeBundleTest.java StrutsTilesTest.java 
        VariantLocaleBundleTest.java 
Log Message:
fix for XDP-73 and some improvements of build process


--- NEW FILE: AbstractStrutsTilesTestCase.java ---
/*
 * Copyright (c) 2004
 * XDoclet Team
 * All rights reserved.
 */
package org.xdoclet.plugin.struts;

import org.generama.JellyTemplateEngine;
import org.generama.MetadataProvider;
import org.generama.Plugin;
import org.generama.QDoxCapableMetadataProvider;
import org.generama.WriterMapper;

import org.generama.tests.AbstractXMLGeneratingPluginTestCase;

/**
 * @author Eduardo Franceschi
 */
public abstract class AbstractStrutsTilesTestCase extends 
AbstractXMLGeneratingPluginTestCase {
    protected Plugin createPlugin(MetadataProvider provider, WriterMapper 
mapper) {
        return new StrutsTilesPlugin(new JellyTemplateEngine(), 
(QDoxCapableMetadataProvider) provider, mapper);
    }
}

--- NEW FILE: MergeBundleTest.java ---
/*
 * Copyright (c) 2004
 * XDoclet Team
 * All rights reserved.
 */
package org.xdoclet.plugin.struts;

import java.net.URL;

import org.generama.MetadataProvider;
import org.generama.Plugin;
import org.generama.VelocityTemplateEngine;
import org.generama.WriterMapper;

import org.xdoclet.QDoxMetadataProvider;

/**
 * @author Eduardo Franceschi
 */
public class MergeBundleTest extends AbstractLocaleBundleTestBase {
    protected URL getExpected() throws Exception {
        return 
getResourceRelativeToThisPackage("complete/TestMergedMessages.properties");
    }

    protected Plugin createPlugin(MetadataProvider metadataProvider, 
WriterMapper writerMapper)
        throws Exception {
        StrutsMessagePlugin mbp = new StrutsMessagePlugin(new 
VelocityTemplateEngine(),
                (QDoxMetadataProvider) metadataProvider, writerMapper);
        String merge = 
getResourceRelativeToThisPackage("complete/merge/MergeMessages.properties").getFile();
        mbp.setMergefile(merge);
        return mbp;
    }
}

--- NEW FILE: StrutsTilesTest.java ---
/*
 * Copyright (c) 2004
 * XDoclet Team
 * All rights reserved.
 */
package org.xdoclet.plugin.struts;

import java.io.File;

import java.net.URL;

import org.generama.MetadataProvider;
import org.generama.Plugin;
import org.generama.WriterMapper;

import org.xdoclet.QDoxMetadataProvider;

/**
 * @author Eduardo Franceschi
 */
public class StrutsTilesTest extends AbstractStrutsTilesTestCase {
    protected MetadataProvider createMetadataProvider() throws Exception {
        URL reader = getResourceRelativeToThisPackage("complete");
        return new QDoxMetadataProvider(new File(reader.getPath()));
    }

    protected URL getExpected() throws Exception {
        return this.getResourceRelativeToThisPackage("complete/tiles-defs.xml");
    }

    protected Plugin createPlugin(MetadataProvider metadataProvider, 
WriterMapper writerMapper) {
        StrutsTilesPlugin plugin = (StrutsTilesPlugin) 
super.createPlugin(metadataProvider, writerMapper);
        URL completeDirURL = getResourceRelativeToThisPackage("complete/merge");
        plugin.setMergedir(new File(completeDirURL.getPath()));
        return plugin;
    }
}

Index: AbstractStrutsValidationTestCase.java
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts/AbstractStrutsValidationTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AbstractStrutsValidationTestCase.java       31 May 2005 11:26:16 -0000      
1.4
--- AbstractStrutsValidationTestCase.java       2 Jul 2005 13:16:29 -0000       
1.5
***************
*** 6,10 ****
  package org.xdoclet.plugin.struts;
  
- import org.custommonkey.xmlunit.XMLUnit;
  import org.generama.JellyTemplateEngine;
  import org.generama.MetadataProvider;
--- 6,9 ----

--- NEW FILE: CountryLocaleBundleTest.java ---
/*
 * Copyright (c) 2004
 * XDoclet Team
 * All rights reserved.
 */
package org.xdoclet.plugin.struts;

import java.net.URL;

import org.generama.MetadataProvider;
import org.generama.Plugin;
import org.generama.VelocityTemplateEngine;
import org.generama.WriterMapper;

import org.xdoclet.QDoxMetadataProvider;

/**
 * @author Eduardo Franceschi
 */
public class CountryLocaleBundleTest extends AbstractLocaleBundleTestBase {
    protected URL getExpected() throws Exception {
        return 
this.getResourceRelativeToThisPackage("complete/TestMessages_de_DE.properties");
    }

    protected Plugin createPlugin(MetadataProvider metadataProvider, 
WriterMapper writerMapper)
        throws Exception {
        StrutsMessagePlugin mbp = new StrutsMessagePlugin(new 
VelocityTemplateEngine(),
                (QDoxMetadataProvider) metadataProvider, writerMapper);
        mbp.setLang("de");
        mbp.setCountry("DE");
        return mbp;
    }
}

--- NEW FILE: LanguageLocaleBundleTest.java ---
/*
 * Copyright (c) 2004
 * XDoclet Team
 * All rights reserved.
 */
package org.xdoclet.plugin.struts;

import java.net.URL;

import org.generama.MetadataProvider;
import org.generama.Plugin;
import org.generama.VelocityTemplateEngine;
import org.generama.WriterMapper;

import org.xdoclet.QDoxMetadataProvider;

/**
 * @author Eduardo Franceschi
 */
public class LanguageLocaleBundleTest extends AbstractLocaleBundleTestBase {
    protected URL getExpected() throws Exception {
        return 
this.getResourceRelativeToThisPackage("complete/TestMessages_de.properties");
    }

    protected Plugin createPlugin(MetadataProvider metadataProvider, 
WriterMapper writerMapper)
        throws Exception {
        StrutsMessagePlugin mbp = new StrutsMessagePlugin(new 
VelocityTemplateEngine(),
                (QDoxMetadataProvider) metadataProvider, writerMapper);
        mbp.setLang("de");
        return mbp;
    }
}

Index: AbstractStrutsConfigTestCase.java
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts/AbstractStrutsConfigTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AbstractStrutsConfigTestCase.java   31 May 2005 11:26:16 -0000      1.4
--- AbstractStrutsConfigTestCase.java   2 Jul 2005 13:16:29 -0000       1.5
***************
*** 6,10 ****
  package org.xdoclet.plugin.struts;
  
- import org.custommonkey.xmlunit.XMLUnit;
  import org.generama.JellyTemplateEngine;
  import org.generama.MetadataProvider;
--- 6,9 ----

--- NEW FILE: VariantLocaleBundleTest.java ---
/*
 * Copyright (c) 2004
 * XDoclet Team
 * All rights reserved.
 */
package org.xdoclet.plugin.struts;

import java.net.URL;

import org.generama.MetadataProvider;
import org.generama.Plugin;
import org.generama.VelocityTemplateEngine;
import org.generama.WriterMapper;

import org.xdoclet.QDoxMetadataProvider;

/**
 * @author Eduardo Franceschi
 */
public class VariantLocaleBundleTest extends AbstractLocaleBundleTestBase {
    protected URL getExpected() throws Exception {
        return 
this.getResourceRelativeToThisPackage("complete/TestMessages_de_DE_he.properties");
    }

    protected Plugin createPlugin(MetadataProvider metadataProvider, 
WriterMapper writerMapper)
        throws Exception {
        StrutsMessagePlugin mbp = new StrutsMessagePlugin(new 
VelocityTemplateEngine(),
                (QDoxMetadataProvider) metadataProvider, writerMapper);
        mbp.setLang("de");
        mbp.setCountry("DE");
        mbp.setVariant("he");
        return mbp;
    }
}

--- NEW FILE: DefaultLocaleBundleTest.java ---
/*
 * Copyright (c) 2004
 * XDoclet Team
 * All rights reserved.
 */
package org.xdoclet.plugin.struts;

import java.net.URL;

import org.generama.MetadataProvider;
import org.generama.Plugin;
import org.generama.VelocityTemplateEngine;
import org.generama.WriterMapper;

import org.xdoclet.QDoxMetadataProvider;

/**
 * @author Eduardo Franceschi
 */
public class DefaultLocaleBundleTest extends AbstractLocaleBundleTestBase {
    protected URL getExpected() throws Exception {
        return 
getResourceRelativeToThisPackage("complete/TestMessages.properties");
    }

    protected Plugin createPlugin(MetadataProvider metadataProvider, 
WriterMapper writerMapper)
        throws Exception {
        StrutsMessagePlugin mbp = new StrutsMessagePlugin(new 
VelocityTemplateEngine(),
                (QDoxMetadataProvider) metadataProvider, writerMapper);
        return mbp;
    }
}

Index: StrutsValidationTest.java
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts/StrutsValidationTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StrutsValidationTest.java   31 May 2005 11:26:16 -0000      1.4
--- StrutsValidationTest.java   2 Jul 2005 13:16:29 -0000       1.5
***************
*** 10,15 ****
  
  import org.generama.MetadataProvider;
- import org.generama.Plugin;
- import org.generama.WriterMapper;
  import org.xdoclet.QDoxMetadataProvider;
  
--- 10,13 ----

--- NEW FILE: AbstractLocaleBundleTestBase.java ---
/*
 * Copyright (c) 2004
 * XDoclet Team
 * All rights reserved.
 */
package org.xdoclet.plugin.struts;

import java.io.IOException;

import java.net.URL;

import org.generama.MetadataProvider;

import org.generama.tests.AbstractPropertyGeneratingPluginTestCase;

import org.xdoclet.QDoxMetadataProvider;

/**
 * @author Eduardo Franceschi
 */
public abstract class AbstractLocaleBundleTestBase extends 
AbstractPropertyGeneratingPluginTestCase {
    protected MetadataProvider createMetadataProvider() throws IOException {
        URL reader = 
getResourceRelativeToThisPackage("complete/TestMessages.java");
        return new QDoxMetadataProvider(reader);
    }
}



-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits

Reply via email to