Skip to content

Commit 2ed4745

Browse files
committed
Add more tests for section partial
1 parent 7bf29b5 commit 2ed4745

8 files changed

Lines changed: 73 additions & 94 deletions

src/test/java/com/yocto/yoclib/imap/tests/protocol/ProtocolAtomTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ public void testEquals(){
1717
assertEquals(new ProtocolAtom("ab"),new ProtocolAtom("ab"));
1818
assertEquals(new ProtocolAtom("abc"),new ProtocolAtom("abc"));
1919

20-
assertNotEquals(new ProtocolAtom("a"),null);
21-
assertNotEquals(null,new ProtocolAtom("a"));
22-
23-
assertNotEquals(new ProtocolAtom("ab"),"ab");
24-
assertNotEquals("ab",new ProtocolAtom("ab"));
20+
Object unknown = "ab";
21+
assertNotEquals(new ProtocolAtom("ab"),unknown);
22+
assertNotEquals(unknown,new ProtocolAtom("ab"));
2523
}
2624

2725
@Test

src/test/java/com/yocto/yoclib/imap/tests/protocol/ProtocolBinaryLiteralTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ public void testEquals(){
2121
assertEquals(new ProtocolBinaryLiteral("\u0000ab\u0000",true),new ProtocolBinaryLiteral("\u0000ab\u0000",true));
2222
assertEquals(new ProtocolBinaryLiteral("\u0000abc\u0000",true),new ProtocolBinaryLiteral("\u0000abc\u0000",true));
2323

24-
assertNotEquals(new ProtocolBinaryLiteral("\u0000a\u0000"),null);
25-
assertNotEquals(null,new ProtocolBinaryLiteral("\u0000a\u0000"));
26-
27-
assertNotEquals(new ProtocolBinaryLiteral("\u0000ab\u0000"),"\u0000ab\u0000");
28-
assertNotEquals("\u0000ab\u0000",new ProtocolBinaryLiteral("\u0000ab\u0000"));
24+
Object unknown = "\u0000ab\u0000";
25+
assertNotEquals(new ProtocolBinaryLiteral("\u0000ab\u0000"),unknown);
26+
assertNotEquals(unknown,new ProtocolBinaryLiteral("\u0000ab\u0000"));
2927

3028
assertNotEquals(new ProtocolBinaryLiteral("\u0000def\u0000"),new ProtocolBinaryLiteral("\u0000abc\u0000"));
3129
assertNotEquals(new ProtocolBinaryLiteral("\u0000abc\u0000",true),new ProtocolBinaryLiteral("\u0000abc\u0000"));

src/test/java/com/yocto/yoclib/imap/tests/protocol/ProtocolListTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ public void testEquals(){
2424
assertEquals(new ProtocolList(new ProtocolObject[]{a,ab}),new ProtocolList(new ProtocolObject[]{a,ab}));
2525
assertEquals(new ProtocolList(new ProtocolObject[]{a,ab,abc}),new ProtocolList(new ProtocolObject[]{a,ab,abc}));
2626

27-
assertNotEquals(new ProtocolList(new ProtocolObject[]{a}),null);
28-
assertNotEquals(null,new ProtocolList(new ProtocolObject[]{a}));
29-
30-
assertNotEquals(new ProtocolList(new ProtocolObject[]{a,ab}),new ProtocolObject[]{a,ab});
31-
assertNotEquals(new ProtocolObject[]{a,ab},new ProtocolList(new ProtocolObject[]{a,ab}));
27+
Object unknown = new ProtocolObject[]{a,ab};
28+
assertNotEquals(new ProtocolList(new ProtocolObject[]{a,ab}),unknown);
29+
assertNotEquals(unknown,new ProtocolList(new ProtocolObject[]{a,ab}));
3230
}
3331

3432
@Test

src/test/java/com/yocto/yoclib/imap/tests/protocol/ProtocolLiteralTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ public void testEquals(){
2020
assertEquals(new ProtocolLiteral("ab",true),new ProtocolLiteral("ab",true));
2121
assertEquals(new ProtocolLiteral("abc",true),new ProtocolLiteral("abc",true));
2222

23-
assertNotEquals(new ProtocolLiteral("a"),null);
24-
assertNotEquals(null,new ProtocolLiteral("a"));
25-
26-
assertNotEquals(new ProtocolLiteral("ab"),"ab");
27-
assertNotEquals("ab",new ProtocolLiteral("ab"));
23+
Object unknown = "ab";
24+
assertNotEquals(new ProtocolLiteral("ab"),unknown);
25+
assertNotEquals(unknown,new ProtocolLiteral("ab"));
2826

2927
assertNotEquals(new ProtocolLiteral("def"),new ProtocolLiteral("abc"));
3028
assertNotEquals(new ProtocolLiteral("abc",true),new ProtocolLiteral("abc"));

src/test/java/com/yocto/yoclib/imap/tests/protocol/ProtocolQuotedTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ public void testEquals(){
1515
assertEquals(new ProtocolQuoted("ab"),new ProtocolQuoted("ab"));
1616
assertEquals(new ProtocolQuoted("abc"),new ProtocolQuoted("abc"));
1717

18-
assertNotEquals(new ProtocolQuoted("a"),null);
19-
assertNotEquals(null,new ProtocolQuoted("a"));
20-
21-
assertNotEquals(new ProtocolQuoted("ab"),"ab");
22-
assertNotEquals("ab",new ProtocolQuoted("ab"));
18+
Object unknown = "ab";
19+
assertNotEquals(new ProtocolQuoted("ab"),unknown);
20+
assertNotEquals(unknown,new ProtocolQuoted("ab"));
2321
}
2422

2523
@Test

src/test/java/com/yocto/yoclib/imap/tests/protocol/ProtocolSectionPartialTest.java

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@ public void testEquals(){
1919

2020
assertEquals(new ProtocolSectionPartial(atom),new ProtocolSectionPartial(atom));
2121

22-
assertNotEquals(new ProtocolSectionPartial(atom),null);
23-
assertNotEquals(null,new ProtocolSectionPartial(atom));
24-
25-
assertNotEquals(new ProtocolSectionPartial(atom),atom);
26-
assertNotEquals(atom,new ProtocolSectionPartial(atom));
22+
Object unknown = new ProtocolAtom("ab");
23+
assertNotEquals(new ProtocolSectionPartial(atom),unknown);
24+
assertNotEquals(unknown,new ProtocolSectionPartial(atom));
2725
}
2826

2927
@Test
@@ -64,4 +62,36 @@ public void testGetPartialLength(){
6462
}),123,456).getPartialLength());
6563
}
6664

