Merge branch 'master' of gitea.jcant.com.ua:jcadm/JDate

.gitignore

@@ -2,5 +2,5 @@
 /.recommenders/
 /RemoteSystemsTempFiles/
 .settings/
-target/
-/target/
+target/*.*
+/target/

src/main/java/com/gmail/develop/jcant/JDate.java

@@ -223,7 +223,10 @@ public class JDate {
 	public static int getWeekDay(Date date) {
 		Calendar day = Calendar.getInstance();
 		day.setTime(date);
-		return day.get(Calendar.DAY_OF_WEEK);
+		int num = day.get(Calendar.DAY_OF_WEEK);
+		num--;
+		if (num < 1) num = 7;
+		return num;
 	}
 
 	public static int getDay(Date date) {

src/test/java/com/gmail/develop/jcant/JDateTest.java

@@ -144,47 +144,62 @@ public class JDateTest {
 
 	@Test
 	public void testGetDifferenceYears() {
-		fail("Not yet implemented");
+		Date date1 = new Date(1592204400000l); //15-06-2020 10:00:00
+		Date date2 = new Date(1670659200000l); //10-12-2022 10:00:00
+		Date date3 = new Date(1577692800000l); //30-12-2019 10:00:00
+		Date date4 = new Date(1551600000000l); //03-03-2019 10:00:00
+		boolean t1 = JDate.getDifferenceYears(date1, date2) == 2;
+		boolean t2 = JDate.getDifferenceYears(date1, date3) == -1;
+		boolean t3 = JDate.getDifferenceYears(date1, date4) == -2;
+		assertTrue(t1 && t2 && t3);
 	}
 
 	@Test
 	public void testGetWeekDay() {
-		fail("Not yet implemented");
+		Date date = new Date(1610870400000l); //17-01-2021 10:00:00 - SUNDAY
+		assertEquals(JDate.getWeekDay(date), 7);
 	}
 
 	@Test
 	public void testGetDay() {
-		fail("Not yet implemented");
+		Date date = new Date(1610870400000l); //17-01-2021 10:00:00
+		assertEquals(JDate.getDay(date), 17);
 	}
 
 	@Test
 	public void testGetMonth() {
-		fail("Not yet implemented");
+		Date date = new Date(1610870400000l); //17-01-2021 10:00:00
+		assertEquals(JDate.getMonth(date), 0);
 	}
 
 	@Test
 	public void testGetCorrectMonth() {
-		fail("Not yet implemented");
+		Date date = new Date(1610870400000l); //17-01-2021 10:00:00
+		assertEquals(JDate.getCorrectMonth(date), 1);
 	}
 
 	@Test
 	public void testGetYear() {
-		fail("Not yet implemented");
+		Date date = new Date(1610870400000l); //17-01-2021 10:00:00
+		assertEquals(JDate.getYear(date), 2021);
 	}
 
 	@Test
 	public void testIncDay() {
-		fail("Not yet implemented");
+		Date date = new Date(1610870400000l); //17-01-2021 10:00:00
+		assertEquals(JDate.incDay(date, 2).getTime(), 1611043200000l); //19-01-2021 10:00:00
 	}
 
 	@Test
 	public void testIncMonth() {
-		fail("Not yet implemented");
+		Date date = new Date(1610870400000l); //17-01-2021 10:00:00
+		assertEquals(JDate.incMonth(date, 2).getTime(), 1615968000000l); //17-03-2021 10:00:00
 	}
 
 	@Test
 	public void testIncYear() {
-		fail("Not yet implemented");
+		Date date = new Date(1610870400000l); //17-01-2021 10:00:00
+		assertEquals(JDate.incYear(date, -2).getTime(), 1547712000000l); //17-03-2021 10:00:00
 	}
 
 }

target/maven-archiver/pom.properties

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Oct 28 20:17:45 EET 2019
-groupId=com.gmail.develop.jcant
-artifactId=JDate
-version=1.9

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1 +0,0 @@
-com\gmail\develop\jcant\JDate.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1 +0,0 @@
-D:\JC\Develop\Java\JDate\src\main\java\com\gmail\develop\jcant\JDate.java