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
|
/*
* opt-test.c -- test the option functions
*
* ====================================================================
* 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.
* ====================================================================
*/
#include <string.h>
#include <apr_general.h>
#include "../svn_test.h"
#include "svn_opt.h"
static svn_error_t *
test_parse_peg_rev(apr_pool_t *pool)
{
apr_size_t i;
static struct {
const char *input;
const char *path; /* NULL means an error is expected. */
svn_opt_revision_t peg;
} const tests[] = {
{ "foo/bar", "foo/bar", {svn_opt_revision_unspecified} },
{ "foo/bar@13", "foo/bar", {svn_opt_revision_number, {13}} },
{ "foo/bar@HEAD", "foo/bar", {svn_opt_revision_head} },
{ "foo/bar@{1999-12-31}", "foo/bar", {svn_opt_revision_date, {0}} },
{ "http://a/b@27", "http://a/b", {svn_opt_revision_number, {27}} },
{ "http://a/b@COMMITTED", "http://a/b", {svn_opt_revision_committed} },
{ "http://a/b@{1999-12-31}", "http://a/b",{svn_opt_revision_date, {0}} },
{ "http://a/b@%7B1999-12-31%7D","http://a/b",{svn_opt_revision_date, {0}} },
{ "foo/bar@1:2", NULL, {-1} },
{ "foo/bar@baz", NULL, {-1} },
{ "foo/bar@", "foo/bar", {svn_opt_revision_unspecified} },
{ "foo/@bar@", "foo/@bar", {svn_opt_revision_unspecified} },
{ "foo/bar/@13", "foo/bar/", {svn_opt_revision_number, {13}} },
{ "foo/bar@@13", "foo/bar@", {svn_opt_revision_number, {13}} },
{ "foo/@bar@HEAD", "foo/@bar", {svn_opt_revision_head} },
{ "foo@/bar", "foo@/bar", {svn_opt_revision_unspecified} },
{ "foo@HEAD/bar", "foo@HEAD/bar", {svn_opt_revision_unspecified} },
{ "@foo/bar", "@foo/bar", {svn_opt_revision_unspecified} },
{ "@foo/bar@", "@foo/bar", {svn_opt_revision_unspecified} },
};
for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++)
{
const char *path;
svn_opt_revision_t peg;
svn_error_t *err;
err = svn_opt_parse_path(&peg, &path, tests[i].input, pool);
if (err)
{
svn_error_clear(err);
if (tests[i].path)
{
return svn_error_createf
(SVN_ERR_TEST_FAILED, NULL,
"svn_opt_parse_path ('%s') returned an error instead of '%s'",
tests[i].input, tests[i].path);
}
}
else
{
if ((path == NULL)
|| (tests[i].path == NULL)
|| (strcmp(path, tests[i].path) != 0)
|| (peg.kind != tests[i].peg.kind)
|| (peg.kind == svn_opt_revision_number && peg.value.number != tests[i].peg.value.number))
return svn_error_createf
(SVN_ERR_TEST_FAILED, NULL,
"svn_opt_parse_path ('%s') returned '%s' instead of '%s'", tests[i].input,
path ? path : "NULL", tests[i].path ? tests[i].path : "NULL");
}
}
return SVN_NO_ERROR;
}
static svn_error_t *
test_svn_opt_args_to_target_array2(apr_pool_t *pool)
{
apr_size_t i;
static struct {
const char *input;
const char *output; /* NULL means an error is expected. */
} const tests[] = {
{ ".", "" },
{ ".@BASE", "@BASE" },
{ "foo///bar", "foo/bar" },
{ "foo///bar@13", "foo/bar@13" },
{ "foo///bar@HEAD", "foo/bar@HEAD" },
{ "foo///bar@{1999-12-31}", "foo/bar@{1999-12-31}" },
{ "http://a//b////", "http://a/b" },
{ "http://a///b@27", "http://a/b@27" },
{ "http://a/b//@COMMITTED", "http://a/b@COMMITTED" },
{ "foo///bar@1:2", "foo/bar@1:2" },
{ "foo///bar@baz", "foo/bar@baz" },
{ "foo///bar@", "foo/bar@" },
{ "foo///bar///@13", "foo/bar@13" },
{ "foo///bar@@13", "foo/bar@@13" },
{ "foo///@bar@HEAD", "foo/@bar@HEAD" },
{ "foo@///bar", "foo@/bar" },
{ "foo@HEAD///bar", "foo@HEAD/bar" },
};
for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++)
{
const char *input = tests[i].input;
const char *expected_output = tests[i].output;
apr_array_header_t *targets;
apr_getopt_t *os;
const int argc = 2;
const char *argv[3] = { 0 };
apr_status_t apr_err;
svn_error_t *err;
argv[0] = "opt-test";
argv[1] = input;
argv[2] = NULL;
apr_err = apr_getopt_init(&os, pool, argc, argv);
if (apr_err)
return svn_error_wrap_apr(apr_err,
"Error initializing command line arguments");
err = svn_opt_args_to_target_array2(&targets, os, NULL, pool);
if (expected_output)
{
const char *actual_output;
if (err)
return err;
if (argc - 1 != targets->nelts)
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"Passed %d target(s) to "
"svn_opt_args_to_target_array2() but "
"got %d back.",
argc - 1,
targets->nelts);
actual_output = APR_ARRAY_IDX(targets, 0, const char *);
if (! svn_path_is_canonical(actual_output, pool))
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"Input '%s' to "
"svn_opt_args_to_target_array2() should "
"have returned a canonical path but "
"'%s' is not.",
input,
actual_output);
if (strcmp(expected_output, actual_output) != 0)
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"Input '%s' to "
"svn_opt_args_to_target_array2() should "
"have returned '%s' but returned '%s'.",
input,
expected_output,
actual_output);
}
else
{
if (! err)
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"Unexpected success in passing '%s' "
"to svn_opt_args_to_target_array2().",
input);
}
}
return SVN_NO_ERROR;
}
/* The test table. */
static int max_threads = 1;
static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_parse_peg_rev,
"test svn_opt_parse_path"),
SVN_TEST_PASS2(test_svn_opt_args_to_target_array2,
"test svn_opt_args_to_target_array2"),
SVN_TEST_NULL
};
SVN_TEST_MAIN
|
