Skip to content

Commit 8d1c684

Browse files
BlankjBlankj
committed
see 04/27 log
1 parent 4c9c6a9 commit 8d1c684

File tree

21 files changed

+197
-206
lines changed

21 files changed

+197
-206
lines changed

‎app/src/main/java/com/blankj/androidutilcode/activity/CleanActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ protected void onCreate(Bundle savedInstanceState) {
4343
btnCleanInternalFiles.setText(getFilesDir().getPath());
4444
btnCleanInternalDbs.setText(getFilesDir().getParent() + File.separator + "databases");
4545
btnCleanInternalSP.setText(getFilesDir().getParent() + File.separator + "shared_prefs");
46+
//noinspection ConstantConditions
4647
btnCleanExternalCache.setText(getExternalCacheDir().getPath());
4748
}
4849

‎src/test/res/file/NEW.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
这是新的
2+
这是追加的

‎src/test/res/file/new File

Whitespace-only changes.

‎src/test/res/file1/NEW.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
这是新的
2+
这是追加的

‎src/test/res/file1/new File

Whitespace-only changes.

‎utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,7 @@ private static int calculateStatusColor(int color, int alpha) {
614614
red = (int) (red * a + 0.5);
615615
green = (int) (green * a + 0.5);
616616
blue = (int) (blue * a + 0.5);
617+
//noinspection NumericOverflow
617618
return 0xff << 24 | red << 16 | green << 8 | blue;
618619
}
619620

