Skip to content

Commit bc9bd16

Browse files
committed
fix travis build with openjdk
1 parent c7fd2d0 commit bc9bd16

2 files changed

Lines changed: 32 additions & 12 deletions

File tree

src/main/kotlin/ffc.airsync.api/services/org/OrgDao.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ interface OrgDao : Dao {
3434

3535
val orgs: OrgDao by lazy { MongoOrgDao() }
3636

37-
private val dontRecive = Regex(""".*[\;\?\:\@\&\=\+\$\,\/ \(\)].*""")
37+
private val dontRecive = Regex(""".*[\:\/\?\#\[\]\@\!\$\&\'\(\)\*\+\,\;\=\<\>\{\}\|\`\^\\\"\% ].*""")
3838

3939
/**
4040
* ตรวจสอบ Organization name ว่าอยู่ในเงื่อนไขในการตั้งชื่อหรือไม่

src/test/kotlin/ffc/airsync/api/services/org/MongoOrgDaoTest.kt

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -231,21 +231,41 @@ class MongoOrgDaoTest {
231231
maeOrg.name `should be equal to` "โรงพยาบาลส่งเสริมสุขภาพตำบลแม่ข้าวต้ม"
232232
}
233233

234+
/**
235+
* Ref: https://www.urlencoder.io/
236+
*/
234237
@Test
235238
fun testIsAcceptOrganizationName() {
236239
"ข้าวต้มฯ".isAcceptOrganizationName() `should be equal to` true
237240
"ข้าวต้ม๑๒๓๔".isAcceptOrganizationName() `should be equal to` true
238-
"ข้าวต้ม;มัด".isAcceptOrganizationName() `should be equal to` false
239-
"ข้าวต้ม?มัด".isAcceptOrganizationName() `should be equal to` false
240-
"ข้าวต้ม:มัด".isAcceptOrganizationName() `should be equal to` false
241-
"ข้าวต้ม@มัด".isAcceptOrganizationName() `should be equal to` false
242-
"ข้าวต้ม&มัด".isAcceptOrganizationName() `should be equal to` false
243-
"ข้าวต้ม=มัด".isAcceptOrganizationName() `should be equal to` false
244-
"ข้าวต้ม+มัด".isAcceptOrganizationName() `should be equal to` false
245-
"ข้าวต้ม\$มัด".isAcceptOrganizationName() `should be equal to` false
246-
"ข้าวต้ม,มัด".isAcceptOrganizationName() `should be equal to` false
247-
"ข้าวต้ม/มัด".isAcceptOrganizationName() `should be equal to` false
248-
"ข้าวต้ม(มัด)".isAcceptOrganizationName() `should be equal to` false
241+
"ต้ม:มัด".isAcceptOrganizationName() `should be equal to` false
242+
"ต้ม/มัด".isAcceptOrganizationName() `should be equal to` false
243+
"ต้ม?มัด".isAcceptOrganizationName() `should be equal to` false
244+
"ต้ม#มัด".isAcceptOrganizationName() `should be equal to` false
245+
"ต้ม[มัด".isAcceptOrganizationName() `should be equal to` false
246+
"ต้ม]มัด".isAcceptOrganizationName() `should be equal to` false
247+
"ต้ม@มัด".isAcceptOrganizationName() `should be equal to` false
248+
"ต้ม!มัด".isAcceptOrganizationName() `should be equal to` false
249+
"ต้ม\$มัด".isAcceptOrganizationName() `should be equal to` false
250+
"ต้ม&มัด".isAcceptOrganizationName() `should be equal to` false
251+
"ต้ม'มัด".isAcceptOrganizationName() `should be equal to` false
252+
"ต้ม(มัด".isAcceptOrganizationName() `should be equal to` false
253+
"ต้ม)มัด".isAcceptOrganizationName() `should be equal to` false
254+
"ต้ม*มัด".isAcceptOrganizationName() `should be equal to` false
255+
"ต้ม+มัด".isAcceptOrganizationName() `should be equal to` false
256+
"ต้ม,มัด".isAcceptOrganizationName() `should be equal to` false
257+
"ต้ม;มัด".isAcceptOrganizationName() `should be equal to` false
258+
"ต้ม=มัด".isAcceptOrganizationName() `should be equal to` false
259+
"ต้ม<มัด".isAcceptOrganizationName() `should be equal to` false
260+
"ต้ม>มัด".isAcceptOrganizationName() `should be equal to` false
261+
"ต้ม{มัด".isAcceptOrganizationName() `should be equal to` false
262+
"ต้ม}มัด".isAcceptOrganizationName() `should be equal to` false
263+
"ต้ม|มัด".isAcceptOrganizationName() `should be equal to` false
264+
"ต้ม`มัด".isAcceptOrganizationName() `should be equal to` false
265+
"ต้ม^มัด".isAcceptOrganizationName() `should be equal to` false
266+
"ต้ม\\มัด".isAcceptOrganizationName() `should be equal to` false
267+
"ต้ม\"มัด".isAcceptOrganizationName() `should be equal to` false
268+
"ต้ม%มัด".isAcceptOrganizationName() `should be equal to` false
249269
}
250270

251271
@Test

0 commit comments

Comments
 (0)