Author: tchemit Date: 2010-04-06 15:41:31 +0200 (Tue, 06 Apr 2010) New Revision: 1708 Log: add trsts Added: trunk/src/test/java/org/nuiton/license/plugin/repository/LicenseRepositoryTest.java Modified: trunk/src/main/java/org/nuiton/license/plugin/repository/LicenseRepository.java trunk/src/main/java/org/nuiton/license/plugin/repository/LicenseStore.java trunk/src/test/java/org/nuiton/license/plugin/repository/LicenseStoreTest.java Modified: trunk/src/main/java/org/nuiton/license/plugin/repository/LicenseRepository.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/repository/LicenseRepository.java 2010-04-06 13:04:14 UTC (rev 1707) +++ trunk/src/main/java/org/nuiton/license/plugin/repository/LicenseRepository.java 2010-04-06 13:41:31 UTC (rev 1708) @@ -36,7 +36,6 @@ */ public class LicenseRepository { - /** Logger */ private static final Log log = LogFactory.getLog(LicenseRepository.class); @@ -145,9 +144,9 @@ load(); } - public List<License> getLicenses() { + public License[] getLicenses() { checkInit("getLicense"); - return licenses; + return licenses.toArray(new License[licenses.size()]); } public License getLicense(String licenseName) { Modified: trunk/src/main/java/org/nuiton/license/plugin/repository/LicenseStore.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/repository/LicenseStore.java 2010-04-06 13:04:14 UTC (rev 1707) +++ trunk/src/main/java/org/nuiton/license/plugin/repository/LicenseStore.java 2010-04-06 13:41:31 UTC (rev 1708) @@ -6,6 +6,7 @@ import java.io.IOException; import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; import java.util.List; @@ -54,7 +55,7 @@ List<License> result = new ArrayList<License>(); if (repositories != null) { for (LicenseRepository repository : repositories) { - result.addAll(repository.getLicenses()); + result.addAll(Arrays.asList(repository.getLicenses())); } } return result.toArray(new License[result.size()]); Added: trunk/src/test/java/org/nuiton/license/plugin/repository/LicenseRepositoryTest.java =================================================================== --- trunk/src/test/java/org/nuiton/license/plugin/repository/LicenseRepositoryTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/license/plugin/repository/LicenseRepositoryTest.java 2010-04-06 13:41:31 UTC (rev 1708) @@ -0,0 +1,55 @@ +package org.nuiton.license.plugin.repository; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.io.IOException; +import java.net.URL; +import java.util.Arrays; +import java.util.List; + +/** + * Tests {@link LicenseRepository}. + * + * @author tchemit <chemit@codelutin.com> + * @since 2.1 + */ +public class LicenseRepositoryTest { + + public static final List<String> DEFAULT_LICENSES = Arrays.asList( + "apache_v2", + "cddl_v1", + "gpl_v1", + "gpl_v2", + "gpl_v3", + "lgpl_v2_1", + "lgpl_v3", + "mit" + ); + + protected LicenseRepository repository; + + @Before + public void setUp() { + repository = null; + } + + @Test + public void testJarRepository() throws IOException { + + repository = new LicenseRepository(); + URL baseURL = getClass().getResource(LicenseStore.JAR_LICENSE_REPOSITORY); + repository.setBaseURL(baseURL); + repository.load(); + + License[] licenses = repository.getLicenses(); + Assert.assertNotNull(licenses); + Assert.assertEquals(DEFAULT_LICENSES.size(), licenses.length); + + for (String licenseName : DEFAULT_LICENSES) { + License license = repository.getLicense(licenseName); + Assert.assertNotNull(license); + } + } +} Property changes on: trunk/src/test/java/org/nuiton/license/plugin/repository/LicenseRepositoryTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Modified: trunk/src/test/java/org/nuiton/license/plugin/repository/LicenseStoreTest.java =================================================================== --- trunk/src/test/java/org/nuiton/license/plugin/repository/LicenseStoreTest.java 2010-04-06 13:04:14 UTC (rev 1707) +++ trunk/src/test/java/org/nuiton/license/plugin/repository/LicenseStoreTest.java 2010-04-06 13:41:31 UTC (rev 1708) @@ -5,6 +5,7 @@ import org.junit.Test; import java.io.IOException; +import java.util.Arrays; import java.util.List; /** @@ -15,7 +16,8 @@ */ public class LicenseStoreTest { - public static final String[] DEFAULT_LICENSES = {"apache_v2", + public static final List<String> DEFAULT_LICENSES = Arrays.asList( + "apache_v2", "cddl_v1", "gpl_v1", "gpl_v2", @@ -23,9 +25,9 @@ "lgpl_v2_1", "lgpl_v3", "mit" - }; + ); - LicenseStore store; + protected LicenseStore store; @Before public void setUp() { @@ -33,7 +35,7 @@ } @Test - public void testJArRepository() throws IOException { + public void testJarRepository() throws IOException { store = new LicenseStore(); store.init(); @@ -43,9 +45,19 @@ Assert.assertEquals(1, repositories.size()); LicenseRepository repository = repositories.get(0); + License[] licenses1 = repository.getLicenses(); License[] licenses = store.getLicenses(); Assert.assertNotNull(licenses); - Assert.assertEquals(DEFAULT_LICENSES.length, licenses.length); + Assert.assertNotNull(licenses1); + Assert.assertEquals(DEFAULT_LICENSES.size(), licenses.length); + Assert.assertEquals(DEFAULT_LICENSES.size(), licenses1.length); + for (String licenseName : DEFAULT_LICENSES) { + License license = repository.getLicense(licenseName); + License license1 = store.getLicense(licenseName); + Assert.assertNotNull(license); + Assert.assertNotNull(license1); + Assert.assertEquals(license, license1); + } } }