refactor: #1586

elimu-ai · Jul 28, 2022 · 181827f · 181827f
1 parent 5101fcd
commit 181827f
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 65 deletions.
diff --git a/src/test/java/ai/elimu/dao/DeviceDaoTest.java b/src/test/java/ai/elimu/dao/DeviceDaoTest.java
@@ -16,7 +16,7 @@
 public class DeviceDaoTest extends TestCase {
 
     @Autowired
-    DeviceDao deviceDao;
+    private DeviceDao deviceDao;
 
     @Test
     public void testRead() {
@@ -33,5 +33,4 @@ private Device getDevice(String deviceId) {
         device.setDeviceId(deviceId);
         return device;
     }
-
-}
+}
diff --git a/src/test/java/ai/elimu/dao/EmojiDaoTest.java b/src/test/java/ai/elimu/dao/EmojiDaoTest.java
@@ -23,7 +23,7 @@
 public class EmojiDaoTest extends TestCase {
 
     @Autowired
-    EmojiDao emojiDao;
+    private EmojiDao emojiDao;
 
     public void testReadAllOrdered() {
         List<Emoji> expectedEmojis = new ArrayList<>();
@@ -41,13 +41,15 @@ public void testReadAllOrdered() {
 
         List<Emoji> actualEmojis = emojiDao.readAllOrdered();
 
-        Assert.assertArrayEquals(expectedEmojis.stream().map(Emoji::getGlyph).toArray(), actualEmojis.stream().map(Emoji::getGlyph).toArray());
+        Assert.assertArrayEquals(
+                expectedEmojis.stream().map(Emoji::getGlyph).toArray(),
+                actualEmojis.stream().map(Emoji::getGlyph).toArray()
+        );
     }
 
     @Test
     public void testReadByGlyph() {
         emojiDao.create(getEmoji("F1F6"));
-
         assertTrue("F1F6".equals(emojiDao.readByGlyph("F1F6").getGlyph()));
     }
 
@@ -56,5 +58,4 @@ private Emoji getEmoji(String glyph) {
         emoji.setGlyph(glyph);
         return emoji;
     }
-
-}
+}
diff --git a/src/test/java/ai/elimu/dao/LetterDaoTest.java b/src/test/java/ai/elimu/dao/LetterDaoTest.java
@@ -23,7 +23,7 @@
 public class LetterDaoTest extends TestCase {
 
     @Autowired
-    LetterDao letterDao;
+    private LetterDao letterDao;
 
     @Test
     public void testReadAllOrdered() {
@@ -40,7 +40,10 @@ public void testReadAllOrdered() {
 
         List<Letter> lettersActual = letterDao.readAllOrdered();
 
-        Assert.assertArrayEquals(lettersExpected.stream().map(Letter::getText).toArray(), lettersActual.stream().map(Letter::getText).toArray());
+        Assert.assertArrayEquals(
+                lettersExpected.stream().map(Letter::getText).toArray(),
+                lettersActual.stream().map(Letter::getText).toArray()
+        );
     }
 
     @Test
@@ -58,13 +61,15 @@ public void testReadAllOrderedByUsage() {
 
         List<Letter> lettersActual = letterDao.readAllOrderedByUsage();
 
-        Assert.assertArrayEquals(lettersExpected.stream().map(Letter::getText).toArray(), lettersActual.stream().filter(i -> i.getUsageCount() != 0).map(Letter::getText).toArray());
+        Assert.assertArrayEquals(
+                lettersExpected.stream().map(Letter::getText).toArray(),
+                lettersActual.stream().filter(i -> i.getUsageCount() != 0).map(Letter::getText).toArray()
+        );
     }
 
     @Test
     public void testReadByText() {
         letterDao.create(getLetter("T"));
-
         assertTrue("T".equals(letterDao.readByText("T").getText()));
         assertNull(letterDao.readByText(""));
     }
@@ -80,5 +85,4 @@ private Letter getLetterWithUsageCount(String text, Integer usageCount) {
        letter.setUsageCount(usageCount);
        return letter;
     }
-
-}
+}
diff --git a/src/test/java/ai/elimu/dao/NumberDaoTest.java b/src/test/java/ai/elimu/dao/NumberDaoTest.java
@@ -5,13 +5,12 @@
 import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
 
-import org.junit.Assert;
-import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import ai.elimu.model.content.Number;
 import ai.elimu.model.content.Word;
