Index: lutinutil/src/test/org/codelutin/util/ResourceTest.java diff -u lutinutil/src/test/org/codelutin/util/ResourceTest.java:1.5 lutinutil/src/test/org/codelutin/util/ResourceTest.java:1.6 --- lutinutil/src/test/org/codelutin/util/ResourceTest.java:1.5 Fri Sep 17 15:48:17 2004 +++ lutinutil/src/test/org/codelutin/util/ResourceTest.java Thu Nov 4 13:51:54 2004 @@ -1,5 +1,5 @@ /* *##% -* Copyright (C) 2002, 2003 Code Lutin +* Copyright (C) 2002, 2003, 2004 Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,21 +23,23 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.5 $ +* @version $Revision: 1.6 $ * -* Mise a jour: $Date: 2004/09/17 15:48:17 $ -* par : $Author: mazelier $ +* Mise a jour: $Date: 2004/11/04 13:51:54 $ +* par : $Author: bpoussin $ */ package org.codelutin.util; +import java.io.File; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.List; import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import junit.framework.TestResult; -import java.util.ArrayList; -import java.io.File; -import java.net.URLClassLoader; +import junit.framework.TestSuite; public class ResourceTest extends TestCase { // ResourceTest @@ -52,41 +54,52 @@ ResourceTest.class.getResource("/bin/java")); } - public void testGetURLsFile() throws Exception { + public void testGetURL()throws Exception { + URL url = null; + + url = Resource.getURL("bin/java"); + assertTrue(url != null); + + url = Resource.getURL("/bin/java"); + assertTrue(url != null); + + } + + public void testGetURLsFromDirectory() throws Exception { ArrayList list = new ArrayList(); File repository = new File(System.getProperty("java.home")); // test lorsqu'aucun fichier du repertoire ne correspond au pattern - assertEquals(list, Resource.getURLs(repository, ".*.aucunFichierTrouve")); + assertEquals(list, Resource.getURLsFromDirectory(repository, ".*.aucunFichierTrouve")); File file = new File(repository, "bin" + File.separator + "java"); list.add(file.toURI().toURL()); // test qui prouve que la methode retourne le bon fichier - assertEquals(list, Resource.getURLs(new File(repository, "bin"), ".*" + File.separator + ".a.a$")); + assertEquals(list, Resource.getURLsFromDirectory(new File(repository, "bin"), ".*" + File.separator + ".a.a$")); // test qui prouve la recursivite (va chercher en profondeur les fichiers) - assertEquals(list, Resource.getURLs(repository, ".*" + File.separator + "j.v.$")); + assertEquals(list, Resource.getURLsFromDirectory(repository, ".*" + File.separator + "j.v.$")); } - public void testGetURLsClassLoader() throws Exception { - - URLClassLoader classLoader = null; - ArrayList list = new ArrayList(); + public void testGetURLsFromJar() throws Exception { + File repository = new File(System.getProperty("java.home")); + File file = new File(repository, "lib" + File.separator + "rt.jar"); - // test lorsqu'aucun fichier du repertoire ne correspond au pattern - //assertEquals(list, Resource.getURLs(classLoader, ".*Resource.xml")); + List result = Resource.getURLsFromJar(file, ".*BigDecimal.*"); + assertEquals(1, result.size()); + } - // File jar = new File("target/lutinutil-0.8-uber.jar"); - // File file = new File(jar, "WORLDS-INF/lib/lutinutil-0.8.jar!/org/codelutin/util/Resource.class"); - // list.add(file.toURI().toURL()); + public void testGetURLs() throws Exception { + System.out.println(java.util.Arrays.asList(((URLClassLoader)ClassLoader.getSystemClassLoader()).getURLs())); - //assertEquals(list, Resource.getURLs(classLoader, ".*Resource.class")); + List result = null; - } + result = Resource.getURLs(".*bin/java"); + System.out.println(result); - public static Test suite() { - return new TestSuite(ResourceTest.class); + result = Resource.getURLs("META-INF/MANIFEST.MF"); + System.out.println(result); } } // ResourceTest