65+
@Test
66+
public void testToProtocolString(){
67+
ProtocolAtom atom = new ProtocolAtom("a");
68+
ProtocolSubordinate subordinate = new ProtocolSubordinate(new ProtocolObject[]{
69+
new ProtocolAtom("ab"),
70+
new ProtocolAtom("abc"),
71+
});
72+
73+
assertEquals("a[ab abc]<123.456>",new ProtocolSectionPartial(atom,subordinate,123,456).toProtocolString());
74+
assertEquals("a[ab abc]<123>",new ProtocolSectionPartial(atom,subordinate,123).toProtocolString());
75+
assertEquals("a[ab abc]",new ProtocolSectionPartial(atom,subordinate).toProtocolString());
76+
assertEquals("a<123.456>",new ProtocolSectionPartial(atom,123,456).toProtocolString());
77+
assertEquals("a<123>",new ProtocolSectionPartial(atom,123).toProtocolString());
78+
assertEquals("a",new ProtocolSectionPartial(atom).toProtocolString());
79+
}
80+
81+
@Test
82+
public void testToString(){
83+
ProtocolAtom atom = new ProtocolAtom("a");
84+
ProtocolSubordinate subordinate = new ProtocolSubordinate(new ProtocolObject[]{
85+
new ProtocolAtom("ab"),
86+
new ProtocolAtom("abc"),
87+
});
88+
89+
assertEquals("ProtocolSectionPartial{atom=ProtocolAtom{value='a'}, subordinate=ProtocolSubordinate{objects=[ProtocolAtom{value='ab'}, ProtocolAtom{value='abc'}]}, partialOffset=123, partialLength=456}",new ProtocolSectionPartial(atom,subordinate,123,456).toString());
90+
assertEquals("ProtocolSectionPartial{atom=ProtocolAtom{value='a'}, subordinate=ProtocolSubordinate{objects=[ProtocolAtom{value='ab'}, ProtocolAtom{value='abc'}]}, partialOffset=123, partialLength=null}",new ProtocolSectionPartial(atom,subordinate,123).toString());
91+
assertEquals("ProtocolSectionPartial{atom=ProtocolAtom{value='a'}, subordinate=ProtocolSubordinate{objects=[ProtocolAtom{value='ab'}, ProtocolAtom{value='abc'}]}, partialOffset=null, partialLength=null}",new ProtocolSectionPartial(atom,subordinate).toString());
92+
assertEquals("ProtocolSectionPartial{atom=ProtocolAtom{value='a'}, subordinate=null, partialOffset=123, partialLength=456}",new ProtocolSectionPartial(atom,123,456).toString());
93+
assertEquals("ProtocolSectionPartial{atom=ProtocolAtom{value='a'}, subordinate=null, partialOffset=123, partialLength=null}",new ProtocolSectionPartial(atom,123).toString());
94+
assertEquals("ProtocolSectionPartial{atom=ProtocolAtom{value='a'}, subordinate=null, partialOffset=null, partialLength=null}",new ProtocolSectionPartial(atom).toString());
95+
}
96+
6797
}

