Skip to content

Commit f4e8f82

Browse files
jknackjknack
committed
Few more unit test + travis + coverall config
1 parent 1153660 commit f4e8f82

File tree

29 files changed

+823
-295
lines changed

29 files changed

+823
-295
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ language: java
22
jdk:
33
- oraclejdk8
44
after_success:
5-
- mvn clean cobertura:cobertura coveralls:cobertura
5+
- mvn clean package -P coverage
6+
- mvn coveralls:report

‎jooby-hbm/src/main/java/org/jooby/hbm/Hbm.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder;
4949
import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
5050
import org.jooby.Body;
51-
import org.jooby.Mode;
51+
import org.jooby.Env;
5252
import org.jooby.Request;
5353
import org.jooby.Response;
5454
import org.jooby.Route;
@@ -92,7 +92,7 @@ public Config config() {
9292
}
9393

9494
@Override
95-
public void configure(final Mode mode, final Config config, final Binder binder)
95+
public void configure(final Env mode, final Config config, final Binder binder)
9696
throws Exception {
9797
Logger log = LoggerFactory.getLogger(getClass());
9898

‎jooby-hbs/src/main/java/org/jooby/hbs/Hbs.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import org.jooby.Body;
3131
import org.jooby.Jooby;
32-
import org.jooby.Mode;
32+
import org.jooby.Env;
3333
import org.jooby.View;
3434

3535
import com.github.jknack.handlebars.Context;
@@ -106,7 +106,7 @@ public Hbs() {
106106
}
107107

108108
@Override
109-
public void configure(final Mode mode, final Config config, final Binder binder)
109+
public void configure(final Env mode, final Config config, final Binder binder)
110110
throws Exception {
111111

112112
TemplateCache cache = mode

‎jooby-jackson/src/main/java/org/jooby/jackson/Json.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.jooby.Body;
3535
import org.jooby.Jooby;
3636
import org.jooby.MediaType;
37-
import org.jooby.Mode;
37+
import org.jooby.Env;
3838

3939
import com.fasterxml.jackson.databind.Module;
4040
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -127,7 +127,7 @@ public Json configure(final Consumer<ObjectMapper> configurer) {
127127
}
128128

129129
@Override
130-
public void configure(final Mode mode, final Config config, final Binder binder) {
130+
public void configure(final Env mode, final Config config, final Binder binder) {
131131
Locale locale = Locale.forLanguageTag(config.getString("application.lang").replace("_", "-"));
132132
// Jackson clone the date format in order to make dateFormat thread-safe
133133
mapper.setDateFormat(new SimpleDateFormat(config.getString("application.dateFormat"), locale));

‎jooby-jdbc/src/main/java/org/jooby/jdbc/Jdbc.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import javax.sql.DataSource;
3232

3333
import org.jooby.Jooby;
34-
import org.jooby.Mode;
34+
import org.jooby.Env;
3535

3636
import com.google.inject.Binder;
3737
import com.google.inject.Key;
@@ -62,7 +62,7 @@ public Jdbc() {
6262
}
6363

6464
@Override
65-
public void configure(final Mode mode, final Config config, final Binder binder)
65+
public void configure(final Env mode, final Config config, final Binder binder)
6666
throws Exception {
6767
this.ds = newDataSource(dbName, dbConfig(dbName, config));
6868

‎jooby-jdbc/src/test/java/org/jooby/jdbc/JdbcTest.java‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import javax.sql.DataSource;
1818

1919
import org.easymock.Capture;
20-
import org.jooby.Mode;
20+
import org.jooby.Env;
2121
import org.junit.Test;
2222

2323
import com.google.inject.Binder;
@@ -34,7 +34,7 @@ public class JdbcTest {
3434
@SuppressWarnings("unchecked")
3535
@Test
3636
public void memdb() throws Exception {
37-
Mode mode = mode("dev");
37+
Env mode = mode("dev");
3838
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
3939
Binder binder = createMock(Binder.class);
4040

@@ -69,7 +69,7 @@ public void memdb() throws Exception {
6969
@SuppressWarnings("unchecked")
7070
@Test
7171
public void fsdb() throws Exception {
72-
Mode mode = mode("dev");
72+
Env mode = mode("dev");
7373
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
7474
Binder binder = createMock(Binder.class);
7575

@@ -111,7 +111,7 @@ public void fsdb() throws Exception {
111111
@SuppressWarnings("unchecked")
112112
@Test
113113
public void dbPropertyCanBeJustURL() throws Exception {
114-
Mode mode = mode("dev");
114+
Env mode = mode("dev");
115115
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
116116
Binder binder = createMock(Binder.class);
117117

@@ -147,7 +147,7 @@ public void dbPropertyCanBeJustURL() throws Exception {
147147
@SuppressWarnings("unchecked")
148148
@Test
149149
public void dbHashMustHaveURLwhenMoreDetailsAreProvided() throws Exception {
150-
Mode mode = mode("dev");
150+
Env mode = mode("dev");
151151
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
152152
Binder binder = createMock(Binder.class);
153153

@@ -184,7 +184,7 @@ public void dbHashMustHaveURLwhenMoreDetailsAreProvided() throws Exception {
184184
@SuppressWarnings("unchecked")
185185
@Test
186186
public void derby() throws Exception {
187-
Mode mode = mode("dev");
187+
Env mode = mode("dev");
188188
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
189189
Binder binder = createMock(Binder.class);
190190

@@ -223,7 +223,7 @@ public void derby() throws Exception {
223223
@SuppressWarnings("unchecked")
224224
@Test
225225
public void db2() throws Exception {
226-
Mode mode = mode("dev");
226+
Env mode = mode("dev");
227227
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
228228
Binder binder = createMock(Binder.class);
229229

@@ -260,7 +260,7 @@ public void db2() throws Exception {
260260
@SuppressWarnings("unchecked")
261261
@Test
262262
public void hsql() throws Exception {
263-
Mode mode = mode("dev");
263+
Env mode = mode("dev");
264264
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
265265
Binder binder = createMock(Binder.class);
266266

@@ -297,7 +297,7 @@ public void hsql() throws Exception {
297297
@SuppressWarnings("unchecked")
298298
@Test
299299
public void mariadb() throws Exception {
300-
Mode mode = mode("dev");
300+
Env mode = mode("dev");
301301
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
302302
Binder binder = createMock(Binder.class);
303303

@@ -334,7 +334,7 @@ public void mariadb() throws Exception {
334334
@SuppressWarnings("unchecked")
335335
@Test
336336
public void mysql() throws Exception {
337-
Mode mode = mode("dev");
337+
Env mode = mode("dev");
338338
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
339339
Binder binder = createMock(Binder.class);
340340

@@ -383,7 +383,7 @@ public void mysql() throws Exception {
383383
@SuppressWarnings("unchecked")
384384
@Test
385385
public void dbspecific() throws Exception {
386-
Mode mode = mode("dev");
386+
Env mode = mode("dev");
387387
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
388388
Binder binder = createMock(Binder.class);
389389

@@ -436,7 +436,7 @@ public void dbspecific() throws Exception {
436436
@SuppressWarnings("unchecked")
437437
@Test
438438
public void hikariDefaultsDev() throws Exception {
439-
Mode mode = mode("dev");
439+
Env mode = mode("dev");
440440
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
441441
Binder binder = createMock(Binder.class);
442442

@@ -484,7 +484,7 @@ public void hikariDefaultsDev() throws Exception {
484484
@SuppressWarnings("unchecked")
485485
@Test
486486
public void hikariOverrideDefaults() throws Exception {
487-
Mode mode = mode("dev");
487+
Env mode = mode("dev");
488488
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
489489
Binder binder = createMock(Binder.class);
490490

@@ -540,7 +540,7 @@ public void hikariOverrideDefaults() throws Exception {
540540
@SuppressWarnings("unchecked")
541541
@Test
542542
public void overrideDataSource() throws Exception {
543-
Mode mode = mode("dev");
543+
Env mode = mode("dev");
544544
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
545545
Binder binder = createMock(Binder.class);
546546

@@ -578,7 +578,7 @@ public void overrideDataSource() throws Exception {
578578
@SuppressWarnings("unchecked")
579579
@Test
580580
public void twoDatabases() throws Exception {
581-
Mode mode = mode("dev");
581+
Env mode = mode("dev");
582582
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
583583
Binder binder = createMock(Binder.class);
584584

@@ -615,7 +615,7 @@ public void twoDatabases() throws Exception {
615615
@SuppressWarnings("unchecked")
616616
@Test
617617
public void sqlserver() throws Exception {
618-
Mode mode = mode("dev");
618+
Env mode = mode("dev");
619619
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
620620
Binder binder = createMock(Binder.class);
621621

@@ -655,7 +655,7 @@ public void sqlserver() throws Exception {
655655
@SuppressWarnings("unchecked")
656656
@Test
657657
public void oracle() throws Exception {
658-
Mode mode = mode("dev");
658+
Env mode = mode("dev");
659659
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
660660
Binder binder = createMock(Binder.class);
661661

@@ -695,7 +695,7 @@ public void oracle() throws Exception {
695695
@SuppressWarnings("unchecked")
696696
@Test
697697
public void pgsql() throws Exception {
698-
Mode mode = mode("dev");
698+
Env mode = mode("dev");
699699
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
700700
Binder binder = createMock(Binder.class);
701701

@@ -735,7 +735,7 @@ public void pgsql() throws Exception {
735735
@SuppressWarnings("unchecked")
736736
@Test
737737
public void postgresql() throws Exception {
738-
Mode mode = mode("dev");
738+
Env mode = mode("dev");
739739
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
740740
Binder binder = createMock(Binder.class);
741741

@@ -775,7 +775,7 @@ public void postgresql() throws Exception {
775775
@SuppressWarnings("unchecked")
776776
@Test
777777
public void sybase() throws Exception {
778-
Mode mode = mode("dev");
778+
Env mode = mode("dev");
779779
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
780780
Binder binder = createMock(Binder.class);
781781

@@ -815,7 +815,7 @@ public void sybase() throws Exception {
815815
@SuppressWarnings("unchecked")
816816
@Test
817817
public void firebirdsql() throws Exception {
818-
Mode mode = mode("dev");
818+
Env mode = mode("dev");
819819
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
820820
Binder binder = createMock(Binder.class);
821821

@@ -855,7 +855,7 @@ public void firebirdsql() throws Exception {
855855
@SuppressWarnings("unchecked")
856856
@Test
857857
public void sqlite() throws Exception {
858-
Mode mode = mode("dev");
858+
Env mode = mode("dev");
859859
Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
860860
Binder binder = createMock(Binder.class);
861861

@@ -910,8 +910,13 @@ private static void withHikariConfig(final Provider<DataSource> provider,
910910
asserts.accept(hikariConfig, hikariConfig.getDataSourceProperties());
911911
}
912912

913-
private static Mode mode(final String name) {
914-
return new Mode() {
913+
private static Env mode(final String name) {
914+
return new Env() {
915+
916+
@Override
917+
public Config config() {
918+
return ConfigFactory.empty();
919+
}
915920

916921
@Override
917922
public String name() {

‎jooby-tests/src/main/java/org/jooby/test/JoobyRunner.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import javax.inject.Singleton;
2828

2929
import org.jooby.Jooby;
30-
import org.jooby.Mode;
30+
import org.jooby.Env;
3131
import org.jooby.internal.Server;
3232
import org.junit.runners.BlockJUnit4ClassRunner;
3333
import org.junit.runners.model.InitializationError;
@@ -72,7 +72,7 @@ private void start(final Class<?> klass) throws InitializationError {
7272
app = (Jooby) appClass.newInstance();
7373
app.use(new Jooby.Module() {
7474
@Override
75-
public void configure(final Mode mode, final Config config, final Binder binder)
75+
public void configure(final Env mode, final Config config, final Binder binder)
7676
throws Exception {
7777
OptionalBinder.newOptionalBinder(binder, Server.class).setBinding()
7878
.to(NoJoinServer.class)

‎jooby-tests/src/test/java/org/jooby/test/ConfigPropertiesFeature.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import javax.inject.Named;
1111

1212
import org.apache.http.client.fluent.Request;
13-
import org.jooby.Mode;
13+
import org.jooby.Env;
1414
import org.jooby.mvc.GET;
1515
import org.jooby.mvc.Path;
1616
import org.junit.Test;
@@ -28,13 +28,13 @@ public static class Resource {
2828
private Charset charset;
2929
private Integer intprop;
3030
private String stringprop;
31-
private Mode mode;
31+
private Env mode;
3232
private List<String> list;
3333
private Letter letter;
3434
private UUID uuid;
3535

3636
@Inject
37-
public Resource(final Charset charset, final Mode mode,
37+
public Resource(final Charset charset, final Env mode,
3838
@Named("intprop") final int intprop,
3939
@Named("stringprop") final String stringprop,
4040
@Named("list") final List<String> list,

‎jooby-tests/src/test/java/org/jooby/test/ConfigWithModuleFeature.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class ConfigWithModuleFeature extends ServerFeature {
1717

1818
use(ConfigFactory.empty()
1919
.withValue("application.secret", ConfigValueFactory.fromAnyRef("123"))
20-
.withValue("application.mode", ConfigValueFactory.fromAnyRef("mode")));
20+
.withValue("application.env", ConfigValueFactory.fromAnyRef("prod")));
2121
}
2222

2323
@Test

‎jooby-tests/src/test/java/org/jooby/test/ContentNegotiationFeature.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.jooby.Body;
77
import org.jooby.Jooby;
88
import org.jooby.MediaType;
9-
import org.jooby.Mode;
9+
import org.jooby.Env;
1010
import org.jooby.Status;
1111
import org.jooby.View;
1212
import org.jooby.mvc.Consumes;
@@ -51,7 +51,7 @@ public String json() {
5151
use(new Jooby.Module() {
5252

5353
@Override
54-
public void configure(final Mode mode, final Config config, final Binder binder)
54+
public void configure(final Env mode, final Config config, final Binder binder)
5555
throws Exception {
5656
Multibinder.newSetBinder(binder, Body.Formatter.class)
5757
.addBinding().toInstance(BodyConverters.toHtml);

0 commit comments

Comments
 (0)