Skip to content

Commit 417a98e

Browse files
committed
Merge branch 'master' into add_katalon
2 parents 64daa67 + 8d3e2bd commit 417a98e

File tree

9 files changed

+169
-6
lines changed

9 files changed

+169
-6
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.jamais404.models;
2+
3+
public class CommentTest {
4+
5+
// No methods to test in Comment class
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
package com.jamais404.models;
2+
3+
import static org.junit.jupiter.api.Assertions.assertFalse;
4+
import static org.junit.jupiter.api.Assertions.assertTrue;
5+
6+
import java.util.ArrayList;
7+
import java.util.List;
8+
9+
import com.jamais404.auth.repository.PageRepository;
10+
import com.jamais404.model.*;
11+
12+
import org.junit.jupiter.api.Test;
13+
import org.springframework.beans.factory.annotation.Autowired;
14+
15+
public class PageTest {
16+
17+
@Test
18+
public void getAPageFromAUser_ReturnTrue() {
19+
User user = new User();
20+
Page page = new Page();
21+
page.setOwner(user);
22+
23+
assertTrue(page.getOwner().equals(user));
24+
}
25+
26+
@Test
27+
public void getAllPageFromAUser_ReturnTrue() {
28+
User user = new User();
29+
user.setEmail("[email protected]");
30+
user.setUsername("testuser");
31+
user.setPassword("testtest");
32+
33+
List<Page> pages = new ArrayList<>();
34+
35+
Page page1 = new Page();
36+
page1.setName("Page1");
37+
page1.setOwner(user);
38+
pages.add(page1);
39+
40+
Page page2 = new Page();
41+
page2.setName("Page2");
42+
page2.setOwner(user);
43+
pages.add(page2);
44+
45+
Page page3 = new Page();
46+
page3.setName("Page3");
47+
page3.setOwner(user);
48+
pages.add(page3);
49+
50+
int count = 0;
51+
for (Page page : pages) {
52+
if (page.getOwner().equals(user)) {
53+
++count;
54+
}
55+
}
56+
57+
assertTrue(pages.size() == count);
58+
}
59+
60+
@Test
61+
public void getAPageFromUserNotOwner_ReturnFalse() {
62+
User user = new User();
63+
User anyone = new User();
64+
Page page = new Page();
65+
page.setOwner(anyone);
66+
67+
assertFalse(page.getOwner().equals(user));
68+
}
69+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.jamais404.models;
2+
3+
public class RoleTest {
4+
// No methods to test in Role class
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.jamais404.models;
2+
3+
public class UserTest {
4+
5+
// No methods to test in User class
6+
}
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
/Users/qtipee/Documents/HES/Bachelor_3/JEE/jamais404/jamais404/src/test/java/com/jamais404/models/PageTest.java
12
/Users/qtipee/Documents/HES/Bachelor_3/JEE/jamais404/jamais404/src/test/java/com/jamais404/Jamais404ApplicationTests.java
3+
/Users/qtipee/Documents/HES/Bachelor_3/JEE/jamais404/jamais404/src/test/java/com/jamais404/models/CommentTest.java
4+
/Users/qtipee/Documents/HES/Bachelor_3/JEE/jamais404/jamais404/src/test/java/com/jamais404/models/UserTest.java
5+
/Users/qtipee/Documents/HES/Bachelor_3/JEE/jamais404/jamais404/src/test/java/com/jamais404/models/RoleTest.java

jamais404/target/surefire-reports/TEST-com.jamais404.Jamais404ApplicationTests.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.jamais404.Jamais404ApplicationTests" time="6.627" tests="1" errors="0" skipped="0" failures="0">
2+
<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.jamais404.Jamais404ApplicationTests" time="18.099" tests="1" errors="0" skipped="0" failures="0">
33
<properties>
44
<property name="gopherProxySet" value="false"/>
55
<property name="awt.toolkit" value="sun.lwawt.macosx.LWCToolkit"/>
@@ -18,7 +18,7 @@
1818
<property name="sun.java.launcher" value="SUN_STANDARD"/>
1919
<property name="user.country" value="GB"/>
2020
<property name="sun.boot.library.path" value="/Library/Java/JavaVirtualMachines/jdk-10.0.2.jdk/Contents/Home/lib"/>
21-
<property name="sun.java.command" value="/Users/qtipee/Documents/HES/Bachelor_3/JEE/jamais404/jamais404/target/surefire/surefirebooter15581598481103704639.jar /Users/qtipee/Documents/HES/Bachelor_3/JEE/jamais404/jamais404/target/surefire 2020-04-17T19-54-54_652-jvmRun1 surefire10068017428901251462tmp surefire_011645901517414149363tmp"/>
21+
<property name="sun.java.command" value="/Users/qtipee/Documents/HES/Bachelor_3/JEE/jamais404/jamais404/target/surefire/surefirebooter5127349397592710627.jar /Users/qtipee/Documents/HES/Bachelor_3/JEE/jamais404/jamais404/target/surefire 2020-04-23T11-45-19_544-jvmRun1 surefire7527101422542988337tmp surefire_07045709601662294892tmp"/>
2222
<property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
2323
<property name="jdk.debug" value="release"/>
2424
<property name="surefire.test.class.path" value="/Users/qtipee/Documents/HES/Bachelor_3/JEE/jamais404/jamais404/target/test-classes:/Users/qtipee/Documents/HES/Bachelor_3/JEE/jamais404/jamais404/target/classes:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-starter-data-jpa/2.2.4.RELEASE/spring-boot-starter-data-jpa-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-starter-aop/2.2.4.RELEASE/spring-boot-starter-aop-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/aspectj/aspectjweaver/1.9.5/aspectjweaver-1.9.5.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-starter-jdbc/2.2.4.RELEASE/spring-boot-starter-jdbc-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/com/zaxxer/HikariCP/3.4.2/HikariCP-3.4.2.jar:/Users/qtipee/.m2/repository/org/springframework/spring-jdbc/5.2.3.RELEASE/spring-jdbc-5.2.3.RELEASE.jar:/Users/qtipee/.m2/repository/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1.jar:/Users/qtipee/.m2/repository/jakarta/persistence/jakarta.persistence-api/2.2.3/jakarta.persistence-api-2.2.3.jar:/Users/qtipee/.m2/repository/jakarta/transaction/jakarta.transaction-api/1.3.3/jakarta.transaction-api-1.3.3.jar:/Users/qtipee/.m2/repository/org/hibernate/hibernate-core/5.4.10.Final/hibernate-core-5.4.10.Final.jar:/Users/qtipee/.m2/repository/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar:/Users/qtipee/.m2/repository/org/javassist/javassist/3.24.0-GA/javassist-3.24.0-GA.jar:/Users/qtipee/.m2/repository/net/bytebuddy/byte-buddy/1.10.6/byte-buddy-1.10.6.jar:/Users/qtipee/.m2/repository/antlr/antlr/2.7.7/antlr-2.7.7.jar:/Users/qtipee/.m2/repository/org/jboss/jandex/2.1.1.Final/jandex-2.1.1.Final.jar:/Users/qtipee/.m2/repository/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar:/Users/qtipee/.m2/repository/org/dom4j/dom4j/2.1.1/dom4j-2.1.1.jar:/Users/qtipee/.m2/repository/org/hibernate/common/hibernate-commons-annotations/5.1.0.Final/hibernate-commons-annotations-5.1.0.Final.jar:/Users/qtipee/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.2/jaxb-runtime-2.3.2.jar:/Users/qtipee/.m2/repository/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.jar:/Users/qtipee/.m2/repository/com/sun/istack/istack-commons-runtime/3.0.8/istack-commons-runtime-3.0.8.jar:/Users/qtipee/.m2/repository/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.jar:/Users/qtipee/.m2/repository/com/sun/xml/fastinfoset/FastInfoset/1.2.16/FastInfoset-1.2.16.jar:/Users/qtipee/.m2/repository/org/springframework/data/spring-data-jpa/2.2.4.RELEASE/spring-data-jpa-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/data/spring-data-commons/2.2.4.RELEASE/spring-data-commons-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/spring-orm/5.2.3.RELEASE/spring-orm-5.2.3.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/spring-context/5.2.3.RELEASE/spring-context-5.2.3.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/spring-tx/5.2.3.RELEASE/spring-tx-5.2.3.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/spring-beans/5.2.3.RELEASE/spring-beans-5.2.3.RELEASE.jar:/Users/qtipee/.m2/repository/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar:/Users/qtipee/.m2/repository/org/springframework/spring-aspects/5.2.3.RELEASE/spring-aspects-5.2.3.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-starter-security/2.2.4.RELEASE/spring-boot-starter-security-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-starter/2.2.4.RELEASE/spring-boot-starter-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-starter-logging/2.2.4.RELEASE/spring-boot-starter-logging-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar:/Users/qtipee/.m2/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar:/Users/qtipee/.m2/repository/org/apache/logging/log4j/log4j-to-slf4j/2.12.1/log4j-to-slf4j-2.12.1.jar:/Users/qtipee/.m2/repository/org/apache/logging/log4j/log4j-api/2.12.1/log4j-api-2.12.1.jar:/Users/qtipee/.m2/repository/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar:/Users/qtipee/.m2/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar:/Users/qtipee/.m2/repository/org/yaml/snakeyaml/1.25/snakeyaml-1.25.jar:/Users/qtipee/.m2/repository/org/springframework/spring-aop/5.2.3.RELEASE/spring-aop-5.2.3.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/security/spring-security-config/5.2.1.RELEASE/spring-security-config-5.2.1.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/security/spring-security-web/5.2.1.RELEASE/spring-security-web-5.2.1.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/spring-expression/5.2.3.RELEASE/spring-expression-5.2.3.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-starter-thymeleaf/2.2.4.RELEASE/spring-boot-starter-thymeleaf-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE.jar:/Users/qtipee/.m2/repository/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE.jar:/Users/qtipee/.m2/repository/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar:/Users/qtipee/.m2/repository/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar:/Users/qtipee/.m2/repository/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-starter-web/2.2.4.RELEASE/spring-boot-starter-web-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-starter-json/2.2.4.RELEASE/spring-boot-starter-json-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.10.2/jackson-databind-2.10.2.jar:/Users/qtipee/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.10.2/jackson-annotations-2.10.2.jar:/Users/qtipee/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.10.2/jackson-core-2.10.2.jar:/Users/qtipee/.m2/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.10.2/jackson-datatype-jdk8-2.10.2.jar:/Users/qtipee/.m2/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.10.2/jackson-datatype-jsr310-2.10.2.jar:/Users/qtipee/.m2/repository/com/fasterxml/jackson/module/jackson-module-parameter-names/2.10.2/jackson-module-parameter-names-2.10.2.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-starter-tomcat/2.2.4.RELEASE/spring-boot-starter-tomcat-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.30/tomcat-embed-core-9.0.30.jar:/Users/qtipee/.m2/repository/org/apache/tomcat/embed/tomcat-embed-el/9.0.30/tomcat-embed-el-9.0.30.jar:/Users/qtipee/.m2/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.30/tomcat-embed-websocket-9.0.30.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-starter-validation/2.2.4.RELEASE/spring-boot-starter-validation-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar:/Users/qtipee/.m2/repository/org/hibernate/validator/hibernate-validator/6.0.18.Final/hibernate-validator-6.0.18.Final.jar:/Users/qtipee/.m2/repository/org/springframework/spring-web/5.2.3.RELEASE/spring-web-5.2.3.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/spring-webmvc/5.2.3.RELEASE/spring-webmvc-5.2.3.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-devtools/2.2.4.RELEASE/spring-boot-devtools-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot/2.2.4.RELEASE/spring-boot-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-autoconfigure/2.2.4.RELEASE/spring-boot-autoconfigure-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/mysql/mysql-connector-java/8.0.19/mysql-connector-java-8.0.19.jar:/Users/qtipee/.m2/repository/org/springframework/security/spring-security-test/5.2.1.RELEASE/spring-security-test-5.2.1.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/security/spring-security-core/5.2.1.RELEASE/spring-security-core-5.2.1.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/spring-core/5.2.3.RELEASE/spring-core-5.2.3.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/spring-jcl/5.2.3.RELEASE/spring-jcl-5.2.3.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/spring-test/5.2.3.RELEASE/spring-test-5.2.3.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-starter-test/2.2.4.RELEASE/spring-boot-starter-test-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-test/2.2.4.RELEASE/spring-boot-test-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.2.4.RELEASE/spring-boot-test-autoconfigure-2.2.4.RELEASE.jar:/Users/qtipee/.m2/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar:/Users/qtipee/.m2/repository/net/minidev/json-smart/2.3/json-smart-2.3.jar:/Users/qtipee/.m2/repository/net/minidev/accessors-smart/1.2/accessors-smart-1.2.jar:/Users/qtipee/.m2/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar:/Users/qtipee/.m2/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2.jar:/Users/qtipee/.m2/repository/org/junit/jupiter/junit-jupiter/5.5.2/junit-jupiter-5.5.2.jar:/Users/qtipee/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.5.2/junit-jupiter-api-5.5.2.jar:/Users/qtipee/.m2/repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar:/Users/qtipee/.m2/repository/org/junit/platform/junit-platform-commons/1.5.2/junit-platform-commons-1.5.2.jar:/Users/qtipee/.m2/repository/org/junit/jupiter/junit-jupiter-params/5.5.2/junit-jupiter-params-5.5.2.jar:/Users/qtipee/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.5.2/junit-jupiter-engine-5.5.2.jar:/Users/qtipee/.m2/repository/org/junit/vintage/junit-vintage-engine/5.5.2/junit-vintage-engine-5.5.2.jar:/Users/qtipee/.m2/repository/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar:/Users/qtipee/.m2/repository/org/junit/platform/junit-platform-engine/1.5.2/junit-platform-engine-1.5.2.jar:/Users/qtipee/.m2/repository/junit/junit/4.12/junit-4.12.jar:/Users/qtipee/.m2/repository/org/mockito/mockito-junit-jupiter/3.1.0/mockito-junit-jupiter-3.1.0.jar:/Users/qtipee/.m2/repository/org/assertj/assertj-core/3.13.2/assertj-core-3.13.2.jar:/Users/qtipee/.m2/repository/org/hamcrest/hamcrest/2.1/hamcrest-2.1.jar:/Users/qtipee/.m2/repository/org/mockito/mockito-core/3.1.0/mockito-core-3.1.0.jar:/Users/qtipee/.m2/repository/net/bytebuddy/byte-buddy-agent/1.10.6/byte-buddy-agent-1.10.6.jar:/Users/qtipee/.m2/repository/org/objenesis/objenesis/2.6/objenesis-2.6.jar:/Users/qtipee/.m2/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar:/Users/qtipee/.m2/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar:/Users/qtipee/.m2/repository/org/xmlunit/xmlunit-core/2.6.3/xmlunit-core-2.6.3.jar:"/>
@@ -35,13 +35,13 @@
3535
<property name="java.specification.name" value="Java Platform API Specification"/>
3636
<property name="java.vm.specification.vendor" value="Oracle Corporation"/>
3737
<property name="java.awt.graphicsenv" value="sun.awt.CGraphicsEnvironment"/>
38-
<property name="surefire.real.class.path" value="/Users/qtipee/Documents/HES/Bachelor_3/JEE/jamais404/jamais404/target/surefire/surefirebooter15581598481103704639.jar"/>
38+
<property name="surefire.real.class.path" value="/Users/qtipee/Documents/HES/Bachelor_3/JEE/jamais404/jamais404/target/surefire/surefirebooter5127349397592710627.jar"/>
3939
<property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
4040
<property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
4141
<property name="java.runtime.version" value="10.0.2+13"/>
4242
<property name="user.name" value="qtipee"/>
4343
<property name="path.separator" value=":"/>
44-
<property name="os.version" value="10.15.3"/>
44+
<property name="os.version" value="10.15.4"/>
4545
<property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
4646
<property name="file.encoding" value="UTF-8"/>
4747
<property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
@@ -63,5 +63,5 @@
6363
<property name="java.class.version" value="54.0"/>
6464
<property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
6565
</properties>
66-
<testcase name="contextLoads" classname="com.jamais404.Jamais404ApplicationTests" time="0.411"/>
66+
<testcase name="contextLoads" classname="com.jamais404.Jamais404ApplicationTests" time="0.213"/>
6767
</testsuite>

0 commit comments

Comments
 (0)