Skip to content

Commit e426e8e

Browse files
johnmccleanjohnmcclean
committed
tests passing
1 parent d046b2c commit e426e8e

File tree

14 files changed

+48
-24
lines changed

14 files changed

+48
-24
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# Created by https://www.gitignore.io
44
/sigar-lib/
55
sigar-lib/
6+
tomcat.8080/
7+
tomcat.8081/
68

79
### Eclipse ###
810
*.pydevproject

‎micro-tomcat-with-jersey/src/test/java/app/micro/server/servers/AccessLogConfigTest.java renamed to ‎micro-tomcat-with-jersey/src/test/java/app/access/log/micro/server/servers/AccessLogConfigTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
package app.micro.server.servers;
1+
package app.access.log.micro.server.servers;
22

33
import static org.hamcrest.CoreMatchers.is;
44
import static org.junit.Assert.assertThat;
55

66
import java.io.File;
7+
import java.io.IOException;
78

9+
import org.apache.tomcat.util.http.fileupload.FileUtils;
810
import org.junit.After;
911
import org.junit.Before;
1012
import org.junit.Test;
@@ -20,14 +22,15 @@ public class AccessLogConfigTest {
2022
File logFile;
2123

2224
@Before
23-
public void startServer() {
25+
public void startServer() throws InterruptedException, IOException {
2426

2527
logFile = new File(System.getProperty("user.home") + "/access-log-app-access.log");
26-
logFile.delete();
28+
FileUtils.forceDelete(logFile);
2729

2830
assertThat(logFile.exists(), is(false));
2931

3032
server = new MicroserverApp(() -> "access-log-app");
33+
Thread.sleep(1000);
3134
server.start();
3235

3336
}

‎micro-tomcat-with-jersey/src/test/java/app/async/com/aol/micro/server/AsyncAppRunner.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ public class AsyncAppRunner {
2626

2727
MicroserverApp server;
2828
@Before
29-
public void startServer(){
29+
public void startServer() throws InterruptedException{
3030

3131
server = new MicroserverApp( ()-> "async-app");
32+
Thread.sleep(1000);
3233
server.start();
3334

3435
}

‎micro-tomcat-with-jersey/src/test/java/app/blacklisted/com/aol/micro/server/copy/SimpleRunnerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ public class SimpleRunnerTest {
2626

2727
MicroserverApp server;
2828
@Before
29-
public void startServer(){
29+
public void startServer() throws InterruptedException{
3030
server = new MicroserverApp(ConfigurableModule
3131
.builder()
3232
.context("simple-app")
3333
.defaultResources(Arrays.asList(MultiPartFeature.class))
3434
.build());
35-
35+
Thread.sleep(1000);
3636
server.start();
3737

3838
}

‎micro-tomcat-with-jersey/src/test/java/app/embedded/com/aol/micro/server/EmbeddedAppTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
import org.junit.After;
1515
import org.junit.Before;
16+
import org.junit.Ignore;
1617
import org.junit.Test;
1718
import org.springframework.util.concurrent.ListenableFuture;
1819
import org.springframework.util.concurrent.ListenableFutureCallback;
@@ -21,6 +22,7 @@
2122
import com.aol.micro.server.module.EmbeddedModule;
2223
import com.aol.micro.server.testing.RestAgent;
2324

25+
@Ignore //embedded - micro-monolith style doesn't work with Tomcat due to MBean naming collisions
2426
public class EmbeddedAppTest {
2527

2628
RestAgent rest = new RestAgent();

‎micro-tomcat-with-jersey/src/test/java/app/filter/com/aol/micro/server/FilterRunnerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@ public class FilterRunnerTest {
2727

2828
MicroserverApp server;
2929
@Before
30-
public void startServer(){
30+
public void startServer() throws InterruptedException{
3131
Map<String, Filter> filters = HashMapBuilder.<String, Filter>map("/filter-app/status/ping2",new ConfiguredFilter()).build();
3232
server = new MicroserverApp(ConfigurableModule.builder()
3333
.context("filter-app")
3434
.filters(filters )
3535
.requestListeners(Arrays.asList(new org.springframework.web.context.request.RequestContextListener())).build());
36+
Thread.sleep(1000);
3637
server.start();
3738

3839
}

‎micro-tomcat-with-jersey/src/test/java/app/noanno/com/aol/micro/server/copy/NoAnnoRunnerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ public class NoAnnoRunnerTest {
2121

2222
MicroserverApp server;
2323
@Before
24-
public void startServer(){
24+
public void startServer() throws InterruptedException{
2525

2626
server = new MicroserverApp(()-> "simple-app");
27+
Thread.sleep(1000);
2728
server.start();
2829

2930
}

‎micro-tomcat-with-jersey/src/test/java/app/properties/service/com/aol/micro/server/ServicePropertiesTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ public class ServicePropertiesTest {
3030
private String type;
3131
MicroserverApp server;
3232
@Before
33-
public void startServer(){
33+
public void startServer() throws InterruptedException{
3434

3535
server = new MicroserverApp(()-> "minimal-app");
36+
Thread.sleep(1000);
3637
server.start();
3738

3839
}

‎micro-tomcat-with-jersey/src/test/java/app/servlet/com/aol/micro/server/ServletRunnerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ public class ServletRunnerTest {
2424

2525
MicroserverApp server;
2626
@Before
27-
public void startServer(){
27+
public void startServer() throws InterruptedException{
2828
Map<String, Servlet> servlets = new HashMap<>();
2929
servlets.put("/configured", new ConfiguredServlet());
3030
server = new MicroserverApp( AppRunnerLocalMain.class, ConfigurableModule.builder().context("test-app").servlets(servlets ).build());
31+
Thread.sleep(1000);
3132
server.start();
3233

3334
}

‎micro-tomcat-with-jersey/src/test/java/app/simple/com/aol/micro/server/SimpleRunnerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ public class SimpleRunnerTest {
2424

2525
MicroserverApp server;
2626
@Before
27-
public void startServer(){
27+
public void startServer() throws InterruptedException{
2828
server = new MicroserverApp(ConfigurableModule
2929
.builder()
3030
.context("simple-app")
3131
.defaultResources(Arrays.asList(MultiPartFeature.class))
3232
.build());
33-
// server = new MicroserverApp(()-> "simple-app");
33+
Thread.sleep(1000);
3434
server.start();
3535

3636
}

‎micro-tomcat-with-jersey/src/test/java/app/single/serverconfig/com/aol/micro/server/SingleClassTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ public class SingleClassTest implements RestResource{
2828
boolean called;
2929
MicroserverApp server;
3030
@Before
31-
public void startServer(){
31+
public void startServer() throws InterruptedException{
3232
called = false;
3333
server = new MicroserverApp( ConfigurableModule.builder()
3434
.context("hello")
3535
.serverConfigManager(server->called=true)
3636
.build());
37+
Thread.sleep(1000);
3738
server.start();
3839

3940
}

‎micro-tomcat-with-jersey/src/test/java/app/spring/com/aol/micro/server/SpringRunnerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ public MyBean mybean(){
2828

2929
MicroserverApp server;
3030
@Before
31-
public void startServer(){
31+
public void startServer() throws InterruptedException{
3232

3333
server = new MicroserverApp( SpringRunnerTest.class, ()-> "spring-app");
34+
Thread.sleep(1000);
3435
server.start();
3536

3637
}

‎micro-tomcat-with-jersey/src/test/java/app/validation/com/aol/micro/server/ValidationAppTest.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ public class ValidationAppTest {
2727
SimpleReactStream stream;
2828

2929
@Before
30-
public void startServer() {
31-
stream = simpleReact.react(
32-
() -> server = new MicroserverApp(() -> "guava-app")).then(server -> server.start());
30+
public void startServer() throws InterruptedException {
31+
server = new MicroserverApp(() -> "guava-app");
32+
Thread.sleep(1000);
33+
server.start();
34+
3335

3436
entity = ImmutableEntity.builder().value("value").build();
3537

@@ -46,7 +48,9 @@ public void stopServer() {
4648
public void confirmError() throws InterruptedException,
4749
ExecutionException {
4850

49-
stream.block();
51+
52+
//stream.block();
53+
5054
rest.post(
5155
"http://localhost:8080/guava-app/status/ping", null,
5256
ImmutableEntity.class);
@@ -57,7 +61,7 @@ public void confirmError() throws InterruptedException,
5761
public void confirmNoError() throws InterruptedException,
5862
ExecutionException {
5963

60-
stream.block();
64+
//stream.block();
6165
rest.post(
6266
"http://localhost:8080/guava-app/status/ping", entity,
6367
ImmutableEntity.class);

‎readme.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,18 @@
33

44
[![Join the chat at https://gitter.im/aol/micro-server](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/aol/micro-server?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
55

6-
A convenient modular engine for Microservices. Microserver plugins offer seamless integration with Spring (core), Jersey, Guava, Grizzly, reactive programming, Hibernate & Spring Data, Codahale Metrics, Swagger and more to come!
6+
A convenient modular engine for Microservices. Microserver plugins offer seamless integration with Spring (core), Jersey, Guava, Tomcat, Grizzly, reactive programming, Hibernate & Spring Data, Codahale Metrics, Swagger and more to come!
77

88
## Quick start
99

1010
Install Microserver with Grizzly, Jackson and Jersey (Gradle config below)
11-
11+
```groovy
1212
compile group: 'com.aol.microservices', name:'micro-grizzly-with-jersey', version:'x.yz'
13-
13+
```
14+
Install Microserver with Tomcat, Jackson and Jersey (Gradle config below)
15+
```groovy
16+
compile group: 'com.aol.microservices', name:'micro-tomcat-with-jersey', version:'x.yz'
17+
```
1418
Create and run a simple app
1519
```java
1620
@Rest
@@ -60,6 +64,8 @@ Microserver is a zero configuration, standards based, battle hardened library to
6064

6165
* micro-grizzly-with-jersey
6266
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.aol.microservices/micro-grizzly-with-jersey/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.aol.microservices/micro-grizzly-with-jersey)
67+
* micro-tomcat-with-jersey
68+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.aol.microservices/micro-tomcat-with-jersey/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.aol.microservices/micro-tomcat-with-jersey)
6369
* micro-core
6470
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.aol.microservices/micro-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.aol.microservices/micro-core)
6571
* micro-boot
@@ -84,11 +90,11 @@ Microserver is a zero configuration, standards based, battle hardened library to
8490

8591
### Maven dependency
8692

87-
Microserver core
93+
Microserver Grizzly with Jersey
8894
```xml
8995
<dependency>
9096
<groupId>com.aol.microservices</groupId>
91-
<artifactId>micro-core</artifactId>
97+
<artifactId>micro-grizzly-with-jersey</artifactId>
9298
<version>x.yz</version>
9399
</dependency>
94100
```

0 commit comments

Comments
 (0)