Solving #31

Remove references to WarFile
Move and adjust tests for WarFile into GenericMojoTests
Fix bug, missing "s" on  ".ebextensions"
Delete WarFile and tests

pom.xml

@@ -141,10 +141,6 @@
  <artifactId>guava</artifactId>
  <version>18.0</version>
  </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
  <dependency>
  <groupId>org.yaml</groupId>
  <artifactId>snakeyaml</artifactId>

src/main/java/com/jcabi/beanstalk/maven/plugin/AbstractBeanstalkMojo.java

@@ -178,8 +178,6 @@ public void execute() throws MojoFailureException {
  try {
  final ZipFile zipFile = this.createZipFile();
  this.validate(zipFile);
- final WarFile warFile = this.createWarFile(zipFile);
- this.validateWarFile(warFile);
  zipFile.close();
  } catch (final IOException ex) {
  throw new MojoFailureException(
@@ -213,15 +211,6 @@ public void execute() throws MojoFailureException {
  }
  }
 
- /**
- * Creates a {@link WarFile} out of the {@link ZipFile}.
- * @param zipfile The zip file.
- * @return WarFile the war file.
- */
- protected WarFile createWarFile(final ZipFile zipfile) {
- return new WarFile(zipfile);
- }
-
  /**
  * Creates a {@link ZipFile} out of the war.
  * @return ZipFile the zip file
@@ -231,16 +220,6 @@ protected ZipFile createZipFile() throws IOException {
  return new ZipFile(this.war);
  }
 
- /**
- * Validate {@link WarFile} given.
- * @param warfile The war file
- * @throws MojoFailureException Throw in case of validation error.
- */
- protected void validateWarFile(final WarFile warfile)
- throws MojoFailureException {
- warfile.checkEbextensionsValidity();
- }
-
  /**
  * Creates server crecentials.
  * @return Server credentials based on settings and server attributes.
@@ -335,23 +314,26 @@ protected boolean validYaml(final String text) {
  }
 
  /**
- * Validate the war file.
- *
+ * Verifies that the .ebextensions contains valid configuration file or
+ * files.
  * @param zip Zip file
- * @throws org.apache.maven.plugin.MojoFailureException Thrown, if
- * validation fails.
+ * @throws org.apache.maven.plugin.MojoFailureException Thrown, if the
+ * .ebextensions does not exist in the WAR file, is empty or one of its
+ * files is neither valid JSON, nor valid YAML.
  */
  protected void validate(final ZipFile zip) throws MojoFailureException {
- if (zip.getEntry(".ebextension") == null) {
+ if (zip.getEntry(".ebextensions") == null) {
  throw new MojoFailureException(
  ".ebextensions directory does not exist in the WAR file"
  );
  }
  final Enumeration<? extends ZipEntry> entries = zip.entries();
+ int files = 0;
  while (entries.hasMoreElements()) {
  final ZipEntry entry = entries.nextElement();
  if (entry.getName().startsWith(".ebextensions/")
  && !entry.isDirectory()) {
+ files += 1;
  final String text = this.readFile(zip, entry);
  if (this.validJson(text) || this.validYaml(text)) {
  continue;
@@ -366,6 +348,11 @@ protected void validate(final ZipFile zip) throws MojoFailureException {
  );
  }
  }
+ if (files < 1) {
+ throw new MojoFailureException(
+ ".ebextensions contains no config files."
+ );
+ }
  }
 
  /**

src/test/java/com/jcabi/beanstalk/maven/plugin/GenericMojoTest.java

@@ -30,7 +30,13 @@
 package com.jcabi.beanstalk.maven.plugin;
 
 import java.io.File;
+import java.io.FileOutputStream;
+import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+import org.apache.maven.plugin.MojoFailureException;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -72,8 +78,6 @@ public void executesSuccessfully() throws Exception {
  mojo.execute();
  Mockito.verify(mojo).createZipFile();
  Mockito.verify(mojo).validate(mockZipFile);
- Mockito.verify(mojo).createWarFile(mockZipFile);
- Mockito.verify(mojo).validateWarFile(Mockito.any(WarFile.class));
  Mockito.verify(mojo).createServerCredentials();
  Mockito.verify(mockZipFile).close();
  Mockito.verify(mockFile, Mockito.times(2)).exists();
@@ -147,4 +151,78 @@ public void validatesGoodYaml() throws Exception {
  )
  );
  }
+
+ /**
+ * Verifies that execute throws an exception, if there is no .ebextensions
+ * directory in the WAR file.
+ * @throws Exception Thrown in case of error.
+ */
+ @Test
+ public void checkEbextensionsValidityThrowsExceptionNoDir()
+ throws Exception {
+ // @checkstyle IllegalTypeCheck (2 lines)
+ final AbstractBeanstalkMojo mojo =
+ Mockito.mock(AbstractBeanstalkMojo.class);
+ final File mockFile = Mockito.mock(File.class);
+ final ZipFile mockZipFile = Mockito.mock(ZipFile.class);
+ Mockito.when(mockFile.exists()).thenReturn(true);
+ Mockito.when(mojo.createZipFile()).thenReturn(mockZipFile);
+ Mockito.doCallRealMethod().when(mojo).execute();
+ Mockito.doCallRealMethod().when(mojo)
+ .setWar(Mockito.any(File.class));
+ Mockito.doCallRealMethod().when(mojo)
+ .validate(Mockito.any(ZipFile.class));
+ mojo.setWar(mockFile);
+ Mockito.when(mockZipFile.getEntry(".ebextensions")).thenReturn(null);
+ try {
+ mojo.execute();
+ Assert.fail("Expect MojoFailureException to be thrown");
+ } catch (final MojoFailureException exception) {
+ MatcherAssert.assertThat(
+ exception.getMessage(),
+ Matchers.equalTo(
+ ".ebextensions directory does not exist in the WAR file"
+ )
+ );
+ }
+ }
+
+ /**
+ * Verifies that execute throws an exception, if the .ebextensions directory
+ * is empty.
+ * @throws Exception Thrown in case of error.
+ */
+ @Test
+ @SuppressWarnings("unchecked")
+ public void checkEbextensionsValidityThrowsExceptionNoConfigFiles()
+ throws Exception {
+ // @checkstyle IllegalTypeCheck (2 lines)
+ final AbstractBeanstalkMojo mojo =
+ Mockito.mock(AbstractBeanstalkMojo.class);
+ Mockito.doCallRealMethod().when(mojo).execute();
+ Mockito.doCallRealMethod().when(mojo).createZipFile();
+ Mockito.doCallRealMethod().when(mojo)
+ .setWar(Mockito.any(File.class));
+ Mockito.doCallRealMethod().when(mojo)
+ .validate(Mockito.any(ZipFile.class));
+ final File temp = File.createTempFile("test", ".zip");
+ final FileOutputStream fos = new FileOutputStream(temp);
+ final ZipOutputStream out = new ZipOutputStream(fos);
+ out.putNextEntry(new ZipEntry(".ebextensions/"));
+ out.flush();
+ out.close();
+ fos.flush();
+ fos.close();
+ mojo.setWar(temp);
+ try {
+ mojo.execute();
+ } catch (final MojoFailureException exception) {
+ MatcherAssert.assertThat(
+ exception.getMessage(),
+ Matchers.equalTo(
+ ".ebextensions contains no config files."
+ )
+ );
+ }
+ }
 }