Merge pull request #437 from FridaTveit/FixIsogram

isogram: fix build issues

exercises/isogram/src/example/java/IsogramChecker.java

@@ -1,34 +1,30 @@
-package example;
-
 import java.util.HashSet;
 import java.util.Set;
+
 import static java.util.Arrays.stream;
 import static java.util.stream.Collectors.joining;
 
 public class IsogramChecker {
-	
-	public IsogramChecker(){
-	}
-	
-	public boolean isIsogram(String word){
-		
-		Set<Character> charSet = new HashSet<>();
-		
-		String[] words = word.split(" ");
-		String newWord = concat(words);
-		
-		words = newWord.split("-");
-		newWord = concat(words).toLowerCase();
-		
-		for(int i = 0; i < newWord.length(); i++){
-			charSet.add(newWord.charAt(i));
-		}
-		
-		return charSet.size() == newWord.length();
-	}
-	
-	private String concat(String[] words){
-		return stream(words).collect(joining());
-	}
-	
+
+    public boolean isIsogram(String word) {
+
+        Set<Character> charSet = new HashSet<>();
+
+        String[] words = word.split(" ");
+        String newWord = concat(words);
+
+        words = newWord.split("-");
+        newWord = concat(words).toLowerCase();
+
+        for (int i = 0; i < newWord.length(); i++) {
+            charSet.add(newWord.charAt(i));
+        }
+
+        return charSet.size() == newWord.length();
+    }
+
+    private String concat(String[] words) {
+        return stream(words).collect(joining());
+    }
+
 }

exercises/isogram/src/test/java/IsogramCheckerTest.java

@@ -0,0 +1,77 @@
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class IsogramCheckerTest {
+
+    @Test
+    public void testIsogram() {
+        IsogramChecker iso = new IsogramChecker();
+        assertTrue(iso.isIsogram("duplicates"));
+    }
+
+    @Ignore
+    @Test
+    public void testNotIsogram() {
+        IsogramChecker iso = new IsogramChecker();
+        assertFalse(iso.isIsogram("eleven"));
+    }
+
+    @Ignore
+    @Test
+    public void testMediumLongIsogram() {
+        IsogramChecker iso = new IsogramChecker();
+        assertTrue(iso.isIsogram("subdermatoglyphic"));
+    }
+
+    @Ignore
+    @Test
+    public void testCaseInsensitive() {
+        IsogramChecker iso = new IsogramChecker();
+        assertFalse(iso.isIsogram("Alphabet"));
+    }
+
+    @Ignore
+    @Test
+    public void testIsogramWithHyphen() {
+        IsogramChecker iso = new IsogramChecker();
+        assertTrue(iso.isIsogram("thumbscrew-japingly"));
+    }
+
+    @Ignore
+    @Test
+    public void testIgnoresMultipleHyphens() {
+        IsogramChecker iso = new IsogramChecker();
+        assertTrue(iso.isIsogram("Hjelmqvist-Gryb-Zock-Pfund-Wax"));
+    }
+
+    @Ignore
+    @Test
+    public void testWorksWithGermanLetters() {
+        IsogramChecker iso = new IsogramChecker();
+        assertTrue(iso.isIsogram("Heizölrückstoßabdämpfung"));
+    }
+
+    @Ignore
+    @Test
+    public void testIgnoresSpaces() {
+        IsogramChecker iso = new IsogramChecker();
+        assertFalse(iso.isIsogram("the quick brown fox"));
+    }
+
+    @Ignore
+    @Test
+    public void testIgnoresSpaces2() {
+        IsogramChecker iso = new IsogramChecker();
+        assertTrue(iso.isIsogram("Emily Jung Schwartzkopf"));
+    }
+
+    @Ignore
+    @Test
+    public void testDuplicateAccentedLetters() {
+        IsogramChecker iso = new IsogramChecker();
+        assertFalse(iso.isIsogram("éléphant"));
+    }
+
+}

exercises/isogram/src/test/java/IsogramTest.java

@@ -1,80 +0,0 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import example.IsogramChecker;
-
-public class IsogramTest {
-
-	@Test
-	public void testIsogram() {
-		IsogramChecker iso = new IsogramChecker();
-		assertTrue(iso.isIsogram("duplicates"));
-	}
-	
-	@Ignore
-	@Test
-	public void testNotIsogram() {
-		IsogramChecker iso = new IsogramChecker();
-		assertFalse(iso.isIsogram("eleven"));
-	}
-	
-	@Ignore
-	@Test
-	public void testMediumLongIsogram() {
-		IsogramChecker iso = new IsogramChecker();
-		assertTrue(iso.isIsogram("subdermatoglyphic"));
-	}
-	
-	@Ignore
-	@Test
-	public void testCaseInsensitive() {
-		IsogramChecker iso = new IsogramChecker();
-		assertFalse(iso.isIsogram("Alphabet"));
-	}
-	
-	@Ignore
-	@Test
-	public void testIsogramWithHyphen() {
-		IsogramChecker iso = new IsogramChecker();
-		assertTrue(iso.isIsogram("thumbscrew-japingly"));
-	}
-	
-	@Ignore
-	@Test
-	public void testIgnoresMultipleHyphens() {
-		IsogramChecker iso = new IsogramChecker();
-		assertTrue(iso.isIsogram("Hjelmqvist-Gryb-Zock-Pfund-Wax"));
-	}
-	
-	@Ignore
-	@Test
-	public void testWorksWithGermanLetters() {
-		IsogramChecker iso = new IsogramChecker();
-		assertTrue(iso.isIsogram("Heizölrückstoßabdämpfung"));
-	}
-	
-	@Ignore
-	@Test
-	public void testIgnoresSpaces() {
-		IsogramChecker iso = new IsogramChecker();
-		assertFalse(iso.isIsogram("the quick brown fox"));
-	}
-	
-	@Ignore
-	@Test
-	public void testIgnoresSpaces2() {
-		IsogramChecker iso = new IsogramChecker();
-		assertTrue(iso.isIsogram("Emily Jung Schwartzkopf"));
-	}
-	
-	@Ignore
-	@Test
-	public void testDuplicateAccentedLetters() {
-		IsogramChecker iso = new IsogramChecker();
-		assertFalse(iso.isIsogram("éléphant"));
-	}
-
-}