Skip to content

Commit e6aaff7

Browse files
committed
test
1 parent e9eae30 commit e6aaff7

File tree

10 files changed

+139
-1
lines changed

10 files changed

+139
-1
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,7 @@ Thumbs.db
4141
*.iml
4242
atlassian-ide-plugin.xml
4343
target
44+
/.settings/org.eclipse.m2e.core.prefs
45+
/.settings/org.eclipse.jdt.core.prefs
46+
/.settings/org.eclipse.jdt.apt.core.prefs
47+
/.settings/org.eclipse.core.resources.prefs
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
eclipse.preferences.version=1
2+
encoding//src/main/java=UTF-8
3+
encoding//src/main/resources=UTF-8
4+
encoding//src/test/java=UTF-8
5+
encoding//src/test/resources=UTF-8
6+
encoding/<project>=UTF-8
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.apt.aptEnabled=false

.settings/org.eclipse.jdt.core.prefs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
3+
org.eclipse.jdt.core.compiler.compliance=1.8
4+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
5+
org.eclipse.jdt.core.compiler.processAnnotations=disabled
6+
org.eclipse.jdt.core.compiler.release=disabled
7+
org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.m2e.core.prefs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

src/main/java/guru/springframework/SpringCoreDevOpsApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ public static void main(String[] args) {
1010
SpringApplication.run(SpringCoreDevOpsApplication.class, args);
1111

1212
//this is a whitespace change test
13-
// another test...
13+
// another test...test
1414
}
1515
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package guru.springframework.test.external.props;
2+
3+
import guru.springframework.test.jms.FakeJmsBroker;
4+
import org.junit.Test;
5+
import org.junit.runner.RunWith;
6+
import org.springframework.beans.factory.annotation.Autowired;
7+
import org.springframework.test.context.ContextConfiguration;
8+
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
9+
import test.config.external.props.ExternalPropsPropertySourceTestConfig;
10+
11+
import static org.junit.Assert.assertEquals;
12+
import static org.junit.Assert.assertTrue;
13+
14+
@RunWith(SpringJUnit4ClassRunner.class)
15+
@ContextConfiguration(classes = ExternalPropsPropertySourceTestConfig.class)
16+
public class PropertySourceTest {
17+
18+
@Autowired
19+
FakeJmsBroker fakeJmsBroker;
20+
21+
@Test
22+
public void testPropsSet() throws Exception{
23+
assertEquals("10.10.10.123",fakeJmsBroker.getUrl());
24+
assertEquals("password",fakeJmsBroker.getPassword());
25+
assertEquals("user",fakeJmsBroker.getUser());
26+
assertTrue(3330 == fakeJmsBroker.getPort());
27+
}
28+
}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package guru.springframework.test.jms;
2+
3+
import org.springframework.stereotype.Component;
4+
5+
public class FakeJmsBroker {
6+
private String url;
7+
private Integer port;
8+
private String user;
9+
private String password;
10+
11+
public String getUrl() {
12+
return url;
13+
}
14+
15+
public void setUrl(String url) {
16+
this.url = url;
17+
}
18+
19+
public Integer getPort() {
20+
return port;
21+
}
22+
23+
public void setPort(Integer port) {
24+
this.port = port;
25+
}
26+
27+
public String getUser() {
28+
return user;
29+
}
30+
31+
public void setUser(String user) {
32+
this.user = user;
33+
}
34+
35+
public String getPassword() {
36+
return password;
37+
}
38+
39+
public void setPassword(String password) {
40+
this.password = password;
41+
}
42+
}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package test.config.external.props;
2+
3+
import guru.springframework.test.jms.FakeJmsBroker;
4+
import org.springframework.beans.factory.annotation.Value;
5+
import org.springframework.boot.context.properties.ConfigurationProperties;
6+
import org.springframework.context.annotation.Bean;
7+
import org.springframework.context.annotation.Configuration;
8+
import org.springframework.context.annotation.PropertySource;
9+
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
10+
11+
@Configuration
12+
@PropertySource("classpath:testing.properties")
13+
public class ExternalPropsPropertySourceTestConfig {
14+
15+
@Value("${guru.jms.server}")
16+
String jmsServer;
17+
18+
@Value("${guru.jms.port}")
19+
Integer jmsPort;
20+
21+
@Value("${guru.jms.user}")
22+
String jmsUser;
23+
24+
@Value("${guru.jms.password}")
25+
String jmsPassword;
26+
27+
@Bean
28+
public static PropertySourcesPlaceholderConfigurer properties(){
29+
return new PropertySourcesPlaceholderConfigurer();
30+
}
31+
32+
@Bean
33+
public FakeJmsBroker fakeJmsBroker(){
34+
FakeJmsBroker fakeJmsBroker = new FakeJmsBroker();
35+
fakeJmsBroker.setPassword(jmsPassword);
36+
fakeJmsBroker.setPort(jmsPort);
37+
fakeJmsBroker.setUrl(jmsServer);
38+
fakeJmsBroker.setUser(jmsUser);
39+
return fakeJmsBroker;
40+
}
41+
}

src/test/resources/testing.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
guru.jms.server=10.10.10.123
2+
guru.jms.port=3330
3+
guru.jms.user=user
4+
guru.jms.password=password

0 commit comments

Comments
 (0)