sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Prepare app for MVP (#40)

Browse Source
This commit is contained in:
Rafał Borcz
2018-01-02 21:55:58 +01:00
committed by Mikołaj Pich
parent 844230956a
commit 7e6a73d1f3
69 changed files with 455 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/test/java/io/github/wulkanowy/dao/entities/GradeTest.java → app/src/test/java/io/github/wulkanowy/db/dao/entities/GradeTest.java
View File

@ -1,4 +1,4 @@
package io.github.wulkanowy.dao.entities;
package io.github.wulkanowy.db.dao.entities;
import org.junit.Assert;
import org.junit.Test;

2
app/src/test/java/io/github/wulkanowy/ui/main/grades/SubjectWithGradesTest.java
View File

@ -7,7 +7,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
import io.github.wulkanowy.dao.entities.Grade;
import io.github.wulkanowy.db.dao.entities.Grade;
public class SubjectWithGradesTest {

4
app/src/test/java/io/github/wulkanowy/utilities/AverageCalculatorTest.java → app/src/test/java/io/github/wulkanowy/utils/AverageCalculatorTest.java
View File

@ -1,4 +1,4 @@
package io.github.wulkanowy.utilities;
package io.github.wulkanowy.utils;
import org.junit.Assert;
import org.junit.Test;
@ -6,7 +6,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
import io.github.wulkanowy.dao.entities.Grade;
import io.github.wulkanowy.db.dao.entities.Grade;
public class AverageCalculatorTest {

28
app/src/test/java/io/github/wulkanowy/utilities/ConversionVulcanObjectTest.java → app/src/test/java/io/github/wulkanowy/utils/DataObjectConverterTest.java
View File

@ -1,4 +1,4 @@
package io.github.wulkanowy.utilities;
package io.github.wulkanowy.utils;
import org.junit.Assert;
import org.junit.Test;
@ -11,14 +11,14 @@ import io.github.wulkanowy.api.grades.Subject;
import io.github.wulkanowy.api.timetable.Day;
import io.github.wulkanowy.api.timetable.Lesson;
public class ConversionVulcanObjectTest {
public class DataObjectConverterTest {
@Test
public void subjectConversionTest() {
List<Subject> subjectList = new ArrayList<>();
subjectList.add(new Subject().setName("Matematyka"));
List<io.github.wulkanowy.dao.entities.Subject> subjectEntitiesList =
ConversionVulcanObject.subjectsToSubjectEntities(subjectList);
List<io.github.wulkanowy.db.dao.entities.Subject> subjectEntitiesList =
DataObjectConverter.subjectsToSubjectEntities(subjectList);
Assert.assertEquals("Matematyka", subjectEntitiesList.get(0).getName());
}
@ -26,15 +26,15 @@ public class ConversionVulcanObjectTest {
@Test
public void subjectConversionEmptyTest() {
Assert.assertEquals(new ArrayList<>(),
ConversionVulcanObject.subjectsToSubjectEntities(new ArrayList<Subject>()));
DataObjectConverter.subjectsToSubjectEntities(new ArrayList<Subject>()));
}
@Test
public void gradesConversionTest() {
List<Grade> gradeList = new ArrayList<>();
gradeList.add(new Grade().setDescription("Lorem ipsum"));
List<io.github.wulkanowy.dao.entities.Grade> gradeEntitiesList =
ConversionVulcanObject.gradesToGradeEntities(gradeList);
List<io.github.wulkanowy.db.dao.entities.Grade> gradeEntitiesList =
DataObjectConverter.gradesToGradeEntities(gradeList);
Assert.assertEquals("Lorem ipsum", gradeEntitiesList.get(0).getDescription());
}
@ -42,21 +42,21 @@ public class ConversionVulcanObjectTest {
@Test
public void gradeConversionEmptyTest() {
Assert.assertEquals(new ArrayList<>(),
ConversionVulcanObject.gradesToGradeEntities(new ArrayList<Grade>()));
DataObjectConverter.gradesToGradeEntities(new ArrayList<Grade>()));
}
@Test
public void dayConversionEmptyTest() {
Assert.assertEquals(new ArrayList<>(),
ConversionVulcanObject.daysToDaysEntities(new ArrayList<Day>()));
DataObjectConverter.daysToDaysEntities(new ArrayList<Day>()));
}
@Test
public void dayConversionTest() {
List<Day> dayList = new ArrayList<>();
dayList.add(new Day().setDate("20.12.2012"));
List<io.github.wulkanowy.dao.entities.Day> dayEntityList =
ConversionVulcanObject.daysToDaysEntities(dayList);
List<io.github.wulkanowy.db.dao.entities.Day> dayEntityList =
DataObjectConverter.daysToDaysEntities(dayList);
Assert.assertEquals("20.12.2012", dayEntityList.get(0).getDate());
}
@ -64,15 +64,15 @@ public class ConversionVulcanObjectTest {
@Test
public void lessonConversionEmptyTest() {
Assert.assertEquals(new ArrayList<>(),
ConversionVulcanObject.lessonsToLessonsEntities(new ArrayList<Lesson>()));
DataObjectConverter.lessonsToLessonsEntities(new ArrayList<Lesson>()));
}
@Test
public void lessonConversionTest() {
List<Lesson> lessonList = new ArrayList<>();
lessonList.add(new Lesson().setRoom("20"));
List<io.github.wulkanowy.dao.entities.Lesson> lessonEntityList =
ConversionVulcanObject.lessonsToLessonsEntities(lessonList);
List<io.github.wulkanowy.db.dao.entities.Lesson> lessonEntityList =
DataObjectConverter.lessonsToLessonsEntities(lessonList);
Assert.assertEquals("20", lessonEntityList.get(0).getRoom());
}

4
app/src/test/java/io/github/wulkanowy/dao/EntitiesCompareTest.java → app/src/test/java/io/github/wulkanowy/utils/EntitiesCompareTest.java
View File

@ -1,4 +1,4 @@
package io.github.wulkanowy.dao;
package io.github.wulkanowy.utils;
import org.junit.Assert;
import org.junit.Before;
@ -7,7 +7,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
import io.github.wulkanowy.dao.entities.Grade;
import io.github.wulkanowy.db.dao.entities.Grade;
public class EntitiesCompareTest {

8
app/src/test/java/io/github/wulkanowy/utilities/ConnectionUtilitiesTest.java → app/src/test/java/io/github/wulkanowy/utils/NetworkUtilsTest.java
View File

@ -1,4 +1,4 @@
package io.github.wulkanowy.utilities;
package io.github.wulkanowy.utils;
import android.content.Context;
import android.net.ConnectivityManager;
@ -10,7 +10,7 @@ import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public class ConnectionUtilitiesTest {
public class NetworkUtilsTest {
@Test
public void isOnlineTrueTest() {
@ -23,7 +23,7 @@ public class ConnectionUtilitiesTest {
Context context = mock(Context.class);
when(context.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(connectivityManager);
Assert.assertTrue(ConnectionUtilities.isOnline(context));
Assert.assertTrue(NetworkUtils.isOnline(context));
}
@Test
@ -37,6 +37,6 @@ public class ConnectionUtilitiesTest {
Context context = mock(Context.class);
when(context.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(connectivityManager);
Assert.assertFalse(ConnectionUtilities.isOnline(context));
Assert.assertFalse(NetworkUtils.isOnline(context));
}
}

22
app/src/test/java/io/github/wulkanowy/utilities/TimeUtilitiesTest.java → app/src/test/java/io/github/wulkanowy/utils/TimeUtilsTest.java
View File

@ -1,4 +1,4 @@
package io.github.wulkanowy.utilities;
package io.github.wulkanowy.utils;
import org.junit.Assert;
import org.junit.Test;
@ -11,7 +11,7 @@ import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
public class TimeUtilitiesTest {
public class TimeUtilsTest {
@Test
public void getTicksDateObjectTest() throws Exception {
@ -19,32 +19,32 @@ public class TimeUtilitiesTest {
format.setTimeZone(TimeZone.getTimeZone("UTC"));
Date date = format.parse("31.07.2017");
Assert.assertEquals(636370560000000000L, TimeUtilities.getNetTicks(date));
Assert.assertEquals(636370560000000000L, TimeUtils.getNetTicks(date));
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.DAY_OF_YEAR, -14);
Date dateTwoWeekBefore = calendar.getTime();
Assert.assertEquals(636358464000000000L, TimeUtilities.getNetTicks(dateTwoWeekBefore));
Assert.assertEquals(636358464000000000L, TimeUtils.getNetTicks(dateTwoWeekBefore));
}
@Test(expected = ParseException.class)
public void getTicsStringInvalidFormatTest() throws Exception {
Assert.assertEquals(636370560000000000L, TimeUtilities.getNetTicks("31.07.2017", "dd.MMM.yyyy"));
Assert.assertEquals(636370560000000000L, TimeUtils.getNetTicks("31.07.2017", "dd.MMM.yyyy"));
}
@Test
public void getTicsStringFormatTest() throws Exception {
Assert.assertEquals(636370560000000000L, TimeUtilities.getNetTicks("31.07.2017", "dd.MM.yyyy"));
Assert.assertEquals(636370560000000000L, TimeUtils.getNetTicks("31.07.2017", "dd.MM.yyyy"));
}
@Test
public void getTicsStringTest() throws Exception {
Assert.assertEquals(636370560000000000L, TimeUtilities.getNetTicks("31.07.2017"));
Assert.assertEquals(636334272000000000L, TimeUtilities.getNetTicks("19.06.2017"));
Assert.assertEquals(636189120000000000L, TimeUtilities.getNetTicks("02.01.2017"));
Assert.assertEquals(636080256000000000L, TimeUtilities.getNetTicks("29.08.2016"));
Assert.assertEquals(636370560000000000L, TimeUtils.getNetTicks("31.07.2017"));
Assert.assertEquals(636334272000000000L, TimeUtils.getNetTicks("19.06.2017"));
Assert.assertEquals(636189120000000000L, TimeUtils.getNetTicks("02.01.2017"));
Assert.assertEquals(636080256000000000L, TimeUtils.getNetTicks("29.08.2016"));
}
@Test
@ -53,6 +53,6 @@ public class TimeUtilitiesTest {
format.setTimeZone(TimeZone.getTimeZone("UTC"));
Date date = format.parse("31.07.2017");
Assert.assertEquals(date, TimeUtilities.getDate(636370560000000000L));
Assert.assertEquals(date, TimeUtils.getDate(636370560000000000L));
}
}