소스 검색

Merge pull request #1225 from TimoleonLatinopoulos/branch3

Changed test cases as per #1127
Sam Warner 8 년 전
부모
커밋
f7b44e0388
No account linked to committer's email
2개의 변경된 파일7개의 추가작업 그리고 7개의 파일을 삭제
  1. 1
    1
      exercises/acronym/.meta/version
  2. 6
    6
      exercises/acronym/src/test/java/AcronymTest.java

+ 1
- 1
exercises/acronym/.meta/version 파일 보기

1
-1.1.0
1
+1.2.0

+ 6
- 6
exercises/acronym/src/test/java/AcronymTest.java 파일 보기

6
 public class AcronymTest {
6
 public class AcronymTest {
7
 
7
 
8
     @Test
8
     @Test
9
-    public void fromTitleCasedPhrases() {
9
+    public void basic() {
10
         final String phrase = "Portable Network Graphics";
10
         final String phrase = "Portable Network Graphics";
11
         final String expected = "PNG";
11
         final String expected = "PNG";
12
         assertEquals(expected, new Acronym(phrase).get());
12
         assertEquals(expected, new Acronym(phrase).get());
14
 
14
 
15
     @Ignore("Remove to run test")
15
     @Ignore("Remove to run test")
16
     @Test
16
     @Test
17
-    public void fromOtherTitleCasedPhrases() {
17
+    public void lowercaseWords() {
18
         final String phrase = "Ruby on Rails";
18
         final String phrase = "Ruby on Rails";
19
         final String expected = "ROR";
19
         final String expected = "ROR";
20
         assertEquals(expected, new Acronym(phrase).get());
20
         assertEquals(expected, new Acronym(phrase).get());
22
 
22
 
23
     @Ignore("Remove to run test")
23
     @Ignore("Remove to run test")
24
     @Test
24
     @Test
25
-    public void fromPhrasesWithPunctuation() {
25
+    public void punctuation() {
26
         final String phrase = "First In, First Out";
26
         final String phrase = "First In, First Out";
27
         final String expected = "FIFO";
27
         final String expected = "FIFO";
28
         assertEquals(expected, new Acronym(phrase).get());
28
         assertEquals(expected, new Acronym(phrase).get());
30
 
30
 
31
     @Ignore("Remove to run test")
31
     @Ignore("Remove to run test")
32
     @Test
32
     @Test
33
-    public void fromOtherPhrasesWithPunctuation() {
33
+    public void allCapsWords() {
34
         final String phrase = "PHP: Hypertext Preprocessor";
34
         final String phrase = "PHP: Hypertext Preprocessor";
35
         final String expected = "PHP";
35
         final String expected = "PHP";
36
         assertEquals(expected, new Acronym(phrase).get());
36
         assertEquals(expected, new Acronym(phrase).get());
38
 
38
 
39
     @Ignore("Remove to run test")
39
     @Ignore("Remove to run test")
40
     @Test
40
     @Test
41
-    public void fromPhrasesWithNonAcronymAllCapsWord() {
41
+    public void NonAcronymAllCapsWord() {
42
         final String phrase = "GNU Image Manipulation Program";
42
         final String phrase = "GNU Image Manipulation Program";
43
         final String expected = "GIMP";
43
         final String expected = "GIMP";
44
         assertEquals(expected, new Acronym(phrase).get());
44
         assertEquals(expected, new Acronym(phrase).get());
46
 
46
 
47
     @Ignore("Remove to run test")
47
     @Ignore("Remove to run test")
48
     @Test
48
     @Test
49
-    public void fromPhrasesWithPunctuationAndSentenceCasing() {
49
+    public void hyphenated() {
50
         final String phrase = "Complementary metal-oxide semiconductor";
50
         final String phrase = "Complementary metal-oxide semiconductor";
51
         final String expected = "CMOS";
51
         final String expected = "CMOS";
52
         assertEquals(expected, new Acronym(phrase).get());
52
         assertEquals(expected, new Acronym(phrase).get());