Author: tchemit Date: 2010-04-15 13:02:17 +0200 (Thu, 15 Apr 2010) New Revision: 1749 Log: fix tests with uptodate mode Modified: trunk/src/test/java/org/nuiton/license/plugin/UpdateFileHeaderMojoTest.java Modified: trunk/src/test/java/org/nuiton/license/plugin/UpdateFileHeaderMojoTest.java =================================================================== --- trunk/src/test/java/org/nuiton/license/plugin/UpdateFileHeaderMojoTest.java 2010-04-15 10:42:31 UTC (rev 1748) +++ trunk/src/test/java/org/nuiton/license/plugin/UpdateFileHeaderMojoTest.java 2010-04-15 11:02:17 UTC (rev 1749) @@ -85,10 +85,10 @@ execute(true, mojo); Assert.assertEquals(1, process.size()); - if (updates == null) { + if (uptodates == null) { Assert.assertEquals(1, adds.size()); } else { - Assert.assertEquals(1, updates.size()); + Assert.assertEquals(1, uptodates.size()); Assert.assertNull(adds); } content = PluginHelper.readAsString(f, mojo.getEncoding()); @@ -98,10 +98,11 @@ checkPattern(f, content, "Project name : maven-license-plugin-java", true); checkPattern(f, content, "Organization is CodeLutin", true); + // re execute mojo to make sure we are in uptodate execute(false, mojo); Assert.assertEquals(1, process.size()); - Assert.assertEquals(1, updates.size()); + Assert.assertEquals(1, uptodates.size()); int oldLength = content.length(); content = PluginHelper.readAsString(f, mojo.getEncoding()); @@ -110,8 +111,6 @@ Assert.assertEquals(oldLength, newLength); } -// @Ignore - @Test public void all() throws Exception { @@ -121,15 +120,16 @@ execute(true, mojo); Assert.assertEquals(4, process.size()); - if (updates.size() < 2) { + if (uptodates == null) { // first invocation Assert.assertEquals(1, updates.size()); Assert.assertEquals(1, adds.size()); Assert.assertNull(uptodates); } else { - Assert.assertEquals(2, updates.size()); - Assert.assertNull(uptodates); + Assert.assertNotNull(uptodates); + Assert.assertEquals(2, uptodates.size()); Assert.assertNull(adds); + Assert.assertNull(updates); } Assert.assertEquals(1, fails.size()); Assert.assertEquals(1, ignores.size()); @@ -137,10 +137,12 @@ execute(false, mojo); Assert.assertEquals(4, process.size()); - Assert.assertNull(uptodates); + Assert.assertNotNull(uptodates); + Assert.assertNull(updates); // Assert.assertEquals(2, uptodates.size()); - Assert.assertEquals(2, updates.size()); + Assert.assertEquals(2, uptodates.size()); Assert.assertNull(adds); + Assert.assertNull(updates); Assert.assertEquals(1, fails.size()); Assert.assertEquals(1, ignores.size()); @@ -153,8 +155,6 @@ } } -// @Ignore - @Test public void updateLicense() throws Exception { @@ -194,8 +194,9 @@ execute(false, mojo); Assert.assertEquals(1, process.size()); - Assert.assertNull(uptodates); - Assert.assertEquals(1, updates.size()); + Assert.assertNotNull(uptodates); + Assert.assertEquals(1, uptodates.size()); + Assert.assertNull(updates); // Assert.assertEquals(1, uptodates.size()); // Assert.assertNull(updates); @@ -206,8 +207,6 @@ Assert.assertEquals(oldLength, newLength); } -// @Ignore - @Test public void failLicense() throws Exception { @@ -248,9 +247,6 @@ checkPattern(f, content, "License content do NOT update!", true); } - -// @Ignore - @Test public void ignoreLicense() throws Exception { @@ -295,8 +291,6 @@ checkPattern(f, content, "NEVER_FINd_ME!", false); } -// @Ignore - @Test public void skip() throws Exception {