Skip to content

Commit b67751f

Browse files
working on #228, working on #225, working on #42, working on #230
1 parent dda08f3 commit b67751f

File tree

14 files changed

+178
-130
lines changed

14 files changed

+178
-130
lines changed

.gitignore

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ buildNumber.properties
1212
!/.mvn/wrapper/maven-wrapper.jar
1313

1414
.idea
15-
*.iml
1615
twitterwall.log
1716
twitterwall.log*
1817
maven-build.log
@@ -21,6 +20,18 @@ maven-testing.log.txt
2120
spring-boot.log.txt
2221
maven-testing-site.log.txt
2322
test.log.txt
23+
24+
test/twitterwall.log.txt
25+
test/twitterwall.log.txt*
26+
test/maven-build.log
27+
test/maven-build.log.txt
28+
test/maven-testing.log.txt
29+
test/spring-boot.log.txt
30+
test/maven-testing-site.log.txt
31+
test/test.log.txt
32+
33+
.m2
34+
2435
docs2
2536
docs-site-deployed
2637
.bundle

src/main/resources/application.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ info:
1818
groupId: @project.groupId@
1919
name: @project.name@
2020
version: @project.version@
21-
#logging:
22-
# file: twitterwall.log
21+
logging:
22+
file: test/twitterwall.log.txt
2323
management:
2424
address: 127.0.0.1
2525
context-path: "/manage"

src/test/java/org/woehlke/twitterwall/frontend/controller/LoginControllerTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.woehlke.twitterwall.frontend.controller;
22

33

