1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
|
Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Date: Fri, 3 Feb 2023 12:58:46 +0800
Subject: Remove test file DomainValidatorStartupTest.java. It depends on the junit-clptr
package which is not available in Debian.
Forwarded: not-needed
Last-Update: 2023-02-03
--- libcommons-validator-java-1.7.orig/src/test/java/org/apache/commons/validator/routines/DomainValidatorStartupTest.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.validator.routines;
-
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.validator.routines.DomainValidator.ArrayType;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.bitstrings.test.junit.runner.ClassLoaderPerTestRunner;
-
-/**
- * Startup Tests for the DomainValidator.
- *
- * @version $Revision$
- */
-@RunWith( ClassLoaderPerTestRunner.class )
-public class DomainValidatorStartupTest {
-
- @Test(expected = IllegalArgumentException.class)
- public void testUpdateBaseArrayCC() {
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_RO, new String[]{"com"});
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void testUpdateBaseArrayGeneric() {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_RO, new String[]{"com"});
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void testUpdateBaseArrayInfra() {
- DomainValidator.updateTLDOverride(ArrayType.INFRASTRUCTURE_RO, new String[]{"com"});
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void testUpdateBaseArrayLocal() {
- DomainValidator.updateTLDOverride(ArrayType.LOCAL_RO, new String[]{"com"});
- }
-
- @Test
- public void testUpdateCountryCode1a() {
- DomainValidator validator = DomainValidator.getInstance();
- assertFalse(validator.isValidCountryCodeTld("com")); // cannot be valid
- }
-
- @Test
- public void testUpdateCountryCode1b() {
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_PLUS, new String[]{"com"});
- DomainValidator validator = DomainValidator.getInstance();
- assertTrue(validator.isValidCountryCodeTld("com")); // it is now!
- }
-
- @Test
- public void testUpdateCountryCode2() {
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_PLUS, new String[]{"com"});
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, new String[]{"com"});
- DomainValidator validator = DomainValidator.getInstance();
- assertFalse(validator.isValidCountryCodeTld("com")); // show that minus overrides the rest
- }
-
- @Test
- public void testUpdateCountryCode3a() { // show ch is valid
- DomainValidator validator = DomainValidator.getInstance();
- assertTrue(validator.isValidCountryCodeTld("ch"));
- }
-
- @Test
- public void testUpdateCountryCode3b() { // show ch can be made invalid
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, new String[]{"ch"});
- DomainValidator validator = DomainValidator.getInstance();
- assertFalse(validator.isValidCountryCodeTld("ch"));
- }
-
- @Test
- public void testUpdateCountryCode3c() { // show ch can be made valid again by replacing the CC array
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, new String[]{"ch"});
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, new String[]{"xx"});
- DomainValidator validator = DomainValidator.getInstance();
- assertTrue(validator.isValidCountryCodeTld("ch"));
- }
-
- @Test
- public void testUpdateGeneric1() {
- DomainValidator validator = DomainValidator.getInstance();
- assertFalse(validator.isValidGenericTld("ch")); // cannot be valid
- }
-
- @Test
- public void testUpdateGeneric2() {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[]{"ch"});
- DomainValidator validator = DomainValidator.getInstance();
- assertTrue(validator.isValidGenericTld("ch")); // it is now!
- }
-
- @Test
- public void testUpdateGeneric3() {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[]{"ch"});
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[]{"ch"});
- DomainValidator validator = DomainValidator.getInstance();
- assertFalse(validator.isValidGenericTld("ch")); // show that minus overrides the rest
- assertTrue(validator.isValidGenericTld("com"));
- }
-
- @Test
- public void testUpdateGeneric4() {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[]{"ch"});
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[]{"ch"});
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[]{"com"});
- DomainValidator validator = DomainValidator.getInstance();
- assertFalse(validator.isValidGenericTld("com"));
- }
-
- @Test
- public void testUpdateGeneric5() {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[]{"ch"});
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[]{"ch"});
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[]{"com"});
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[]{"xx"}); // change the minus list
- DomainValidator validator = DomainValidator.getInstance();
- assertTrue(validator.isValidGenericTld("com"));
- }
-
- @Test
- public void testVALIDATOR_412a() {
- DomainValidator validator = DomainValidator.getInstance();
- assertFalse(validator.isValidGenericTld("local"));
- assertFalse(validator.isValid("abc.local"));
- assertFalse(validator.isValidGenericTld("pvt"));
- assertFalse(validator.isValid("abc.pvt"));
- }
-
- @Test
- public void testVALIDATOR_412b() {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[]{"local", "pvt"});
- DomainValidator validator = DomainValidator.getInstance();
- assertTrue(validator.isValidGenericTld("local"));
- assertTrue(validator.isValid("abc.local"));
- assertTrue(validator.isValidGenericTld("pvt"));
- assertTrue(validator.isValid("abc.pvt"));
- }
-
- @Test
- public void testVALIDATOR_412c() {
- DomainValidator validator = DomainValidator.getInstance(true);
- assertFalse(validator.isValidLocalTld("local"));
- assertFalse(validator.isValid("abc.local"));
- assertFalse(validator.isValidLocalTld("pvt"));
- assertFalse(validator.isValid("abc.pvt"));
- }
-
- @Test
- public void testVALIDATOR_412d() {
- DomainValidator.updateTLDOverride(ArrayType.LOCAL_PLUS, new String[]{"local", "pvt"});
- DomainValidator validator = DomainValidator.getInstance(true);
- assertTrue(validator.isValidLocalTld("local"));
- assertTrue(validator.isValidLocalTld("pvt"));
- assertTrue(validator.isValid("abc.local"));
- assertTrue(validator.isValid("abc.pvt"));
- }
-
- @Test
- public void testCannotUpdate() {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[]{"ch"}); // OK
- DomainValidator dv = DomainValidator.getInstance();
- assertNotNull(dv);
- try {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[]{"ch"});
- fail("Expected IllegalStateException");
- } catch (IllegalStateException ise) {
- // expected
- }
- }
-
- @Test
- public void testInstanceOverride() { // Show that the instance picks up static values
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[]{"gp"});
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[]{"com"});
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_PLUS, new String[]{"cp"});
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, new String[]{"ch"});
- DomainValidator validator = DomainValidator.getInstance(false);
- assertTrue(validator.isValidGenericTld("gp"));
- assertFalse(validator.isValidGenericTld("com"));
- assertTrue(validator.isValidCountryCodeTld("cp"));
- assertFalse(validator.isValidCountryCodeTld("ch"));
-
- // show we can override them for a new instance
- List<DomainValidator.Item> items = new ArrayList<>();
- items.add(new DomainValidator.Item(ArrayType.GENERIC_MINUS,new String[]{""}));
- items.add(new DomainValidator.Item(ArrayType.COUNTRY_CODE_MINUS,new String[]{""}));
- validator = DomainValidator.getInstance(false, items);
- assertTrue(validator.isValidGenericTld("gp"));
- assertTrue(validator.isValidGenericTld("com")); // Should be true again
- assertTrue(validator.isValidCountryCodeTld("cp"));
- assertTrue(validator.isValidCountryCodeTld("ch")); // Should be true again
-
- // Show the class overrides are unaffected
- validator = DomainValidator.getInstance(false);
- assertTrue(validator.isValidGenericTld("gp"));
- assertFalse(validator.isValidGenericTld("com"));
- assertTrue(validator.isValidCountryCodeTld("cp"));
- assertFalse(validator.isValidCountryCodeTld("ch"));
- }
-}
|