src/test/java/com/yocto/yoclib/imap/tests/protocol/ProtocolStringTest.java

Lines changed: 20 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -11,69 +11,17 @@
1111
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
1212
import static org.junit.jupiter.api.Assertions.assertNotEquals;
1313

14-
public class ProtocolStringTest {
14+
public class ProtocolStringTest{
1515

1616
@Test
1717
public void testEquals(){
18-
assertEquals(new ProtocolString("a") {
19-
@Override
20-
public String toProtocolString() {
21-
return null;
22-
}
23-
}, new ProtocolString("a"){
24-
@Override
25-
public String toProtocolString() {
26-
return null;
27-
}
28-
});
29-
assertEquals(new ProtocolString("ab"){
30-
@Override
31-
public String toProtocolString() {
32-
return null;
33-
}
34-
},new ProtocolString("ab"){
35-
@Override
36-
public String toProtocolString() {
37-
return null;
38-
}
39-
});
40-
assertEquals(new ProtocolString("abc"){
41-
@Override
42-
public String toProtocolString() {
43-
return null;
44-
}
45-
},new ProtocolString("abc"){
46-
@Override
47-
public String toProtocolString() {
48-
return null;
49-
}
50-
});
51-
52-
assertNotEquals(new ProtocolString("a"){
53-
@Override
54-
public String toProtocolString() {
55-
return null;
56-
}
57-
},null);
58-
assertNotEquals(null,new ProtocolString("a"){
59-
@Override
60-
public String toProtocolString() {
61-
return null;
62-
}
63-
});
18+
assertEquals(new ProtocolStringDummy("a") , new ProtocolStringDummy("a"));
19+
assertEquals(new ProtocolStringDummy("ab"),new ProtocolStringDummy("ab"));
20+
assertEquals(new ProtocolStringDummy("abc"),new ProtocolStringDummy("abc"));
6421

65-
assertNotEquals(new ProtocolString("ab"){
66-
@Override
67-
public String toProtocolString() {
68-
return null;
69-
}
70-
},"ab");
71-
assertNotEquals("ab",new ProtocolString("ab"){
72-
@Override
73-
public String toProtocolString() {
74-
return null;
75-
}
76-
});
22+
Object unknown = "ab";
23+
assertNotEquals(new ProtocolStringDummy("ab"),unknown);
24+
assertNotEquals(unknown,new ProtocolStringDummy("ab"));
7725
}
7826

7927
@Test
@@ -113,4 +61,17 @@ public void testStaticCreate(){
11361
assertInstanceOf(ProtocolQuoted.class,ProtocolString.create("abc",true));
11462
}
11563

64+
public static class ProtocolStringDummy extends ProtocolString{
65+
66+
protected ProtocolStringDummy(String value){
67+
super(value);
68+
}
69+
70+
@Override
71+
public String toProtocolString() {
72+
return null;
73+
}
74+
75+
}
76+
11677
}

src/test/java/com/yocto/yoclib/imap/tests/protocol/ProtocolSubordinateTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ public void testEquals(){
2424
assertEquals(new ProtocolSubordinate(new ProtocolObject[]{a,ab}),new ProtocolSubordinate(new ProtocolObject[]{a,ab}));
2525
assertEquals(new ProtocolSubordinate(new ProtocolObject[]{a,ab,abc}),new ProtocolSubordinate(new ProtocolObject[]{a,ab,abc}));
2626

27-
assertNotEquals(new ProtocolSubordinate(new ProtocolObject[]{a}),null);
28-
assertNotEquals(null,new ProtocolSubordinate(new ProtocolObject[]{a}));
29-
30-
assertNotEquals(new ProtocolSubordinate(new ProtocolObject[]{a,ab}),new ProtocolObject[]{a,ab});
31-
assertNotEquals(new ProtocolObject[]{a,ab},new ProtocolSubordinate(new ProtocolObject[]{a,ab}));
27+
Object unknown = new ProtocolObject[]{a,ab};
28+
assertNotEquals(new ProtocolSubordinate(new ProtocolObject[]{a,ab}),unknown);
29+
assertNotEquals(unknown,new ProtocolSubordinate(new ProtocolObject[]{a,ab}));
3230
}
3331

3432
@Test

0 commit comments

Comments
 (0)