Просмотр исходного кода

isogram: fix build issues

The test file was trying to import the example code which it shouldn't
do. Also removed unneeded package declarations and renamed the test
file to be consistent.
Frida Johanne Tveit 9 лет назад
Родитель
Сommit
ebc0ea8afc

+ 23
- 27
exercises/isogram/src/example/java/IsogramChecker.java Просмотреть файл

1
-package example;
2
-
3
 import java.util.HashSet;
1
 import java.util.HashSet;
4
 import java.util.Set;
2
 import java.util.Set;
3
+
5
 import static java.util.Arrays.stream;
4
 import static java.util.Arrays.stream;
6
 import static java.util.stream.Collectors.joining;
5
 import static java.util.stream.Collectors.joining;
7
 
6
 
8
 public class IsogramChecker {
7
 public class IsogramChecker {
9
-	
10
-	public IsogramChecker(){
11
-	}
12
-	
13
-	public boolean isIsogram(String word){
14
-		
15
-		Set<Character> charSet = new HashSet<>();
16
-		
17
-		String[] words = word.split(" ");
18
-		String newWord = concat(words);
19
-		
20
-		words = newWord.split("-");
21
-		newWord = concat(words).toLowerCase();
22
-		
23
-		for(int i = 0; i < newWord.length(); i++){
24
-			charSet.add(newWord.charAt(i));
25
-		}
26
-		
27
-		return charSet.size() == newWord.length();
28
-	}
29
-	
30
-	private String concat(String[] words){
31
-		return stream(words).collect(joining());
32
-	}
33
-	
8
+
9
+    public boolean isIsogram(String word) {
10
+
11
+        Set<Character> charSet = new HashSet<>();
12
+
13
+        String[] words = word.split(" ");
14
+        String newWord = concat(words);
15
+
16
+        words = newWord.split("-");
17
+        newWord = concat(words).toLowerCase();
18
+
19
+        for (int i = 0; i < newWord.length(); i++) {
20
+            charSet.add(newWord.charAt(i));
21
+        }
22
+
23
+        return charSet.size() == newWord.length();
24
+    }
25
+
26
+    private String concat(String[] words) {
27
+        return stream(words).collect(joining());
28
+    }
29
+
34
 }
30
 }

+ 77
- 0
exercises/isogram/src/test/java/IsogramCheckerTest.java Просмотреть файл

1
+import org.junit.Ignore;
2
+import org.junit.Test;
3
+
4
+import static org.junit.Assert.*;
5
+
6
+public class IsogramCheckerTest {
7
+
8
+    @Test
9
+    public void testIsogram() {
10
+        IsogramChecker iso = new IsogramChecker();
11
+        assertTrue(iso.isIsogram("duplicates"));
12
+    }
13
+
14
+    @Ignore
15
+    @Test
16
+    public void testNotIsogram() {
17
+        IsogramChecker iso = new IsogramChecker();
18
+        assertFalse(iso.isIsogram("eleven"));
19
+    }
20
+
21
+    @Ignore
22
+    @Test
23
+    public void testMediumLongIsogram() {
24
+        IsogramChecker iso = new IsogramChecker();
25
+        assertTrue(iso.isIsogram("subdermatoglyphic"));
26
+    }
27
+
28
+    @Ignore
29
+    @Test
30
+    public void testCaseInsensitive() {
31
+        IsogramChecker iso = new IsogramChecker();
32
+        assertFalse(iso.isIsogram("Alphabet"));
33
+    }
34
+
35
+    @Ignore
36
+    @Test
37
+    public void testIsogramWithHyphen() {
38
+        IsogramChecker iso = new IsogramChecker();
39
+        assertTrue(iso.isIsogram("thumbscrew-japingly"));
40
+    }
41
+
42
+    @Ignore
43
+    @Test
44
+    public void testIgnoresMultipleHyphens() {
45
+        IsogramChecker iso = new IsogramChecker();
46
+        assertTrue(iso.isIsogram("Hjelmqvist-Gryb-Zock-Pfund-Wax"));
47
+    }
48
+
49
+    @Ignore
50
+    @Test
51
+    public void testWorksWithGermanLetters() {
52
+        IsogramChecker iso = new IsogramChecker();
53
+        assertTrue(iso.isIsogram("Heizölrückstoßabdämpfung"));
54
+    }
55
+
56
+    @Ignore
57
+    @Test
58
+    public void testIgnoresSpaces() {
59
+        IsogramChecker iso = new IsogramChecker();
60
+        assertFalse(iso.isIsogram("the quick brown fox"));
61
+    }
62
+
63
+    @Ignore
64
+    @Test
65
+    public void testIgnoresSpaces2() {
66
+        IsogramChecker iso = new IsogramChecker();
67
+        assertTrue(iso.isIsogram("Emily Jung Schwartzkopf"));
68
+    }
69
+
70
+    @Ignore
71
+    @Test
72
+    public void testDuplicateAccentedLetters() {
73
+        IsogramChecker iso = new IsogramChecker();
74
+        assertFalse(iso.isIsogram("éléphant"));
75
+    }
76
+
77
+}

