Flyway integration tests fixed #1034

Author: jknack

modules/coverage-report/src/test/java/org/jooby/issues/Issue623.java

@@ -1,14 +1,13 @@
 package org.jooby.issues;
 
-import java.util.Arrays;
-
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigValueFactory;
 import org.flywaydb.core.Flyway;
 import org.jooby.flyway.Flywaydb;
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
 
-import com.typesafe.config.ConfigFactory;
-import com.typesafe.config.ConfigValueFactory;
+import java.util.Arrays;
 
 public class Issue623 extends ServerFeature {
 

modules/jooby-flyway/src/main/java/org/jooby/flyway/Flywaydb.java

@@ -208,6 +208,8 @@
 import com.google.inject.name.Names;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
+import static com.typesafe.config.ConfigFactory.empty;
+import com.typesafe.config.ConfigValueType;
 import static java.util.Objects.requireNonNull;
 import org.flywaydb.core.Flyway;
 import org.jooby.Env;
@@ -356,8 +358,8 @@ public Flywaydb() {
 
   @Override
   public void configure(final Env env, final Config conf, final Binder binder) {
-    Config $base = conf.getConfig("flyway").withoutPath(name);
-    Config $flyway = Try.apply(() -> conf.getConfig("flyway." + name).withFallback($base))
+    Config $base = flyway(conf.getConfig("flyway"));
+    Config $flyway = Try.apply(() -> conf.getConfig(name).withFallback($base))
         .orElse($base);
 
     Flyway flyway = new Flyway();
@@ -377,6 +379,14 @@ public void configure(final Env env, final Config conf, final Binder binder) {
     cmds.forEach(cmd -> cmd.run(flyway));
   }
 
+  private Config flyway(Config conf) {
+    Config flyway = conf.root().entrySet().stream()
+        .filter(it -> it.getValue().valueType() != ConfigValueType.OBJECT)
+        .reduce(empty(), (seed, entry) -> seed.withValue(entry.getKey(), entry.getValue()),
+            Config::withFallback);
+    return flyway;
+  }
+
   @Override
   public Config config() {
     return ConfigFactory.parseResources(getClass(), "flyway.conf");

modules/jooby-servlet/src/main/java/org/jooby/servlet/ServletServletResponse.java

@@ -206,7 +206,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.ByteStreams;
 import static java.util.Objects.requireNonNull;
-import org.jooby.funzy.Try;
 import org.jooby.spi.NativeResponse;
 
 import javax.servlet.AsyncContext;
@@ -282,22 +281,18 @@ public void send(final ByteBuffer buffer) throws Exception {
 
   @Override
   public void send(final FileChannel file) throws Exception {
-    Try.of(file).run(src -> {
-      WritableByteChannel dest = Channels.newChannel(rsp.getOutputStream());
-      src.transferTo(0, src.size(), dest);
-      dest.close();
-      committed = true;
-    }).throwException();
+    send(file, 0, file.size());
   }
 
   @Override
-  public void send(final FileChannel channel, final long position, final long count) {
-    Try.of(channel).run(src -> {
+  public void send(final FileChannel channel, final long position, final long count)
+      throws Exception {
+    try (FileChannel src = channel) {
       WritableByteChannel dest = Channels.newChannel(rsp.getOutputStream());
       src.transferTo(position, count, dest);
       dest.close();
       committed = true;
-    }).throwException();
+    }
   }
 
   @Override

modules/jooby-servlet/src/test/java/org/jooby/servlet/ServletServletResponseTest.java

@@ -1,8 +1,18 @@
 package org.jooby.servlet;
 
+import com.google.common.io.ByteStreams;
 import static org.easymock.EasyMock.expect;
+import org.jooby.funzy.Throwing;
+import org.jooby.test.MockUnit;
 import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
@@ -12,21 +22,9 @@
 import java.util.Collections;
 import java.util.Optional;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jooby.test.MockUnit;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import com.google.common.io.ByteStreams;
-
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ServletServletResponse.class, Channels.class, ByteStreams.class,
-    FileChannel.class })
+    FileChannel.class, Throwing.class, Throwing.Runnable.class})
 public class ServletServletResponseTest {
 
   @Test
@@ -178,7 +176,7 @@ public void sendByteBuffer() throws Exception {
   public void sendFileChannel() throws Exception {
     new MockUnit(HttpServletRequest.class, HttpServletResponse.class, ServletOutputStream.class)
         .expect(unit -> {
-          FileChannel channel = unit.powerMock(FileChannel.class);
+          FileChannel channel = unit.partialMock(FileChannel.class, "transferTo", "close");
           unit.registerMock(FileChannel.class, channel);
         })
         .expect(unit -> {
@@ -192,7 +190,6 @@ public void sendFileChannel() throws Exception {
           expect(Channels.newChannel(output)).andReturn(channel);
 
           expect(fchannel.transferTo(0L, 10L, channel)).andReturn(1L);
-
           fchannel.close();
           channel.close();
 
@@ -209,23 +206,23 @@ public void sendFileChannel() throws Exception {
   public void sendInputStream() throws Exception {
     new MockUnit(HttpServletRequest.class, HttpServletResponse.class, InputStream.class,
         ServletOutputStream.class)
-            .expect(unit -> {
-              InputStream in = unit.get(InputStream.class);
-              ServletOutputStream output = unit.get(ServletOutputStream.class);
+        .expect(unit -> {
+          InputStream in = unit.get(InputStream.class);
+          ServletOutputStream output = unit.get(ServletOutputStream.class);
 
-              unit.mockStatic(ByteStreams.class);
-              expect(ByteStreams.copy(in, output)).andReturn(0L);
+          unit.mockStatic(ByteStreams.class);
+          expect(ByteStreams.copy(in, output)).andReturn(0L);
 
-              output.close();
-              in.close();
+          output.close();
+          in.close();
 
-              HttpServletResponse rsp = unit.get(HttpServletResponse.class);
-              expect(rsp.getOutputStream()).andReturn(output);
-            })
-            .run(unit -> {
-              new ServletServletResponse(unit.get(HttpServletRequest.class),
-                  unit.get(HttpServletResponse.class)).send(unit.get(InputStream.class));
-            });
+          HttpServletResponse rsp = unit.get(HttpServletResponse.class);
+          expect(rsp.getOutputStream()).andReturn(output);
+        })
+        .run(unit -> {
+          new ServletServletResponse(unit.get(HttpServletRequest.class),
+              unit.get(HttpServletResponse.class)).send(unit.get(InputStream.class));
+        });
   }
 
 }