-import org.junit.runners.MethodSorters;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -21,8 +20,9 @@
     "file:src/main/webapp/WEB-INF/spring/applicationContext.xml",
     "file:src/main/webapp/WEB-INF/spring/applicationContext-jpa.xml"
 })
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class NumberDaoTest {
+
+    private Logger logger = LogManager.getLogger();
 
     @Autowired
     private NumberDao numberDao;
@@ -31,48 +31,54 @@ public class NumberDaoTest {
     private WordDao wordDao;
 
     @Test
-    public void testStoreWithMultipleNumberWords() {
-        Word word1 = new Word();
-        wordDao.create(word1);
+    public void testCreate_multipleWords() {
+        Word wordTwenty = new Word();
+        wordTwenty.setText("twenty");
+        wordDao.create(wordTwenty);
 
-        Word word2 = new Word();
-        wordDao.create(word2);
+        Word wordFour = new Word();
+        wordFour.setText("four");
+        wordDao.create(wordFour);
 
         List<Word> numberWords = new ArrayList<>();
-        numberWords.add(word1);
-        numberWords.add(word2);
+        numberWords.add(wordTwenty);
+        numberWords.add(wordFour);
 
-        Number number = new Number();
-        number.setWords(numberWords);
-        numberDao.create(number);
+        Number number24 = new Number();
+        number24.setValue(24);
+        number24.setWords(numberWords);
+        numberDao.create(number24);
 
-        assertThat(number.getWords().size(), is(2));
+        assertThat(numberDao.read(number24.getId()).getWords().isEmpty(), is(false));
+        assertThat(numberDao.read(number24.getId()).getWords().size(), is(2));
+        assertThat(numberDao.read(number24.getId()).getWords().get(0).getText(), is("twenty"));
+        assertThat(numberDao.read(number24.getId()).getWords().get(1).getText(), is("four"));
     }
 
     @Test
-    public void TestReadAllOrdered() {
-        List<Number> expectedNumbers = new ArrayList<>();
-        expectedNumbers.add(getNumber(1));
-        expectedNumbers.add(getNumber(22));
-        expectedNumbers.add(getNumber(23));
-        expectedNumbers.add(getNumber(90));
-        expectedNumbers.add(getNumber(100));
-
+    public void testReadAllOrdered() {
         numberDao.create(getNumber(22));
         numberDao.create(getNumber(1));
         numberDao.create(getNumber(100));
         numberDao.create(getNumber(23));
         numberDao.create(getNumber(90));
 
-        List<Number> actualNumbers = numberDao.readAllOrdered();
-
-        Assert.assertArrayEquals(expectedNumbers.stream().map(Number::getValue).toArray(), actualNumbers.stream().map(Number::getValue).toArray());
+        List<Number> allNumbers = numberDao.readAllOrdered();
+        assertThat(allNumbers.isEmpty(), is(false));
+        assertThat(allNumbers.size() >= 5, is(true));
+        Number previousNumber = null;
+        for (Number number: allNumbers) {
+            logger.info("number.getValue(): " + number.getValue());
+            if (previousNumber != null) {
+                assertTrue(number.getValue() > previousNumber.getValue());
+            }
+            previousNumber = number;
+        }
     }
 
     @Test
     public void testReadByValue() {
         numberDao.create(getNumber(25));
-
         assertTrue(numberDao.readByValue(25).getValue() == 25);
         assertNull(numberDao.readByValue(11));
     }
@@ -82,5 +88,4 @@ private Number getNumber(Integer value) {
         number.setValue(value);
         return number;
     }
-
 }
diff --git a/src/test/java/ai/elimu/dao/SoundDaoTest.java b/src/test/java/ai/elimu/dao/SoundDaoTest.java
@@ -45,7 +45,10 @@ public void testAllOrderedRead() {
 
         List<Sound> actualSounds = soundDao.readAllOrdered();
 
-        Assert.assertArrayEquals(expectedSounds.stream().map(Sound::getValueIpa).toArray(), actualSounds.stream().filter(i -> i.getValueIpa().length() == 1).map(Sound::getValueIpa).toArray());
+        Assert.assertArrayEquals(
+                expectedSounds.stream().map(Sound::getValueIpa).toArray(),
+                actualSounds.stream().filter(i -> i.getValueIpa().length() == 1).map(Sound::getValueIpa).toArray()
+        );
     }
 
     @Test
@@ -59,7 +62,10 @@ public void readAllOrderedByIpaValueCharacterLength() {
 
         List<Sound> actualSounds = soundDao.readAllOrderedByIpaValueCharacterLength();
 
-        Assert.assertArrayEquals(expectedSounds.stream().map(Sound::getValueIpa).toArray(), actualSounds.stream().map(Sound::getValueIpa).toArray());
+        Assert.assertArrayEquals(
+                expectedSounds.stream().map(Sound::getValueIpa).toArray(),
+                actualSounds.stream().map(Sound::getValueIpa).toArray()
+        );
     }
 
     @Test
@@ -79,7 +85,10 @@ public void testReadAllOrderedByUsage() {
 
         List<Sound> actualSounds = soundDao.readAllOrderedByUsage();
 
-        Assert.assertArrayEquals(expectedSounds.stream().map(Sound::getUsageCount).toArray(), actualSounds.stream().filter(i -> i.getUsageCount() != 0).map(Sound::getUsageCount).toArray());
+        Assert.assertArrayEquals(
+                expectedSounds.stream().map(Sound::getUsageCount).toArray(),
+                actualSounds.stream().filter(i -> i.getUsageCount() != 0).map(Sound::getUsageCount).toArray()
+        );
     }
 
     @Test

diff --git a/src/test/java/ai/elimu/dao/VideoDaoTest.java b/src/test/java/ai/elimu/dao/VideoDaoTest.java
@@ -23,33 +23,31 @@
 public class VideoDaoTest extends TestCase {
 
     @Autowired
-    VideoDao videoDao;
+    private VideoDao videoDao;
 
     @Test
     public void testReadAllOrdered() {
         List<Video> expectedVideos = new ArrayList<>();
-        expectedVideos.add(getVideo("Alaska"));
-        expectedVideos.add(getVideo("Back to the Future"));
-        expectedVideos.add(getVideo("Dirty Harry"));
-        expectedVideos.add(getVideo("Predator"));
-        expectedVideos.add(getVideo("The Wind"));
-
-        videoDao.create(getVideo("Predator"));
-        videoDao.create(getVideo("Back to the Future"));
-        videoDao.create(getVideo("Dirty Harry"));
-        videoDao.create(getVideo("Alaska"));
-        videoDao.create(getVideo("The Wind"));
+        expectedVideos.add(getVideo("count to ten with me"));
+        expectedVideos.add(getVideo("letter a"));
+        expectedVideos.add(getVideo("one two three song"));
+
+        videoDao.create(getVideo("letter a"));
+        videoDao.create(getVideo("one two three song"));
+        videoDao.create(getVideo("count to ten with me"));
 
         List<Video> videosActual = videoDao.readAllOrdered();
 
-        Assert.assertArrayEquals(expectedVideos.stream().map(Video::getTitle).toArray(), videosActual.stream().map(Video::getTitle).toArray());
+        Assert.assertArrayEquals(
+                expectedVideos.stream().map(Video::getTitle).toArray(),
+                videosActual.stream().map(Video::getTitle).toArray()
+        );
     }
 
     @Test
     public void testReadByTitle() {
-        videoDao.create(getVideo("Madagascar"));
-
-        assertTrue("Madagascar".equals(videoDao.read("Madagascar").getTitle()));
+        videoDao.create(getVideo("the rectangle song"));
+        assertTrue("the rectangle song".equals(videoDao.read("the rectangle song").getTitle()));
         assertNull(videoDao.read("None"));
     }
 
@@ -58,4 +56,4 @@ private Video getVideo(String title) {
         video.setTitle(title);
         return video;
     }
-}
+}
diff --git a/src/test/java/ai/elimu/util/ChecksumHelperTest.java b/src/test/java/ai/elimu/util/ChecksumHelperTest.java
@@ -13,5 +13,4 @@ public void calculateMD5Test() {
         assertTrue("79f2a1cb337cf2c19868048f754a781b".equals(ChecksumHelper.calculateMD5("calculateMD5Test".getBytes())));
         assertTrue("0b2e69e325a76637270d92d7416168ff".equals(ChecksumHelper.calculateMD5("calculateMD5Test11".getBytes())));
     }
-
-}
+}
diff --git a/src/test/java/ai/elimu/util/Web3HelperTest.java b/src/test/java/ai/elimu/util/Web3HelperTest.java
@@ -12,4 +12,4 @@ public void isSignatureValidTest() {
         assertTrue(Web3Helper.isSignatureValid("0x2b36e665af634018f9eaec1d249633ae2a9ad825", "0xaa1eadb925d1e5236182f80bdc8c707f2fda1844f03268473508a519ef844359115ac56ea510e07712a96c4dccc34432b1c583285d43cd369bc26eba827267941b", "TestMsg"));
         assertTrue(Web3Helper.isSignatureValid("0xd26e1be34cd621c7ed436135748c98599ed44ee6", "0xde8fe6016d4d1a5fa7df42e158d102ab1ec69aabbb854ebe09ca95215a88b4025da96d4814140d2af2aa1a3d4146cd3ea16592f3f9e83e6d3dc5839f94e044001c", "SJ!O@(J@9j"));
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,5 +13,4 @@ public void calculateMD5Test() { @@
             assertTrue("79f2a1cb337cf2c19868048f754a781b".equals(ChecksumHelper.calculateMD5("calculateMD5Test".getBytes())));
             assertTrue("0b2e69e325a76637270d92d7416168ff".equals(ChecksumHelper.calculateMD5("calculateMD5Test11".getBytes())));
         }
-    }
+    }