+ 0
- 80
exercises/isogram/src/test/java/IsogramTest.java Просмотреть файл

1
-package test;
2
-
3
-import static org.junit.Assert.*;
4
-
5
-import org.junit.Ignore;
6
-import org.junit.Test;
7
-import example.IsogramChecker;
8
-
9
-public class IsogramTest {
10
-
11
-	@Test
12
-	public void testIsogram() {
13
-		IsogramChecker iso = new IsogramChecker();
14
-		assertTrue(iso.isIsogram("duplicates"));
15
-	}
16
-	
17
-	@Ignore
18
-	@Test
19
-	public void testNotIsogram() {
20
-		IsogramChecker iso = new IsogramChecker();
21
-		assertFalse(iso.isIsogram("eleven"));
22
-	}
23
-	
24
-	@Ignore
25
-	@Test
26
-	public void testMediumLongIsogram() {
27
-		IsogramChecker iso = new IsogramChecker();
28
-		assertTrue(iso.isIsogram("subdermatoglyphic"));
29
-	}
30
-	
31
-	@Ignore
32
-	@Test
33
-	public void testCaseInsensitive() {
34
-		IsogramChecker iso = new IsogramChecker();
35
-		assertFalse(iso.isIsogram("Alphabet"));
36
-	}
37
-	
38
-	@Ignore
39
-	@Test
40
-	public void testIsogramWithHyphen() {
41
-		IsogramChecker iso = new IsogramChecker();
42
-		assertTrue(iso.isIsogram("thumbscrew-japingly"));
43
-	}
44
-	
45
-	@Ignore
46
-	@Test
47
-	public void testIgnoresMultipleHyphens() {
48
-		IsogramChecker iso = new IsogramChecker();
49
-		assertTrue(iso.isIsogram("Hjelmqvist-Gryb-Zock-Pfund-Wax"));
50
-	}
51
-	
52
-	@Ignore
53
-	@Test
54
-	public void testWorksWithGermanLetters() {
55
-		IsogramChecker iso = new IsogramChecker();
56
-		assertTrue(iso.isIsogram("Heizölrückstoßabdämpfung"));
57
-	}
58
-	
59
-	@Ignore
60
-	@Test
61
-	public void testIgnoresSpaces() {
62
-		IsogramChecker iso = new IsogramChecker();
63
-		assertFalse(iso.isIsogram("the quick brown fox"));
64
-	}
65
-	
66
-	@Ignore
67
-	@Test
68
-	public void testIgnoresSpaces2() {
69
-		IsogramChecker iso = new IsogramChecker();
70
-		assertTrue(iso.isIsogram("Emily Jung Schwartzkopf"));
71
-	}
72
-	
73
-	@Ignore
74
-	@Test
75
-	public void testDuplicateAccentedLetters() {
76
-		IsogramChecker iso = new IsogramChecker();
77
-		assertFalse(iso.isIsogram("éléphant"));
78
-	}
79
-
80
-}