Commit Graph

2425 Commits

Author SHA1 Message Date
Alex Theedom 3efa23b6b5 Merge remote-tracking branch 'origin/master' 2016-07-18 22:29:43 +01:00
Alex Theedom e4a586b53d Add wire mock in order to stub endpoints to test suite 2016-07-18 22:29:12 +01:00
Eugen 6b99ced529 Merge pull request #469 from dogeared/master
Add JJWT tutorial code to the tutorials repo
2016-07-18 16:54:58 +02:00
Slavisa Baeldung d577830362 BAEL-17 - reorganizing objectmapper tests 2016-07-18 13:16:52 +02:00
Slavisa Baeldung a727caec3a Merge branch 'master' into pr/498-ask-das-objectmapper 2016-07-18 12:25:49 +02:00
Slavisa Baeldung ffbd7f0d0d Merge remote-tracking branch 'origin/pr/498' into pr/498-ask-das-objectmapper
Conflicts:
	jackson/src/test/java/com/baeldung/jackson/objectmapper/JavaToJsonExample.java
	jackson/src/test/java/com/baeldung/jackson/objectmapper/JsonAdvancedCustomSerializeExample.java
	jackson/src/test/java/com/baeldung/jackson/objectmapper/JsonAdvancedJsonNodeExample.java
	jackson/src/test/java/com/baeldung/jackson/objectmapper/JsonArrayExample.java
	jackson/src/test/java/com/baeldung/jackson/objectmapper/JsonDateExample.java
	jackson/src/test/java/com/baeldung/jackson/objectmapper/JsonMapExample.java
	jackson/src/test/java/com/baeldung/jackson/objectmapper/JsonParserExample.java
	jackson/src/test/java/com/baeldung/jackson/objectmapper/JsonToJavaExample.java
	jackson/src/test/java/com/baeldung/jackson/objectmapper/JsonToJsonNode.java
