File tree Expand file tree Collapse file tree 8 files changed +56
-29
lines changed Expand file tree Collapse file tree 8 files changed +56
-29
lines changed Original file line number Diff line number Diff line change 1414 <orderEntry type =" library" name =" Maven: mysql:mysql-connector-java:5.1.30" level =" project" />
1515 <orderEntry type =" library" name =" Maven: log4j:log4j:1.2.17" level =" project" />
1616 <orderEntry type =" library" name =" Maven: commons-lang:commons-lang:2.6" level =" project" />
17- <orderEntry type =" library" name =" Maven: junit:junit:4.5" level =" project" />
17+ <orderEntry type =" library" name =" Maven: junit:junit:4.13-beta-3" level =" project" />
18+ <orderEntry type =" library" name =" Maven: org.hamcrest:hamcrest-core:1.3" level =" project" />
1819 <orderEntry type =" library" name =" Maven: com.alibaba:druid:1.1.5" level =" project" />
20+ <orderEntry type =" library" name =" Maven: org.projectlombok:lombok:1.18.6" level =" project" />
1921 <orderEntry type =" library" name =" Maven: net.sf.json-lib:json-lib:jdk15:2.4" level =" project" />
2022 <orderEntry type =" library" name =" Maven: commons-beanutils:commons-beanutils:1.8.3" level =" project" />
2123 <orderEntry type =" library" name =" Maven: commons-collections:commons-collections:3.2.1" level =" project" />
3436 <orderEntry type =" library" name =" Maven: org.slf4j:slf4j-api:1.7.25" level =" project" />
3537 <orderEntry type =" library" name =" Maven: org.quartz-scheduler:quartz:2.2.1" level =" project" />
3638 <orderEntry type =" library" name =" Maven: c3p0:c3p0:0.9.1.1" level =" project" />
39+ <orderEntry type =" library" name =" Maven: org.junit.jupiter:junit-jupiter-api:5.5.0-M1" level =" project" />
40+ <orderEntry type =" library" name =" Maven: org.apiguardian:apiguardian-api:1.0.0" level =" project" />
41+ <orderEntry type =" library" name =" Maven: org.opentest4j:opentest4j:1.1.1" level =" project" />
42+ <orderEntry type =" library" name =" Maven: org.junit.platform:junit-platform-commons:1.5.0-M1" level =" project" />
3743 </component >
3844</module >
Original file line number Diff line number Diff line change 3232 <dependency >
3333 <groupId >junit</groupId >
3434 <artifactId >junit</artifactId >
35- <version >4.5</version >
3635 </dependency >
3736
3837 <dependency >
4140 <version >1.1.5</version >
4241 </dependency >
4342
43+ <dependency >
44+ <groupId >org.projectlombok</groupId >
45+ <artifactId >lombok</artifactId >
46+ <version >1.18.6</version >
47+ </dependency >
4448 <dependency >
4549 <groupId >net.sf.json-lib</groupId >
4650 <artifactId >json-lib</artifactId >
106110 <artifactId >quartz</artifactId >
107111 <version >2.2.1</version >
108112 </dependency >
109- </dependencies >
113+ <dependency >
114+ <groupId >junit</groupId >
115+ <artifactId >junit</artifactId >
116+ <version >RELEASE</version >
117+ <scope >test</scope >
118+ </dependency >
119+ <dependency >
120+ <groupId >org.junit.jupiter</groupId >
121+ <artifactId >junit-jupiter-api</artifactId >
122+ <version >RELEASE</version >
123+ <scope >compile</scope >
124+ </dependency >
125+ <dependency >
126+ <groupId >junit</groupId >
127+ <artifactId >junit</artifactId >
128+ <version >4.13-beta-3</version >
129+ <scope >compile</scope >
130+ </dependency >
131+ </dependencies >
110132
111133 <build >
112134 <plugins >
Original file line number Diff line number Diff line change 11package com .bean ;
22
3+ import lombok .extern .java .Log ;
4+
35/**
46 * Created by lenovo on 十一月
57 */
8+
69public class Order {
710 private String phoneNumber ;
811 private String doneCode ;
Original file line number Diff line number Diff line change 11package com .collection ;
22
33
4-
54import java .util .Map ;
65import java .util .SortedMap ;
76import java .util .TreeMap ;
1110 */
1211public class MapOperation {
1312
14- public static void ergodicMap (Map <Object ,Object > map ){
15- for (Map .Entry entry : map .entrySet ()) {
16- System .out .println ("key:" + entry .getKey ()+ " value:" + entry .getValue ());
13+ public static void ergodicMap (Map <Object , Object > map ) {
14+ for (Map .Entry entry : map .entrySet ()) {
15+ System .out .println ("key:" + entry .getKey () + " value:" + entry .getValue ());
1716 }
1817 }
1918
20- public static String mapToString (Map <Object ,Object > map )
21- {
22- SortedMap <Object ,Object > sortedMap = new TreeMap <Object ,Object >(map );
19+ public static String mapToString (Map <Object , Object > map ) {
20+ SortedMap <Object , Object > sortedMap = new TreeMap <Object , Object >(map );
2321
2422 StringBuilder sb = new StringBuilder ();
2523
2624 for (Map .Entry entry : sortedMap .entrySet ()) {
27- sb .append ( "key:" + entry .getKey () +" value:" + entry .getValue ()+ "\n " );
25+ sb .append ("key:" + entry .getKey () + " value:" + entry .getValue () + "\n " );
2826 }
2927 return sb .length () == 0 ? "" : sb .toString ();
3028 }
3129
3230
33-
3431}
Original file line number Diff line number Diff line change 66import java .util .Comparator ;
77import java .util .List ;
88
9- /**
10- * Created by lenovo on 十一月
11- */
9+
1210public class Sort {
1311 public List <Order > phoneNumberSort (List <Order > list ){
14- Collections .sort (list , new Comparator <Order >() {
15- @ Override
16- public int compare (Order o1 , Order o2 ) {
17- return o1 .getPhoneNumber ().compareTo (o2 .getPhoneNumber ())==0 ?
18- o1 .getDoneCode ().compareTo (o2 .getDoneCode ()) : o1 .getPhoneNumber ().compareTo (o2 .getPhoneNumber ()) ;
19- }
20- });
12+ list .sort ((o1 , o2 ) -> o1 .getPhoneNumber ().compareTo (o2 .getPhoneNumber ()) == 0 ?
13+ o1 .getDoneCode ().compareTo (o2 .getDoneCode ()) : o1 .getPhoneNumber ().compareTo (o2 .getPhoneNumber ()));
2114 return list ;
2215 }
2316}
Original file line number Diff line number Diff line change 11package com .test ;
22
3+ import lombok .extern .java .Log ;
4+ import lombok .extern .log4j .Log4j ;
5+
36import java .util .ArrayList ;
47import java .util .List ;
58
69/**
710 * Created by lenovo on 三月
811 */
12+ @ Log
913public class Test {
1014 public static void main (String [] args ) {
1115 List <String > list =new ArrayList <String >();
1216 list .add ("17875421001" );
1317 list .add ("12372221098" );
18+ log .info ("test" );
1419
1520 }
1621}
Original file line number Diff line number Diff line change 11package com .test .string ;
22
33import com .string .WordsAmount ;
4+ import org .junit .After ;
5+ import org .junit .Before ;
46import org .junit .Test ;
5- import org .junit .Before ;
6- import org .junit .After ;
77
88/**
99* WordsAmount Tester.
1010*
1111* @author <Authors name>
12- * @since <pre>ÈýÔÂ 23, 2017</pre>
12+ * @since <pre>���� 23, 2017</pre>
1313* @version 1.0
1414*/
1515public class WordsAmountTest {
@@ -20,7 +20,7 @@ public void before() throws Exception {
2020 wa =new WordsAmount ();
2121 str ="May you have enough happiness to make you sweet,\n " +
2222 "enough trials to make you strong,enough sorrow to keep you human,\n " +
23- "enough hope to make you happy? Always put yourself in others¡¯ shoes.\n " +
23+ "enough hope to make you happy? Always put yourself in others�� shoes.\n " +
2424 "If you feel that it hurts you,it probably hurts the other person, too." ;
2525}
2626
Original file line number Diff line number Diff line change 22
33import org .junit .Test ;
44import org .junit .Before ;
5- import org .junit .After ;
5+ import org .junit .After ;
66
77/**
88* Sort Tester.
@@ -27,8 +27,9 @@ public void after() throws Exception {
2727*
2828*/
2929@ Test
30- public void testPhoneNumberSort () throws Exception {
31- //TODO: Test goes here...
30+ public static void testPhoneNumberSort () throws Exception {
31+ //TODO: Test goes here...
32+
3233}
3334
3435
You can’t perform that action at this time.
0 commit comments