Commit Graph
2275 Commits
Author SHA1 Message Date
Slavisa Baeldung 1a11364e57 BAEL-38 - Minor changes 2016-07-08 09:57:47 +02:00
Slavisa Baeldung 16295e6f7b Merge branch 'master' into pr/470-alexB-logging 2016-07-08 09:52:23 +02:00
Slavisa Baeldung 57ebe60697 Merge remote-tracking branch 'origin/pr/470' into pr/470-alexB-logging
Conflicts:
	log4j/pom.xml
	log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
	log4j/src/main/java/com/baeldung/logback/LogbackExample.java
	log4j/src/main/resources/log4j.xml
	log4j/src/main/resources/log4j2.xml
	log4j/src/main/resources/logback.xml
	pom.xml
2016-07-08 09:51:18 +02:00
Grzegorz Piwowarek 9257da4b44 Use interface instead of the implementation 2016-07-07 22:45:39 +02:00
Slavisa Baeldung 30f00a34af BAEL-65 - moving from sout to logger 2016-07-07 15:43:53 +02:00
slavisa-baeldung 5733676887 Merge pull request #481 from GuenHamza/master
BAEL-63 - Add Stored Procedures with Hibernate Tests
2016-07-07 15:42:31 +02:00
GuenHamza 11bc145948 Update README.md - added link to stored procedure article 2016-07-07 03:38:09 +00:00
GuenHamza 7eb04b4ea5 Added Foo stored procedures tests 2016-07-07 03:32:37 +00:00
GuenHamza 95e6cb16d7 Added named queries to Foo Model 2016-07-07 03:30:06 +00:00
GuenHamza ff4b5d26b0 Removed SQL file, to move to resources folder 2016-07-07 03:28:12 +00:00
GuenHamza 2fff05a4b5 Added SQL file to insert stored procedures in the MySQL database 2016-07-07 03:27:03 +00:00
GuenHamza 551272306e Added SQL file to insert stored procedures in the MySQL database 2016-07-07 03:25:28 +00:00
Slavisa Baeldung 3b9e4c7a56 BAEL-151 - Adding EL dependency 2016-07-06 13:24:52 +02:00
Slavisa Baeldung eb244dd0e6 Merge remote-tracking branch 'origin/master' 2016-07-06 13:15:47 +02:00
slavisa-baeldung e3b1d3a8dc Merge pull request #478 from k0l0ssus/master
JSF Page to demo EL intro
2016-07-06 11:48:21 +02:00
Grzegorz Piwowarek 10b5780576 Fix typo 2016-07-06 09:40:50 +02:00
Álvaro Fernández González 710182ff92 Code for JMockit 101 (#479)
* Add new module for mocks comparison.

* Add sources for testing.

* Changes on testCase.

* Enter some tests for mockito.

* More tests for Mockito.

* Even more tests.

* Add the rest of the mocking libraries.

* Javadoc on test.

* Test bare bones for EasyMock.

* Fist kind of test and setup.

* Add tests using EasyMock with a change on LoginService.

* Create LoginControllerTest.java

* Test setup

* [JMockit] No method called test.

* [JMockit] Two methods called test.

* [JMockit] One method called test.

* [JMockit] Exception mock test

* [JMockit] Mocked object to pass around test.

* [JMockit] Custom matcher test.

* [JMockit] Partial mocking test.

* [JMockit] Fix with IDE.

* Not stubs. Mocks. MOCKS!!!

* Remove unnecesary import.

* Use correct encoding. Was having problems with buildings.

* Remove failing module.

* Create new module mocks and move mock-comparisons there.

* Add jmockit module.

* Add model class.

* Add collaborator class.

* Add performer class.

* Add performer test.
2016-07-06 09:36:46 +02:00
Sergey Petunin 89373cd1eb Samples for the Intro to QueryDSL article, merged with existing querydsl module. Updated module dependencies. (#476) 2016-07-05 21:44:00 +02:00
k0l0ssus 8a19546b1a Add files via upload
Page to demo EL examples
2016-07-05 00:57:27 -04:00
k0l0ssus 8d768c6bd2 Merge pull request #1 from k0l0ssus/k0l0ssus-elintro
Add files via upload
2016-07-05 00:54:53 -04:00
k0l0ssus 2f4079ddf2 Add files via upload
Backing bean to support el intro article
2016-07-05 00:53:43 -04:00
oborkovskyi 980a3bdd33 Added async 2016-07-04 15:12:25 +03:00
Grzegorz Piwowarek 010c6b3ace Refactor multimap example 2016-07-04 13:30:34 +02:00
Alex Theedom b0565a2882 Mkae minor amendments to make tests pass 2016-07-03 12:35:08 +01:00
Alex Theedom 8f929a7ba5 Merge branches 'assertj-guava' and 'master' of https://github.com/eugenp/tutorials 2016-07-03 12:24:01 +01:00
Alex Theedom 1bd48846f8 Merge pull request #473 from egimaben/master
added hamcrest api tutorial
2016-07-03 12:21:35 +01:00
Grzegorz Piwowarek a9a5a3d79f Add examples 2016-07-02 21:13:59 +02:00
egimaben 06dd18a184 added hamcrest api tutorial 2016-07-01 21:21:30 +03:00
Alex Theedom f78ba65664 Put code under test in own package 2016-07-01 18:57:58 +01:00
Alex Theedom da0cd158e7 Reformat code style 2016-07-01 18:48:43 +01:00