Merge branch 'v1.1.0-SNAPSHOT'

src/main/java/com/nlf/calendar/Solar.java

@@ -324,15 +324,10 @@ public class Solar{
       l.add(f);
     }
     //计算几月第几个星期几对应的节日
-    //第几周
+    int weeks = (int)Math.ceil(day/7D);
-    int weekInMonth = calendar.get(Calendar.WEEK_OF_MONTH);
     //星期几，0代表星期天
     int week = getWeek();
-    //星期天很奇葩，会多算一周，需要减掉
+    f = SolarUtil.WEEK_FESTIVAL.get(month+"-"+weeks+"-"+week);
-    if(0==week){
-      weekInMonth--;
-    }
-    f = SolarUtil.WEEK_FESTIVAL.get(month+"-"+weekInMonth+"-"+week);
     if(null!=f){
       l.add(f);
     }

src/main/java/com/nlf/calendar/util/SolarUtil.java

@@ -114,6 +114,7 @@ public class SolarUtil{
       put("10-13",Collections.nCopies(1,"中国少年先锋队诞辰日"));
       put("10-25",Collections.nCopies(1,"抗美援朝纪念日"));
       put("11-12",Collections.nCopies(1,"孙中山诞辰纪念日"));
+      put("11-17",Collections.nCopies(1,"国际大学生节"));
       put("11-28",Collections.nCopies(1,"恩格斯诞辰纪念日"));
       put("12-1",Collections.nCopies(1,"世界艾滋病日"));
       put("12-12",Collections.nCopies(1,"西安事变纪念日"));

src/test/java/test/FestivalTest.java

@@ -0,0 +1,33 @@
+package test;
+
+import com.nlf.calendar.Solar;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 节日测试
+ *
+ * @author 6tail
+ */
+public class FestivalTest {
+  @Test
+  public void test() {
+    Solar solar = Solar.fromYmd(2020, 11, 26);
+    Assert.assertEquals("[感恩节]", solar.getFestivals() + "");
+
+    solar = Solar.fromYmd(2020, 6, 21);
+    Assert.assertEquals("[父亲节]", solar.getFestivals() + "");
+
+    solar = Solar.fromYmd(2021, 5, 9);
+    Assert.assertEquals("[母亲节]", solar.getFestivals() + "");
+
+    solar = Solar.fromYmd(1986, 11, 27);
+    Assert.assertEquals("[感恩节]", solar.getFestivals() + "");
+
+    solar = Solar.fromYmd(1985, 6, 16);
+    Assert.assertEquals("[父亲节]", solar.getFestivals() + "");
+
+    solar = Solar.fromYmd(1984, 5, 13);
+    Assert.assertEquals("[母亲节]", solar.getFestivals() + "");
+  }
+}