Author: tchemit Date: 2008-10-12 21:44:03 +0000 (Sun, 12 Oct 2008) New Revision: 1175 Modified: maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/JarLicenseResolverTest.java maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/LicenseFactoryTest.java maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/LicenseResolverTest.java Log: use base test class Modified: maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/JarLicenseResolverTest.java =================================================================== --- maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/JarLicenseResolverTest.java 2008-10-12 21:43:43 UTC (rev 1174) +++ maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/JarLicenseResolverTest.java 2008-10-12 21:44:03 UTC (rev 1175) @@ -1,17 +1,12 @@ package org.codelutin.license; -import junit.framework.TestCase; - -import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Map; -import java.util.ArrayList; /** @author chemit */ -public class JarLicenseResolverTest extends TestCase { +public class JarLicenseResolverTest extends BaseLicenseTestCase { - protected String encoding = "utf-8"; - public void testResolv() throws Exception { JarLicenseResolver resolver = new JarLicenseResolver(); @@ -56,7 +51,7 @@ public void testGetLicenseNames() throws Exception { JarLicenseResolver resolver = new JarLicenseResolver(); - Map<String,String> licenseNames = resolver.getLicenseNames(); + Map<String, String> licenseNames = resolver.getLicenseNames(); assertEquals(Arrays.asList("gpl_v1", "gpl_v2", @@ -65,12 +60,5 @@ "lgpl_v3"), new ArrayList<String>(licenseNames.keySet())); } - protected void assertLicenseFound(String name, License license) throws IOException { - System.out.println(license); - assertNotNull(license); - assertEquals(name, license.getName()); - assertNotNull(license.getLicenseContent(encoding)); - assertNotNull(license.getHeaderContent(encoding)); - } } Modified: maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/LicenseFactoryTest.java =================================================================== --- maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/LicenseFactoryTest.java 2008-10-12 21:43:43 UTC (rev 1174) +++ maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/LicenseFactoryTest.java 2008-10-12 21:44:03 UTC (rev 1175) @@ -1,43 +1,77 @@ package org.codelutin.license; -import junit.framework.TestCase; - +import java.io.File; import java.util.Map; /** @author chemit */ -public class LicenseFactoryTest extends TestCase { +public class LicenseFactoryTest extends BaseLicenseTestCase { public void testNewInstance() throws Exception { - LicenseFactory factory = LicenseFactory.newInstance(null); + LicenseFactory factory = LicenseFactory.newInstance(); assertNotNull(factory); - assertEquals(1, factory.resolvers.length); - assertNotNull(factory.resolvers[0]); - assertEquals(JarLicenseResolver.class, factory.resolvers[0].getClass()); + assertEquals(1, factory.resolvers.size()); + assertNotNull(factory.resolvers.get(0)); + assertEquals(JarLicenseResolver.class, factory.resolvers.get(0).getClass()); factory = LicenseFactory.newInstance(""); assertNotNull(factory); - assertEquals(1, factory.resolvers.length); - assertNotNull(factory.resolvers[0]); - assertEquals(JarLicenseResolver.class, factory.resolvers[0].getClass()); + assertEquals(1, factory.resolvers.size()); + assertNotNull(factory.resolvers.get(0)); + assertEquals(JarLicenseResolver.class, factory.resolvers.get(0).getClass()); factory = LicenseFactory.newInstance("yo"); assertNotNull(factory); - assertEquals(2, factory.resolvers.length); - assertNotNull(factory.resolvers[0]); - assertEquals(JarLicenseResolver.class, factory.resolvers[0].getClass()); - assertNotNull(factory.resolvers[1]); - assertEquals(LicenseResolver.class, factory.resolvers[1].getClass()); - assertEquals("yo", factory.resolvers[1].getBaseURL()); + + assertEquals(2, factory.resolvers.size()); + assertNotNull(factory.resolvers.get(0)); + assertEquals(JarLicenseResolver.class, factory.resolvers.get(0).getClass()); + assertNotNull(factory.resolvers.get(1)); + assertEquals(LicenseResolver.class, factory.resolvers.get(1).getClass()); + assertEquals("yo", factory.resolvers.get(1).getBaseURL()); + + factory.addResolver(new LicenseResolver("yo2")); + assertEquals(3, factory.resolvers.size()); + assertNotNull(factory.resolvers.get(0)); + assertEquals(JarLicenseResolver.class, factory.resolvers.get(0).getClass()); + assertNotNull(factory.resolvers.get(1)); + assertEquals(LicenseResolver.class, factory.resolvers.get(1).getClass()); + assertEquals("yo", factory.resolvers.get(1).getBaseURL()); + assertEquals(LicenseResolver.class, factory.resolvers.get(2).getClass()); + assertEquals("yo2", factory.resolvers.get(2).getBaseURL()); + } public void testGetLicenseNames() throws Exception { - LicenseFactory factory = LicenseFactory.newInstance(null); + LicenseFactory factory = LicenseFactory.newInstance(); + int expectedJarResolverLicenses = 5; Map<String, String> licenseNames = factory.getLicenseNames(); //todo make dynamic that test - assertEquals(5, licenseNames.size()); + assertEquals(expectedJarResolverLicenses, licenseNames.size()); + // create a new dummy license repository with a license + File repo = createLicenseRepository(true); + + LicenseResolver resolver = new LicenseResolver(); + resolver.setBaseURL(repo.toURI().toURL().toString()); + + factory.addResolver(resolver); + + licenseNames = factory.getLicenseNames(); + assertEquals(expectedJarResolverLicenses + 1, licenseNames.size()); + + // add a new license to repo + long timestamp = System.currentTimeMillis(); + String licenseName = "dummy2_" + timestamp; + addLicenseToRepository(repo,licenseName); + + factory = LicenseFactory.newInstance(repo.toURI().toURL().toString()); + + licenseNames = factory.getLicenseNames(); + assertEquals(expectedJarResolverLicenses + 2, licenseNames.size()); + } + } Modified: maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/LicenseResolverTest.java =================================================================== --- maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/LicenseResolverTest.java 2008-10-12 21:43:43 UTC (rev 1174) +++ maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/LicenseResolverTest.java 2008-10-12 21:44:03 UTC (rev 1175) @@ -1,16 +1,11 @@ package org.codelutin.license; -import junit.framework.TestCase; -import org.codelutin.util.FileUtil; - import java.io.File; import java.util.Map; /** @author chemit */ -public class LicenseResolverTest extends TestCase { +public class LicenseResolverTest extends BaseLicenseTestCase { - protected String encoding = "utf-8"; - public void testResolvIllegalArgumentException() throws Exception { LicenseResolver resolver = new LicenseResolver(); @@ -65,6 +60,7 @@ } + public void testResolv() throws Exception { LicenseResolver resolver = new LicenseResolver(); @@ -72,51 +68,45 @@ long timestamp = System.currentTimeMillis(); String licenseName = "dummy_" + timestamp; - File file = new File(getBaseDir(), "target" + File.separator + "licenses_" + timestamp); + File repo = createLicenseRepository(false); - resolver.setBaseURL(file.toURI().toURL().toString()); + resolver.setBaseURL(repo.toURI().toURL().toString()); License license; try { - // no licenses.txt + // no licenses.properties resolver.resolv(licenseName); fail(); } catch (IllegalArgumentException e) { assertTrue(true); } - FileUtil.writeString(new File(file, "licenses.properties"), licenseName + "=My dummy license\n", encoding); - license = resolver.resolv(licenseName); - assertNull(license); + addLicenseToRepository(repo, licenseName); + //FileUtil.writeString(new File(repo, "licenses.properties"), licenseName + "=My dummy license\n", encoding); + //license = resolver.resolv(licenseName); + //assertNull(license); + Map<String, String> licenseNames = resolver.getLicenseNames(); assertNotNull(licenseNames); assertEquals(1, licenseNames.size()); assertTrue(licenseNames.containsKey(licenseName)); // create dummy licenses - file = new File(file, licenseName); - file.mkdirs(); - FileUtil.writeString(new File(file, "license.txt"), "license", encoding); - FileUtil.writeString(new File(file, "header.txt"), "header", encoding); - license = resolver.resolv(licenseName); + //File file = new File(repo, licenseName); + //file.mkdirs(); + //FileUtil.writeString(new File(file, "license.txt"), "license", encoding); + //FileUtil.writeString(new File(file, "header.txt"), "header", encoding); + license = resolver.resolv(licenseName); assertNotNull(license); assertEquals(licenseName, license.getName()); assertNotNull(license.getLicenseContent(encoding)); assertNotNull(license.getHeaderContent(encoding)); - assertEquals("license", license.getLicenseContent(encoding)); - assertEquals("header", license.getHeaderContent(encoding)); + assertEquals("license:"+licenseName, license.getLicenseContent(encoding)); + assertEquals("header:"+licenseName, license.getHeaderContent(encoding)); } - protected File getBaseDir() { - String path = System.getenv("basedir"); - if (path == null) { - path = new File("").getAbsolutePath(); - } - return new File(path); - } - } \ No newline at end of file