Skip to content

Commit e0fe2b5

Browse files
author
Chad Huff
committed
Fix MN datatypes
1 parent 62a4b7b commit e0fe2b5

4 files changed

Lines changed: 17 additions & 18 deletions

File tree

‎iabgpp-encoder/src/main/java/com/iab/gpp/encoder/section/UsMn.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ public List<Integer> getSensitiveDataProcessing() {
107107
}
108108

109109
@SuppressWarnings("unchecked")
110-
public List<Integer> getKnownChildSensitiveDataConsents() {
111-
return (List<Integer>) this.getFieldValue(UsMnField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS);
110+
public Integer getKnownChildSensitiveDataConsents() {
111+
return (Integer) this.getFieldValue(UsMnField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS);
112112
}
113113

114114
public Integer getAdditionalDataProcessingConsent() {

‎iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/UsMnCoreSegment.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,10 @@ protected EncodableBitStringFields initializeFields() {
5959
fields.put(UsMnField.TARGETED_ADVERTISING_OPT_OUT,
6060
new EncodableFixedInteger(2, 0).withValidator(nullableBooleanAsTwoBitIntegerValidator));
6161
fields.put(UsMnField.SENSITIVE_DATA_PROCESSING,
62-
new EncodableFixedIntegerList(2, Arrays.asList(0, 0, 0, 0, 0, 0, 0, 0, 0))
62+
new EncodableFixedIntegerList(2, Arrays.asList(0, 0, 0, 0, 0, 0, 0, 0))
6363
.withValidator(nullableBooleanAsTwoBitIntegerListValidator));
6464
fields.put(UsMnField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS,
65-
new EncodableFixedIntegerList(2, Arrays.asList(0, 0, 0, 0, 0))
66-
.withValidator(nullableBooleanAsTwoBitIntegerListValidator));
65+
new EncodableFixedInteger(2, 0).withValidator(nullableBooleanAsTwoBitIntegerValidator));
6766
fields.put(UsMnField.ADDITIONAL_DATA_PROCESSING_CONSENT,
6867
new EncodableFixedInteger(2, 0).withValidator(nullableBooleanAsTwoBitIntegerValidator));
6968
fields.put(UsMnField.MSPA_COVERED_TRANSACTION,

‎iabgpp-encoder/src/test/java/com/iab/gpp/encoder/GppModelTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public void testEncodeDefaultAll() {
133133

134134
String gppString = gppModel.encode();
135135
Assertions.assertEquals(
136-
"DBACOYs~CPSG_8APSG_8AAAAAAENAACAAAAAAAAAAAAAAAAAAAAA.QAAA.IAAA~BPSG_8APSG_8AAAAAAENAACAAAAAAAAAAAAAAAAAAA.YAAAAAAAAAA~1---~BAAAAAAAAABA.QA~BAAAAABA.QA~BAAAABA~BAAAAEA.QA~BAAAAAQA~BAAAAAEA.QA~BAAAAABA~BAAAAABA.QA~BAAAAAABAA.QA~BAAAAAQA.QA~BAAAAAABAA.QA~BAAAAAQA.QA~BAAAAAQA.QA~BAAAAABA.QA~BAAAAAAAQA.QA~BAAAAAQA.QA~BAAAAAABAA.QA",
136+
"DBACOYs~CPSG_8APSG_8AAAAAAENAACAAAAAAAAAAAAAAAAAAAAA.QAAA.IAAA~BPSG_8APSG_8AAAAAAENAACAAAAAAAAAAAAAAAAAAA.YAAAAAAAAAA~1---~BAAAAAAAAABA.QA~BAAAAABA.QA~BAAAABA~BAAAAEA.QA~BAAAAAQA~BAAAAAEA.QA~BAAAAABA~BAAAAABA.QA~BAAAAAABAA.QA~BAAAAAQA.QA~BAAAAAABAA.QA~BAAAAAQA.QA~BAAAAAQA.QA~BAAAAABA.QA~BAAAAAAAQA.QA~BAAAAAQA.QA~BAAAAAQA.QA",
137137
gppString);
138138
}
139139

‎iabgpp-encoder/src/test/java/com/iab/gpp/encoder/section/UsMnTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class UsMnTest {
1414
@Test
1515
public void testEncode1() {
1616
UsMn usMn = new UsMn();
17-
Assertions.assertEquals("BAAAAAABAA.QA", usMn.encode());
17+
Assertions.assertEquals("BAAAAAQA.QA", usMn.encode());
1818
}
1919

2020
@Test
@@ -26,15 +26,15 @@ public void testEncode2() {
2626
usMn.setFieldValue(UsMnField.TARGETED_ADVERTISING_OPT_OUT_NOTICE, 1);
2727
usMn.setFieldValue(UsMnField.SALE_OPT_OUT, 1);
2828
usMn.setFieldValue(UsMnField.TARGETED_ADVERTISING_OPT_OUT, 1);
29-
usMn.setFieldValue(UsMnField.SENSITIVE_DATA_PROCESSING, Arrays.asList(2, 1, 0, 2, 1, 0, 2, 1, 0));
30-
usMn.setFieldValue(UsMnField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, Arrays.asList(2, 1, 0, 2, 1));
29+
usMn.setFieldValue(UsMnField.SENSITIVE_DATA_PROCESSING, Arrays.asList(2, 1, 0, 2, 1, 0, 2, 1));
30+
usMn.setFieldValue(UsMnField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, 1);
3131
usMn.setFieldValue(UsMnField.ADDITIONAL_DATA_PROCESSING_CONSENT, 1);
3232
usMn.setFieldValue(UsMnField.MSPA_COVERED_TRANSACTION, 1);
3333
usMn.setFieldValue(UsMnField.MSPA_OPT_OUT_OPTION_MODE, 1);
3434
usMn.setFieldValue(UsMnField.MSPA_SERVICE_PROVIDER_MODE, 2);
3535
usMn.setFieldValue(UsMnField.GPC, true);
3636

37-
Assertions.assertEquals("BVWSSSSVYA.YA", usMn.encode());
37+
Assertions.assertEquals("BVWSSVWA.YA", usMn.encode());
3838
}
3939

4040
@Test
@@ -84,7 +84,7 @@ public void testSetInvalidValues() {
8484
}
8585

8686
try {
87-
usMn.setFieldValue(UsMnField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, Arrays.asList(1, 2, 3));
87+
usMn.setFieldValue(UsMnField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS, 3);
8888
Assertions.fail("Expected ValidationException");
8989
} catch (ValidationException e) {
9090

@@ -123,20 +123,20 @@ public void testSetInvalidValues() {
123123
public void testEncodeWithGpcSegmentExcluded() {
124124
UsMn usMn = new UsMn();
125125
usMn.setFieldValue(UsMnField.GPC_SEGMENT_INCLUDED, false);
126-
Assertions.assertEquals("BAAAAAABAA", usMn.encode());
126+
Assertions.assertEquals("BAAAAAQA", usMn.encode());
127127
}
128128

129129
@Test
130130
public void testDecode1() throws DecodingException {
131-
UsMn usMn = new UsMn("BVWSSSSVYA.YA");
131+
UsMn usMn = new UsMn("BVWSSVWA.YA");
132132

133133
Assertions.assertEquals(1, usMn.getProcessingNotice());
134134
Assertions.assertEquals(1, usMn.getSaleOptOutNotice());
135135
Assertions.assertEquals(1, usMn.getTargetedAdvertisingOptOutNotice());
136136
Assertions.assertEquals(1, usMn.getSaleOptOut());
137137
Assertions.assertEquals(1, usMn.getTargetedAdvertisingOptOut());
138-
Assertions.assertEquals(Arrays.asList(2, 1, 0, 2, 1, 0, 2, 1, 0), usMn.getSensitiveDataProcessing());
139-
Assertions.assertEquals(Arrays.asList(2, 1, 0, 2, 1), usMn.getKnownChildSensitiveDataConsents());
138+
Assertions.assertEquals(Arrays.asList(2, 1, 0, 2, 1, 0, 2, 1), usMn.getSensitiveDataProcessing());
139+
Assertions.assertEquals(1, usMn.getKnownChildSensitiveDataConsents());
140140
Assertions.assertEquals(1, usMn.getAdditionalDataProcessingConsent());
141141
Assertions.assertEquals(1, usMn.getMspaCoveredTransaction());
142142
Assertions.assertEquals(1, usMn.getMspaOptOutOptionMode());
@@ -146,15 +146,15 @@ public void testDecode1() throws DecodingException {
146146

147147
@Test
148148
public void testDecodeWithGpcSegmentExcluded() throws DecodingException {
149-
UsMn usMn = new UsMn("BVWSSSSVYA");
149+
UsMn usMn = new UsMn("BVWSSVWA");
150150

151151
Assertions.assertEquals(1, usMn.getProcessingNotice());
152152
Assertions.assertEquals(1, usMn.getSaleOptOutNotice());
153153
Assertions.assertEquals(1, usMn.getTargetedAdvertisingOptOutNotice());
154154
Assertions.assertEquals(1, usMn.getSaleOptOut());
155155
Assertions.assertEquals(1, usMn.getTargetedAdvertisingOptOut());
156-
Assertions.assertEquals(Arrays.asList(2, 1, 0, 2, 1, 0, 2, 1, 0), usMn.getSensitiveDataProcessing());
157-
Assertions.assertEquals(Arrays.asList(2, 1, 0, 2, 1), usMn.getKnownChildSensitiveDataConsents());
156+
Assertions.assertEquals(Arrays.asList(2, 1, 0, 2, 1, 0, 2, 1), usMn.getSensitiveDataProcessing());
157+
Assertions.assertEquals(1, usMn.getKnownChildSensitiveDataConsents());
158158
Assertions.assertEquals(1, usMn.getAdditionalDataProcessingConsent());
159159
Assertions.assertEquals(1, usMn.getMspaCoveredTransaction());
160160
Assertions.assertEquals(1, usMn.getMspaOptOutOptionMode());

0 commit comments

Comments
 (0)