‎utilcode/src/main/java/com/blankj/utilcode/util/EncryptUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ public static byte[] encryptMD5File(File file) {
166166
MessageDigest md = MessageDigest.getInstance("MD5");
167167
digestInputStream = new DigestInputStream(fis, md);
168168
byte[] buffer = new byte[256 * 1024];
169+
//noinspection StatementWithEmptyBody
169170
while (digestInputStream.read(buffer) > 0) ;
170171
md = digestInputStream.getMessageDigest();
171172
return md.digest();

‎utilcode/src/main/java/com/blankj/utilcode/util/FileUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,6 +1182,7 @@ public static byte[] getFileMD5(File file) {
11821182
MessageDigest md = MessageDigest.getInstance("MD5");
11831183
dis = new DigestInputStream(fis, md);
11841184
byte[] buffer = new byte[1024 * 256];
1185+
//noinspection StatementWithEmptyBody
11851186
while (dis.read(buffer) > 0) ;
11861187
md = dis.getMessageDigest();
11871188
return md.digest();

‎utilcode/src/main/java/com/blankj/utilcode/util/ImageUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -991,6 +991,7 @@ public static Bitmap addFrame(Bitmap src, int borderWidth, int color, boolean re
991991
// setStrokeWidth是居中画的，所以要两倍的宽度才能画，否则有一半的宽度是空的
992992
paint.setStrokeWidth(doubleBorder);
993993
canvas.drawRect(rect, paint);
994+
//noinspection SuspiciousNameCombination
994995
canvas.drawBitmap(src, borderWidth, borderWidth, null);
995996
if (recycle && !src.isRecycled()) src.recycle();
996997
return ret;

‎utilcode/src/main/java/com/blankj/utilcode/util/PinyinUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ public static String getSurnameFirstLetter(CharSequence name) {
175175
surnames.put('难', "ning");
176176
surnames.put('黑', "he");
177177

178+
//noinspection StringBufferReplaceableByString
178179
pinyinTable = new StringBuilder(125412)
179180
.append("yi ding kao qi shang xia none wan zhang san shang xia ji bu yu mian gai chou chou zhuan qie pi shi shi qiu bing ye cong dong si cheng diu qiu liang diu you liang yan bing sang shu jiu ge ya qiang zhong ji jie feng guan chuan chan lin zhuo zhu none wan dan wei zhu jing li ju pie fu yi yi nai none jiu jiu tuo me yi none zhi wu zha hu fa le zhong ping pang qiao hu guai cheng cheng yi yin none mie jiu qi ye xi xiang gai diu none none shu none shi ji nang jia none shi none none mai luan none ru xi yan fu sha na gan none none none none qian zhi gui gan luan lin yi jue le none yu zheng shi shi er chu yu kui yu yun hu qi wu jing si sui gen gen ya xie ya qi ya ji tou wang kang ta jiao hai yi chan heng mu none xiang jing ting liang heng jing ye qin bo you xie dan lian duo wei ren ren ji none wang yi shen ren le ding ze jin pu chou ba zhang jin jie bing reng cong fo san lun none cang zi shi ta zhang fu xian xian cha hong tong ren qian gan ge di dai ling yi chao chang sa shang yi mu men ren jia chao yang qian zhong pi wan wu jian jia yao feng cang ren wang fen di fang zhong qi pei yu diao dun wen yi xin kang yi ji ai wu ji fu fa xiu jin bei chen fu tang zhong you huo hui yu cui yun san wei chuan che ya xian shang chang lun cang xun xin wei zhu chi xuan nao bo gu ni ni xie ban xu ling zhou shen qu si beng si jia pi yi si ai zheng dian han mai dan zhu bu qu bi shao ci wei di zhu zuo you yang ti zhan he bi tuo she yu yi fo zuo gou ning tong ni xuan ju yong wa qian none ka none pei huai he lao xiang ge yang bai fa ming jia nai bing ji heng huo gui quan tiao jiao ci yi shi xing shen tuo kan zhi gai lai yi chi kua guang li yin shi mi zhu xu you an lu mou er lun dong cha chi xun gong zhou yi ru jian xia jia zai lu: none jiao zhen ce qiao kuai chai ning nong jin wu hou jiong cheng zhen cuo chou qin lu: ju shu ting shen tuo bo nan hao bian tui yu xi cu e qiu xu kuang ku wu jun yi fu lang zu qiao li yong hun jing xian san pai su fu xi li mian ping bao yu si xia xin xiu yu ti che chou none yan liang li lai si jian xiu fu he ju xiao pai jian biao ti fei feng ya an bei yu xin bi chi chang zhi bing zan yao cui lia wan lai cang zong ge guan bei tian shu shu men dao tan jue chui xing peng tang hou yi qi ti gan jing jie xu chang jie fang zhi kong juan zong ju qian ni lun zhuo wo luo song leng hun dong zi ben wu ju nai cai jian zhai ye zhi sha qing none ying cheng qian yan nuan zhong chun jia jie wei yu bing ruo ti wei pian yan feng tang wo e xie che sheng kan di zuo cha ting bei ye huang yao zhan qiu yan you jian xu zha chai fu bi zhi zong mian ji yi xie xun si duan ce zhen ou tou tou bei za lou jie wei fen chang kui sou chi su xia fu yuan rong li ru yun gou ma bang dian tang hao jie xi shan qian jue cang chu san bei xiao yong yao ta suo wang fa bing jia dai zai tang none bin chu nuo zan lei cui yong zao zong peng song ao chuan yu zhai zu shang qian")
180181
.append("g qiang chi sha han zhang qing yan di xi lou bei piao jin lian lu man qian xian qiu ying dong zhuan xiang shan qiao jiong tui zun pu xi lao chang guang liao qi deng chan wei zhang fan hui chuan tie dan jiao jiu seng fen xian jue e jiao jian tong lin bo gu xian su xian jiang min ye jin jia qiao pi feng zhou ai sai yi jun nong shan yi dang jing xuan kuai jian chu dan jiao sha zai none bin an ru tai chou chai lan ni jin qian meng wu neng qiong ni chang lie lei lu: kuang bao du biao zan zhi si you hao qin chen li teng wei long chu chan rang shu hui li luo zan nuo tang yan lei nang er wu yun zan yuan xiong chong zhao xiong xian guang dui ke dui mian tu chang er dui er jin tu si yan yan shi shi dang qian dou fen mao xin dou bai jing li kuang ru wang nei quan liang yu ba gong liu xi none lan gong tian guan xing bing qi ju dian zi none yang jian shou ji yi ji chan jiong mao ran nei yuan mao gang ran ce jiong ce zai gua jiong mao zhou mao gou xu mian mi rong yin xie kan jun nong yi mi shi guan meng zhong zui yuan ming kou none fu xie mi bing dong tai gang feng bing hu chong jue hu kuang ye leng pan fu min dong xian lie xia jian jing shu mei shang qi gu zhun song jing liang qing diao ling dong gan jian yin cou ai li cang ming zhun cui si duo jin lin lin ning xi du ji fan fan fan feng ju chu none feng none none fu feng ping feng kai huang kai gan deng ping qu xiong kuai tu ao chu ji dang han han zao dao diao dao ren ren chuangfen qie yi ji kan qian cun chu wen ji dan xing hua wan jue li yue lie liu ze gang chuangfu chu qu ju shan min ling zhong pan bie jie jie bao li shan bie chan jing gua gen dao chuangkui ku duo er zhi shua quan cha ci ke jie gui ci gui kai duo ji ti jing lou luo ze yuan cuo xue ke la qian cha chuan gua jian cuo li ti fei pou chan qi chuangzi gang wan bo ji duo qing yan zhuo jian ji bo yan ju huo sheng jian duo duan wu gua fu sheng jian ge zha kai chuangjuan chan tuan lu li fou shan piao kou jiao gua qiao jue hua zha zhuo lian ju pi liu gui jiao gui jian jian tang huo ji jian yi jian zhi chan cuan mo li zhu li ya quan ban gong jia wu mai lie jing keng xie zhi dong zhu nu jie qu shao yi zhu mo li jing lao lao juan kou yang wa xiao mou kuang jie lie he shi ke jing hao bo min chi lang yong yong mian ke xun juan qing lu bu meng lai le kai mian dong xu xu kan wu yi xun weng sheng lao mu lu piao shi ji qin qiang jiao quan xiang yi qiao fan juan tong ju dan xie mai xun xun lu: li che rang quan bao shao yun jiu bao gou wu yun none none gai gai bao cong none xiong peng ju tao ge pu an pao fu gong da jiu qiong bi hua bei nao chi fang jiu yi za jiang kang jiang kuang hu xia qu fan gui qie cang kuang fei hu yu gui kui hui dan kui lian lian suan du jiu qu xi pi qu yi an yan bian ni qu shi xin qian nian sa zu sheng wu hui ban shi xi wan hua xie wan bei zu zhuo xie dan mai nan dan ji bo shuai bu kuang bian bu zhan ka lu you lu xi gua wo xie jie jie wei ang qiong zhi mao yin we")

‎utilcode/src/test/java/com/blankj/utilcode/util/ClipboardUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class ClipboardUtilsTest {
2424

2525
@Before
2626
public void setUp() throws Exception {
27-
if (Utils.getContext() == null) TestUtils.init();
27+
TestUtils.init();
2828
}
2929

3030
@Test

‎utilcode/src/test/java/com/blankj/utilcode/util/DogeTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ public class DogeTest {
3737
dogeFiles.add(new File("F:/MyGithub/doge-expression/_11_700_799_OtherJpg"));
3838
}
3939

40-
41-
@Test
4240
public void generateDogeMD() throws Exception {
4341
bitNum = 4;
4442
renameDogeNames();
@@ -65,7 +63,6 @@ public void generateDogeMD() throws Exception {
6563
FileUtils.writeFileFromString("F:/MyGithub/doge-expression/README.md", sb.toString(), false);
6664
}
6765

68-
@Test
6966
public void renameDogeNames() throws Exception {
7067
for (int i = 0; i < dogeFiles.size(); ++i) {
7168
List<File> files = FileUtils.listFilesInDir(dogeFiles.get(i));

‎utilcode/src/test/java/com/blankj/utilcode/util/EncodeUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ public void testHtmlEncode() throws Exception {
6363

6464
@Test
6565
public void testHtmlDecode() throws Exception {
66-
assertThat(htmlDecode(encodeHtml)).isEqualTo(html);
66+
assertThat(htmlDecode(encodeHtml).toString()).isEqualTo(html);
6767
}
6868
}

‎utilcode/src/test/java/com/blankj/utilcode/util/EncryptUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public void testDecryptAES() throws Exception {
206206
(bytesDataAES);
207207
}
208208

209-
String path = TestUtils.BASEPATH + "encrypt" + TestUtils.FILE_SEP;
209+
String path = TestUtils.TEST_PATH + "encrypt" + TestUtils.FILE_SEP;
210210
String md5 = "7F138A09169B250E9DCB378140907378";
211211

212212
@Test

‎utilcode/src/test/java/com/blankj/utilcode/util/FileUtilsTest.java

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.io.FilenameFilter;
88

99
import static com.blankj.utilcode.util.FileUtils.*;
10-
import static com.blankj.utilcode.util.TestUtils.BASEPATH;
10+
import static com.blankj.utilcode.util.TestUtils.TEST_PATH;
1111
import static com.blankj.utilcode.util.TestUtils.FILE_SEP;
1212
import static com.google.common.truth.Truth.assertThat;
1313

@@ -22,7 +22,8 @@
2222
public class FileUtilsTest {
2323

2424

25-
String path = BASEPATH + "file" + FILE_SEP;
25+
String path = TEST_PATH + "file" + FILE_SEP;
26+
String path1 = TEST_PATH + "file1" + FILE_SEP;
2627

2728
@Test
2829
public void testGetFileByPath() throws Exception {
@@ -40,6 +41,7 @@ public void testIsFileExists() throws Exception {
4041
@Test
4142
public void testRename() throws Exception {
4243
assertThat(rename(path + "GBK.txt", "GBK1.txt")).isTrue();
44+
assertThat(rename(path + "GBK1.txt", "GBK.txt")).isTrue();
4345
}
4446

4547
@Test
@@ -58,34 +60,39 @@ public void testIsFile() throws Exception {
5860
public void testCreateOrExistsDir() throws Exception {
5961
assertThat(createOrExistsDir(path + "new Dir")).isTrue();
6062
assertThat(createOrExistsDir(path)).isTrue();
63+
deleteDir(path + "new Dir");
6164
}
6265

6366
@Test
6467
public void testCreateOrExistsFile() throws Exception {
6568
assertThat(createOrExistsFile(path + "new File")).isTrue();
6669
assertThat(createOrExistsFile(path)).isFalse();
70+
deleteFile(path + "new File");
6771
}
6872

6973
@Test
7074
public void testCreateFileByDeleteOldFile() throws Exception {
7175
assertThat(createFileByDeleteOldFile(path + "new File")).isTrue();
7276
assertThat(createFileByDeleteOldFile(path)).isFalse();
77+
deleteFile(path + "new File");
7378
}
7479

75-
String path1 = BASEPATH + "file1" + FILE_SEP;
76-
7780
@Test
7881
public void testCopyDir() throws Exception {
7982
assertThat(copyDir(path, path)).isFalse();
8083
assertThat(copyDir(path, path + "new Dir")).isFalse();
8184
assertThat(copyDir(path, path1)).isTrue();
85+
deleteDir(path1);
8286
}
8387

8488
@Test
8589
public void testCopyFile() throws Exception {
8690
assertThat(copyFile(path + "GBK.txt", path + "GBK.txt")).isFalse();
8791
assertThat(copyFile(path + "GBK.txt", path + "new Dir" + FILE_SEP + "GBK.txt")).isTrue();
8892
assertThat(copyFile(path + "GBK.txt", path1 + "GBK.txt")).isTrue();
93+
deleteDir(path + "new Dir" + FILE_SEP + "GBK.txt");
94+
deleteDir(path1 + "GBK.txt");
95+
8996
}
9097

9198
@Test
@@ -101,30 +108,7 @@ public void testMoveFile() throws Exception {
101108
assertThat(moveFile(path + "GBK.txt", path + "GBK.txt")).isFalse();
102109
assertThat(moveFile(path + "GBK.txt", path1 + "GBK.txt")).isTrue();
103110
assertThat(moveFile(path1 + "GBK.txt", path + "GBK.txt")).isTrue();
104-
}
105-
106-
@Test
107-
public void testDeleteDir() throws Exception {
108-
assertThat(deleteDir(path + "GBK.txt")).isFalse();
109-
assertThat(deleteDir(path + "del")).isTrue();
110-
}
111-
112-
@Test
113-
public void testDeleteFile() throws Exception {
114-
assertThat(deleteFile(path)).isFalse();
115-
assertThat(deleteFile(path + "GBK1.txt")).isTrue();
116-
assertThat(deleteFile(path + "del.txt")).isTrue();
117-
}
118-
119-
@Test
120-
public void testDeleteFilesInDir() throws Exception {
121-
assertThat(deleteFilesInDir(path + "child")).isTrue();
122-
}
123-
124-
@Test
125-
public void testListFilesInDir() throws Exception {
126-
System.out.println(listFilesInDir(path, false).toString());
127-
System.out.println(listFilesInDir(path, true).toString());
111+
deleteDir(path1);
128112
}
129113

130114
FilenameFilter filter = new FilenameFilter() {
@@ -158,7 +142,7 @@ public void testWriteFileFromIS() throws Exception {
158142
@Test
159143
public void testWriteFileFromString() throws Exception {
160144
assertThat(writeFileFromString(path + "NEW.txt", "这是新的", false)).isTrue();
161-
assertThat(writeFileFromString(path + "NEW.txt", "\r\n这是追加的", true)).isTrue();
145+
assertThat(writeFileFromString(path + "NEW.txt", "这是追加的", true)).isTrue();
162146
}
163147

164148
@Test

‎utilcode/src/test/java/com/blankj/utilcode/util/RegexUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void testIsEmail() throws Exception {
6464
@Test
6565
public void testIsURL() throws Exception {
6666
assertThat(isURL("http://blankj.com")).isTrue();
67-
assertThat(isURL("http://blank")).isFalse();
67+
assertThat(isURL("https:blank")).isFalse();
6868
}
6969

7070
@Test

‎utilcode/src/test/java/com/blankj/utilcode/util/SPUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class SPUtilsTest {
2626

2727
@Before
2828
public void setUp() throws Exception {
29-
if (Utils.getContext() == null) TestUtils.init();
29+
TestUtils.init();
3030
if (spUtils == null) {
3131
spUtils = new SPUtils("test");
3232
spUtils.put("stringKey", "stringVal");

‎utilcode/src/test/java/com/blankj/utilcode/util/TestUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class TestUtils {
2525

2626
private static final String LINE_SEP = System.getProperty("line.separator");
2727

28-
static final String BASEPATH = System.getProperty("user.dir") + FILE_SEP + "src" + FILE_SEP + "test" + FILE_SEP + "res" + FILE_SEP;
28+
static final String TEST_PATH = System.getProperty("user.dir") + FILE_SEP + "utilcode" + FILE_SEP + "src" + FILE_SEP + "test" + FILE_SEP + "res" + FILE_SEP;
2929

3030
public static void init() {
3131
Utils.init(RuntimeEnvironment.application);

0 commit comments

Comments
 (0)