4+
import org.junit.Ignore;
45
import org.junit.Test;
56
import org.junit.runner.RunWith;
67
import org.slf4j.Logger;
78
import org.slf4j.LoggerFactory;
89
import org.springframework.beans.factory.annotation.Autowired;
910
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
1011
import org.springframework.boot.test.context.SpringBootTest;
11-
import org.springframework.test.annotation.Commit;
1212
import org.springframework.test.context.junit4.SpringRunner;
1313
import org.springframework.test.web.servlet.MockMvc;
1414
import org.woehlke.twitterwall.Application;
@@ -28,7 +28,6 @@ public class LoginControllerTest {
2828
@Autowired
2929
private MockMvc mockMvc;
3030

31-
//@Commit
3231
@Test
3332
public void controllerIsPresentTest(){
3433
log.info("controllerIsPresentTest");
@@ -37,7 +36,7 @@ public void controllerIsPresentTest(){
3736

3837

3938
//TODO: #218 https://github.com/phasenraum2010/twitterwall2/issues/218
40-
//@Commit
39+
@Ignore
4140
@Test
4241
public void login() throws Exception {
4342
boolean ok = true;

src/test/java/org/woehlke/twitterwall/oodm/entities/HashTagTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
public class HashTagTest implements DomainObjectMinimalTest {
77

8-
//TODO: #197 https://github.com/phasenraum2010/twitterwall2/issues/197
98
@Test
109
@Override
1110
public void getUniqueIdTest() throws Exception {
@@ -20,7 +19,6 @@ public void getUniqueIdTest() throws Exception {
2019
Assert.assertEquals(msg,text,hashTag.getUniqueId());
2120
}
2221

23-
//TODO: #197 https://github.com/phasenraum2010/twitterwall2/issues/197
2422
@Test
2523
@Override
2624
public void isValidTest() throws Exception {

src/test/java/org/woehlke/twitterwall/oodm/entities/MediaTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
public class MediaTest implements DomainObjectMinimalTest {
77

8-
//TODO: #197 https://github.com/phasenraum2010/twitterwall2/issues/197
98
@Test
109
@Override
1110
public void getUniqueIdTest() throws Exception {
@@ -31,7 +30,6 @@ public void getUniqueIdTest() throws Exception {
3130
Assert.assertEquals(msg,expectedUniqueId2,medium2.getUniqueId());
3231
}
3332

34-
//TODO: #197 https://github.com/phasenraum2010/twitterwall2/issues/197
3533
@Test
3634
@Override
3735
public void isValidTest() throws Exception {

src/test/java/org/woehlke/twitterwall/oodm/entities/MentionTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ public class MentionTest implements DomainObjectMinimalTest {
99

1010
private static final Logger log = LoggerFactory.getLogger(MentionTest.class);
1111

12-
//TODO: #197 https://github.com/phasenraum2010/twitterwall2/issues/197
1312
@Test
1413
@Override
1514
public void getUniqueIdTest() throws Exception {
@@ -45,9 +44,7 @@ public void getUniqueIdTest() throws Exception {
4544
Assert.assertEquals(msg,expectedUniqueId3,mention3.getUniqueId());
4645
}
4746

48-
//TODO: #197 https://github.com/phasenraum2010/twitterwall2/issues/197
4947
@Test
50-
//@Override
5148
public void isValidTest() throws Exception {
5249
String msg = "isValidTest: ";
5350

src/test/java/org/woehlke/twitterwall/oodm/entities/TickerSymbolTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ public class TickerSymbolTest implements DomainObjectMinimalTest {
99

1010
private static final Logger log = LoggerFactory.getLogger(TickerSymbolTest.class);
1111

12-
//TODO: #197 https://github.com/phasenraum2010/twitterwall2/issues/197
1312
@Test
1413
@Override
1514
public void getUniqueIdTest() throws Exception {
@@ -36,7 +35,6 @@ public void getUniqueIdTest() throws Exception {
3635
Assert.assertEquals(msg,myUniqueId2,tickerSymbol2.getUniqueId());
3736
}
3837

39-
//TODO: #197 https://github.com/phasenraum2010/twitterwall2/issues/197
4038
@Test
4139
@Override
4240
public void isValidTest() throws Exception {

src/test/java/org/woehlke/twitterwall/oodm/entities/UrlCacheTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
public class UrlCacheTest implements DomainObjectMinimalTest {
77

8-
//TODO: #197 https://github.com/phasenraum2010/twitterwall2/issues/197
98
@Test
109
@Override
1110
public void getUniqueIdTest() throws Exception {
@@ -21,7 +20,6 @@ public void getUniqueIdTest() throws Exception {
2120
Assert.assertEquals(msg,urlUrl,url.getUniqueId());
2221
}
2322

24-
//TODO: #197 https://github.com/phasenraum2010/twitterwall2/issues/197
2523
@Test
2624
@Override
2725
public void isValidTest() throws Exception {

src/test/java/org/woehlke/twitterwall/oodm/service/MediaServiceTest.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,28 @@
1010
import org.springframework.data.domain.Page;
1111
import org.springframework.data.domain.PageRequest;
1212
import org.springframework.data.domain.Pageable;
13-
import org.springframework.test.annotation.Commit;
1413
import org.springframework.test.context.junit4.SpringRunner;
15-
import org.springframework.transaction.annotation.Propagation;
16-
import org.springframework.transaction.annotation.Transactional;
1714
import org.woehlke.twitterwall.conf.properties.TestdataProperties;
1815
import org.woehlke.twitterwall.oodm.entities.Media;
1916

2017
@RunWith(SpringRunner.class)
2118
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
22-
//@Transactional(propagation= Propagation.REQUIRES_NEW,readOnly=false)
2319
public class MediaServiceTest {
2420

2521
private static final Logger log = LoggerFactory.getLogger(MediaServiceTest.class);
2622

2723
@Autowired
2824
private MediaService mediaService;
2925

30-
//TODO: #198 https://github.com/phasenraum2010/twitterwall2/issues/198
3126
@Autowired
3227
private TestdataProperties testdataProperties;
3328

34-
//@Commit
3529
@Test
3630
public void areDependenciesLoaded() throws Exception {
3731
Assert.assertNotNull(mediaService);
3832
Assert.assertNotNull(testdataProperties);
3933
}
4034

41-
//@Commit
4235
@Test
4336
public void fetchTestData() throws Exception {
4437
String msg = "fetchTestData: ";
@@ -56,7 +49,6 @@ public void fetchTestData() throws Exception {
5649
}
5750
}
5851

59-
//@Commit
6052
@Test
6153
public void findByIdTwitter() throws Exception {
6254
String msg = "findByIdTwitter: ";
@@ -76,7 +68,6 @@ public void findByIdTwitter() throws Exception {
7668
}
7769
}
7870

79-
//@Commit
8071
@Test
8172
public void findByUrl() throws Exception {
8273
String msg = "findByUrl: ";

src/test/java/org/woehlke/twitterwall/oodm/service/TaskHistoryServiceTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,28 @@
1010
import org.springframework.data.domain.Page;
1111
import org.springframework.data.domain.PageRequest;
1212
import org.springframework.data.domain.Pageable;
13-
import org.springframework.test.annotation.Commit;
1413
import org.springframework.test.context.junit4.SpringRunner;
15-
import org.springframework.transaction.annotation.Propagation;
16-
import org.springframework.transaction.annotation.Transactional;
1714
import org.woehlke.twitterwall.conf.properties.TestdataProperties;
1815
import org.woehlke.twitterwall.oodm.entities.TaskHistory;
1916

2017
@RunWith(SpringRunner.class)
2118
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
22-
//@Transactional(propagation= Propagation.REQUIRES_NEW,readOnly=false)
2319
public class TaskHistoryServiceTest {
2420

2521
private static final Logger log = LoggerFactory.getLogger(TaskHistoryServiceTest.class);
2622

2723
@Autowired
2824
private TaskHistoryService taskHistoryService;
2925

30-
//TODO: #198 https://github.com/phasenraum2010/twitterwall2/issues/198
3126
@Autowired
3227
private TestdataProperties testdataProperties;
3328

34-
//@Commit
3529
@Test
3630
public void areDependenciesLoaded() throws Exception {
3731
Assert.assertNotNull(taskHistoryService);
3832
Assert.assertNotNull(testdataProperties);
3933
}
4034

41-
//@Commit
4235
@Test
4336
public void fetchTestData() throws Exception {
4437
String msg = "fetchTestData: ";
@@ -56,7 +49,6 @@ public void fetchTestData() throws Exception {
5649
}
5750
}
5851

59-
//@Commit
6052
@Test
6153
public void store() throws Exception {}
6254

0 commit comments

Comments
 (0)