Skip to content

Commit 172828e

Browse files
Reorganizing new test classes
Breaking the new abstract parameterizations and percent codec test implementations into sub-packages within test scope. Updating dependencies and references to resolve compilation issues.
1 parent 46d2484 commit 172828e

File tree

4 files changed

+26
-16
lines changed

4 files changed

+26
-16
lines changed

src/test/java/org/owasp/esapi/codecs/AbstractCodecCharacterTest.java renamed to src/test/java/org/owasp/esapi/codecs/abstraction/AbstractCodecCharacterTest.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.owasp.esapi.codecs;
1+
package org.owasp.esapi.codecs.abstraction;
22

33
import static org.junit.Assert.assertEquals;
44

@@ -7,6 +7,8 @@
77
import org.junit.Test;
88
import org.junit.runner.RunWith;
99
import org.junit.runners.Parameterized;
10+
import org.owasp.esapi.codecs.Codec;
11+
import org.owasp.esapi.codecs.PushbackString;
1012

1113

1214
/**
@@ -23,17 +25,19 @@ public abstract class AbstractCodecCharacterTest {
2325
/** Test Data Tuple.*/
2426
protected static class CodecCharacterTestTuple {
2527
/** Codec reference to be tested.*/
26-
Codec codec;
28+
public Codec codec;
2729
/** Set of characters that should be considered 'immune' from decoding processes.*/
28-
char[] encodeImmune;
30+
public char[] encodeImmune;
2931
/** A String representing a single encoded character.*/
30-
String input;
32+
public String input;
3133
/** The single character that input represents.*/
32-
Character decodedValue;
34+
public Character decodedValue;
3335
/** Optional field to override the toString value of this tuple. */
34-
String description;
35-
/** {@inheritDoc}*/
36+
public String description;
3637

38+
/**Default public constructor.*/
39+
public CodecCharacterTestTuple() { /* No Op*/ }
40+
/** {@inheritDoc}*/
3741
@Override
3842
public String toString() {
3943
return description != null ? description : codec.getClass().getSimpleName() + " "+input;

src/test/java/org/owasp/esapi/codecs/AbstractCodecStringTest.java renamed to src/test/java/org/owasp/esapi/codecs/abstraction/AbstractCodecStringTest.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package org.owasp.esapi.codecs;
1+
package org.owasp.esapi.codecs.abstraction;
22

33
import org.junit.Assert;
44
import org.junit.Test;
55
import org.junit.runner.RunWith;
66
import org.junit.runners.Parameterized;
7+
import org.owasp.esapi.codecs.Codec;
78

89

910
/**
@@ -19,17 +20,20 @@ public abstract class AbstractCodecStringTest {
1920

2021
protected static class CodecStringTestTuple {
2122
/** Codec reference to be tested.*/
22-
Codec codec;
23+
public Codec codec;
2324
/** Set of characters that should be considered 'immune' from decoding processes.*/
24-
char[] encodeImmune;
25+
public char[] encodeImmune;
2526
/** A String representing a contextually encoded String.*/
26-
String input;
27+
public String input;
2728
/** The decoded representation of the input value.*/
28-
String decodedValue;
29+
public String decodedValue;
2930
/** Optional field to override the toString value of this tuple. */
30-
String description;
31-
/** {@inheritDoc}*/
31+
public String description;
32+
33+
/**Default public constructor.*/
34+
public CodecStringTestTuple() { /* No Op*/ }
3235

36+
/** {@inheritDoc}*/
3337
@Override
3438
public String toString() {
3539
return description != null ? description : codec.getClass().getSimpleName() + " "+input;

src/test/java/org/owasp/esapi/codecs/PercentCodecCharacterTest.java renamed to src/test/java/org/owasp/esapi/codecs/percent/PercentCodecCharacterTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.owasp.esapi.codecs;
1+
package org.owasp.esapi.codecs.percent;
22

33
import java.util.ArrayList;
44
import java.util.Collection;
@@ -9,6 +9,7 @@
99
import org.junit.runners.Parameterized.Parameters;
1010
import org.owasp.esapi.codecs.PercentCodec;
1111
import org.owasp.esapi.codecs.PushbackString;
12+
import org.owasp.esapi.codecs.abstraction.AbstractCodecCharacterTest;
1213

1314
/**
1415
* Codec validation focused on the PercentCodec Character-based api.

src/test/java/org/owasp/esapi/codecs/PercentCodecStringTest.java renamed to src/test/java/org/owasp/esapi/codecs/percent/PercentCodecStringTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package org.owasp.esapi.codecs;
1+
package org.owasp.esapi.codecs.percent;
22

33
import java.util.ArrayList;
44
import java.util.Collection;
55
import java.util.List;
66

77
import org.junit.runners.Parameterized.Parameters;
88
import org.owasp.esapi.codecs.PercentCodec;
9+
import org.owasp.esapi.codecs.abstraction.AbstractCodecStringTest;
910

1011
/**
1112
* Codec validation focused on the PercentCodec String-based api.

0 commit comments

Comments
 (0)