diff --git a/.codenvy/runners/environments/javaee7-angular/Dockerfile b/.codenvy/runners/environments/javaee7-angular/Dockerfile deleted file mode 100644 index 8dd9f3e..0000000 --- a/.codenvy/runners/environments/javaee7-angular/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM radcortez/codenvy-wildfly - -ENV CODENVY_APP_BIND_DIR /home/user/wildfly/standalone/deployments/ROOT.war - -VOLUME ["/home/user/wildfly/standalone/deployments/ROOT.war"] - -RUN sudo touch ~/wildfly/standalone/deployments/ROOT.war.dodeploy diff --git a/.gitignore b/.gitignore index 00da06d..a989bae 100644 --- a/.gitignore +++ b/.gitignore @@ -75,6 +75,7 @@ node_modules # Users Environment Variables .lock-wscript +.codenvy ### Project src/main/webapp/lib/bower diff --git a/pom.xml b/pom.xml index 2fa8a11..bc61d6b 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,95 @@ 1.1.5 1.1.0.Alpha8 4.1.1 - + 1.7.12 7.0 + + + dev + + true + + + + true + false + + + + integration-test + + + false + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.10 + + + add-integration-test-sources + generate-test-sources + + add-test-source + + + + src/integration-test/java + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + + ${skip.unit.tests} + nl.jrOOn.javaee7angular.category.IntegrationTest + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.19.1 + + + integration-tests + + integration-test + + + + **/*.java + + nl.jrOOn.javaee7angular.category.IntegrationTest + + ${skip.integration.tests} + + + + org.apache.maven.plugins maven-compiler-plugin @@ -165,5 +247,22 @@ ${version.dependency.javaee} provided + + org.slf4j + slf4j-log4j12 + ${slf4j-version} + + + junit + junit + 4.12 + test + + + com.google.guava + guava + 19.0 + test + diff --git a/src/integration-test/java/LoadTest.java b/src/integration-test/java/LoadTest.java new file mode 100644 index 0000000..8a3afaf --- /dev/null +++ b/src/integration-test/java/LoadTest.java @@ -0,0 +1,15 @@ +import nl.jrOOn.javaee7angular.CPULoad; +import org.junit.experimental.categories.Category; + +/** + * Created by jr00n on 20/01/17. + */ +@Category(nl.jrOOn.javaee7angular.category.IntegrationTest.class) +public class LoadTest { + @org.junit.Test + public void cpuLoadTest() throws Exception { + CPULoad load = new CPULoad(); + load.run(new Byte("20")); + + } +} diff --git a/src/integration-test/java/nl/jrOOn/javaee7angular/CPULoad.java b/src/integration-test/java/nl/jrOOn/javaee7angular/CPULoad.java new file mode 100644 index 0000000..a71af6f --- /dev/null +++ b/src/integration-test/java/nl/jrOOn/javaee7angular/CPULoad.java @@ -0,0 +1,17 @@ +package nl.jrOOn.javaee7angular; + +/** + * Created by jr00n on 23/01/17. + */ +public class CPULoad { + public void run(Byte a) throws Exception{ + new Thread() { + public void run() { + for (;;) + ; + } + }.start(); + Thread.sleep(a * 1000); + //System.exit(0); + } +} diff --git a/src/test/java/com/cortez/samples/javaee7angular/PersonTest.java b/src/test/java/com/cortez/samples/javaee7angular/PersonTest.java new file mode 100644 index 0000000..b412d31 --- /dev/null +++ b/src/test/java/com/cortez/samples/javaee7angular/PersonTest.java @@ -0,0 +1,61 @@ +package com.cortez.samples.javaee7angular; + +import com.cortez.samples.javaee7angular.data.Person; +import static org.junit.Assert.*; +import static org.hamcrest.core.Is.is; + + + +/** + * Created by jr00n on 20/01/17. + */ +public class PersonTest { + @org.junit.Test + public void getsetId() throws Exception { + Person person = new Person(); + person.setId(new Long(1)); + assertThat(person.getId(), is(new Long(1))); + } + + @org.junit.Test + public void getsetName() throws Exception { + Person person = new Person(); + person.setName("jrOOn"); + assertThat(person.getName(), is(new String("jrOOn"))); + } + + + @org.junit.Test + public void getsetDescription() throws Exception { + Person person = new Person(); + String description = new String("SuperMan"); + person.setDescription(description); + assertThat(person.getDescription(),is(description)); + } + + + @org.junit.Test + public void getsetImageUrl() throws Exception { + Person person = new Person(); + String url = new String("http://what.ever"); + person.setImageUrl(url); + assertThat(person.getImageUrl(),is(url)); + } + + @org.junit.Test + public void equals() throws Exception { + Person personA = new Person(); + personA.setId(new Long(1)); + Person personB = new Person(); + personB.setId(new Long(2)); + assertThat(personA.equals(personB),is(false)); + } + + @org.junit.Test + public void checkHashCode() throws Exception { + Person person = new Person(); + person.setId(new Long(1)); + assertThat(person.hashCode(), is( 1)); + } + +} \ No newline at end of file diff --git a/src/test/java/nl/jrOOn/javaee7angular/category/IntegrationTest.java b/src/test/java/nl/jrOOn/javaee7angular/category/IntegrationTest.java new file mode 100644 index 0000000..17252ef --- /dev/null +++ b/src/test/java/nl/jrOOn/javaee7angular/category/IntegrationTest.java @@ -0,0 +1,7 @@ +package nl.jrOOn.javaee7angular.category; + +/** + * Created by jr00n on 20/01/17. + */ +public interface IntegrationTest { +}