2016-07-18 12:25:34 +02:00
Álvaro Fernández González c738c9ed77 Code for deepening on expectations (#511)
* 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.

* Fix

* Add interface for tests.

* Test for any.

* Test for with.

* Test for null.

* Test for times.

* Test for arg that.

* Test for result and returns.

* Test for delegate.
2016-07-18 09:39:15 +03:00
Grzegorz Piwowarek e883cf63a1 Refactor mvc-velocity examples 2016-07-17 22:21:16 +03:00
Raquel Garrido 1f5f1c6a48 Test added for mvc - velocity (#510)
* dom4j

* added more parsers

* StaxParser

* Jaxb binding

* Jaxb binding

* Finish article

* apply some changes

* Organize imports

* remove dependency

* Tutorial spring-mvc with velocity templates

* velocity with spring mvc

* tests
2016-07-17 21:41:41 +03:00
Alex Theedom 15abd8ef52 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	apache-cxf/pom.xml
2016-07-17 12:10:21 +01:00
Alex Theedom a03168a187 Merge pull request #509 from egimaben/master
added maven project for rest assured tutorial
2016-07-17 11:53:50 +01:00
egimaben 86a37c79c8 added maven project for rest assured tutorial 2016-07-17 13:15:36 +03:00
Ashanka Das eaa32bdb41 Refs #BAEL-17 : Test objectMapper. 2016-07-17 01:52:45 +02:00
Ashanka Das f14f2af421 Refs #BAEL-17 code for objectmapper. Added JUnit Test cases. 2016-07-17 01:19:44 +02:00
Alex Theedom ca7181c6df Merge pull request #506 from eugenp/grzegorz-list
Add list assertions example
2016-07-16 11:57:52 +01:00
Grzegorz Piwowarek 57ca431415 Add list assertions example 2016-07-16 10:51:50 +03:00
tomjoebob 5d411fb2cf Merge pull request #505 from chernykhalexander/master
Added Spring Boot Startets module
2016-07-15 16:48:25 -06:00
Chernykh Alexander 5b28a3c19a fixed whitespaces 2016-07-16 01:47:48 +03:00
chernykhalexander e3c28f6dcd merge into spring-boot module 2016-07-16 01:38:48 +03:00
Chernykh Alexander c960c2f2a8 cleaned up whitespaces 2016-07-16 01:05:19 +03:00
Chernykh Alexander 3b8ec66168 removed module from pom.xml 2016-07-16 01:02:56 +03:00
chernykhalexander 0944745a02 comment out spring-boot-starters module in parent pom.xml 2016-07-16 00:51:09 +03:00
chernykhalexander 6fa4a43d39 added spring boot starters module 2016-07-16 00:48:09 +03:00
Zeger Hendrikse 1a812c42ba Merge branch 'nguyennamthai-cxf_spring' 2016-07-15 13:45:10 +02:00
Zeger Hendrikse ca889aec41 Replaced tabs by spaces 2016-07-15 13:08:52 +02:00
Zeger Hendrikse a7b1b46e60 Replaced tabs by spaces 2016-07-15 13:02:13 +02:00
Zeger Hendrikse 97ba59c59f Replaced tabs by spaces 2016-07-15 12:54:28 +02:00
Zeger Hendrikse 835119464b Merge branch 'cxf_spring' of https://github.com/nguyennamthai/tutorials into nguyennamthai-cxf_spring 2016-07-15 11:11:54 +02:00
Grzegorz Piwowarek 2113974e1c Refactor spring-controller 2016-07-14 23:05:25 +03:00
prashant1067 0f6218ec91 adding spring controller changes (#493)
* adding spring controller changes

* changing package name to baledung

* removing test package

* adding changes in pom for spring junit testing

* adding test classes for controller

* adding equals and hashcode for student for test cases

* adding changes for running test cases
2016-07-14 22:45:56 +03:00
slavisa-baeldung 5b3afb4c0d Merge pull request #502 from forketyfork/master
Removed spring-4.3 from the main module
2016-07-14 16:49:15 +02:00
Slavisa Baeldung 1d896e5e96 NOJIRA - removing missing module form main pom.xml 2016-07-14 16:45:24 +02:00
Сергей Петунин 506740b328 Removed spring-4.3 from the main module 2016-07-14 19:34:31 +05:00
Thai Nguyen 9f27df367f Apache CXF with Spring 2016-07-14 20:38:34 +07:00
Sergey Petunin b5a3fabb75 Moved spring-4.3 project into spring-all (#500)
* Moved spring-4.3 project into spring-all

* Removed spring-4.3 project
2016-07-14 16:27:31 +03:00
Slavisa Baeldung eb1afcbb2c Merge branch 'pr/496-gregorz-collectors' 2016-07-14 15:04:20 +02:00
Slavisa Baeldung ea9cb32d6c BAEL-28 - Updating article URLs 2016-07-14 15:03:51 +02:00
Slavisa Baeldung c44644b6d8 BAEL-17 - reformatting code 2016-07-14 14:57:59 +02:00
Slavisa Baeldung 7fcdee3918 BAEL-145 - fixing production URL 2016-07-14 14:52:28 +02:00
Grzegorz Piwowarek af92969515 Fix import 2016-07-14 10:20:47 +03:00
Micah Silverman 674471df16 refactored variable names 2016-07-14 03:01:25 -04:00
Grzegorz Piwowarek 77d37f2a88 Refactor Java8 examples 2016-07-14 10:00:07 +03:00
Eugen 2340f39a14 Merge pull request #475 from KevinGilmore/master
Code snippets for Couchbase SDK Intro
2016-07-14 09:49:58 +03:00
Micah Silverman ea4fbe920c updated ignoringAntMatchers for csrf 2016-07-14 02:00:04 -04:00
Sergey Petunin 7e8f3e6f15 Code samples and tests for the article "What's New in Spring 4.3?" (#497)
* Spring 4.3

New features in Spring 4.3

* Added Spring-4.3 as a new module

Added Spring-4.3 as a new module.

* Adding read file

Adding read file

* Re-written examples as tests

* Added attribute annotations and default methods
2016-07-14 07:55:57 +03:00
Micah Silverman 4a4c4f3c7c updated HomeController to reflect new secrets endpoints. 2016-07-14 00:42:16 -04:00
Micah Silverman 2f6b1ca318 Moved TextCodec.BASE64.decode calls into service. Refactored method names to drive home that you're getting bytes back. 2016-07-14 00:09:53 -04:00
Micah Silverman 6bd3b381d1 Added SecretService for managing good secrets. Updated all secret operations to use SecretService. Added controller to return and set secrets. 2016-07-13 23:23:21 -04:00
Kevin Gilmore 6d61497eec Merge remote-tracking branch 'upstream/master' 2016-07-13 19:53:45 -05:00
Kevin Gilmore fca98463d4 BAEL-201: Using Couchbase SDK in a Spring Application 2016-07-13 19:53:08 -05:00