iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #334 from eugenp/inject-mocks-cleanup 

Inject mocks cleanup
This commit is contained in:
David Morley 2016-01-19 06:14:50 -06:00
parent 17c59d8689 423ba80835
commit 699c3d5b3f
6 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
mockito-mocks-spring-beans/pom.xml
View File

@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.baeldung</groupId>
<artifactId>mockito-mocks-spring-beans</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<groupId>com.baeldung</groupId>
<artifactId>mockito-mocks-spring-beans</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>mocks</name>
<description>Injecting Mockito Mocks into Spring Beans</description>
<name>mocks</name>
<description>Injecting Mockito Mocks into Spring Beans</description>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.3.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.3.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>1.3.1.RELEASE</version>
</dependency>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@ -40,16 +40,15 @@
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

2
mockito-mocks-spring-beans/src/main/java/org/baeldung/MocksApplication.java → mockito-mocks-spring-beans/src/main/java/com/baeldung/MocksApplication.java
View File

@ -1,4 +1,4 @@
package org.baeldung;
package com.baeldung;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

4
mockito-mocks-spring-beans/src/main/java/org/baeldung/NameService.java → mockito-mocks-spring-beans/src/main/java/com/baeldung/NameService.java
View File

@ -1,10 +1,10 @@
package org.baeldung;
package com.baeldung;
import org.springframework.stereotype.Service;
@Service
public class NameService {
public String getUserName(String id) {
return "Baeldung";
return "Real user name";
}
}

2
mockito-mocks-spring-beans/src/main/java/org/baeldung/UserService.java → mockito-mocks-spring-beans/src/main/java/com/baeldung/UserService.java
View File

@ -1,4 +1,4 @@
package org.baeldung;
package com.baeldung;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

2
mockito-mocks-spring-beans/src/test/java/org/baeldung/NameServiceTestConfiguration.java → mockito-mocks-spring-beans/src/test/java/com/baeldung/NameServiceTestConfiguration.java
View File

@ -1,4 +1,4 @@
package org.baeldung;
package com.baeldung;
import org.mockito.Mockito;
import org.springframework.context.annotation.Bean;

6
mockito-mocks-spring-beans/src/test/java/org/baeldung/UserServiceTest.java → mockito-mocks-spring-beans/src/test/java/com/baeldung/UserServiceTest.java
View File

@ -1,4 +1,4 @@
package org.baeldung;
package com.baeldung;
import org.junit.Assert;
import org.junit.Test;
@ -22,10 +22,10 @@ public class UserServiceTest {
@Test
public void whenUserIdIsProvided_thenRetrievedNameIsCorrect() {
Mockito.when(nameService.getUserName("SomeId")).thenReturn("Baeldung");
Mockito.when(nameService.getUserName("SomeId")).thenReturn("Mock user name");
String testName = userService.getUserName("SomeId");
Assert.assertEquals("Baeldung", testName);
Assert.assertEquals("Mock user name", testName);
}
}