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
|
/*
* ra-local-test.c : basic tests for the RA LOCAL library
*
* ====================================================================
* 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 <apr_general.h>
#include <apr_pools.h>
#define SVN_DEPRECATED
#include "svn_error.h"
#include "svn_delta.h"
#include "svn_ra.h"
#include "svn_time.h"
#include "svn_pools.h"
#include "../svn_test.h"
#include "../svn_test_fs.h"
#include "../../libsvn_ra_local/ra_local.h"
/*-------------------------------------------------------------------*/
/** Helper routines. **/
static svn_error_t *
make_and_open_local_repos(svn_ra_session_t **session,
const char *repos_name,
const svn_test_opts_t *opts,
apr_pool_t *pool)
{
svn_repos_t *repos;
const char *url;
svn_ra_callbacks2_t *cbtable;
SVN_ERR(svn_ra_create_callbacks(&cbtable, pool));
SVN_ERR(svn_test__create_repos(&repos, repos_name, opts, pool));
SVN_ERR(svn_ra_initialize(pool));
SVN_ERR(svn_uri_get_file_url_from_dirent(&url, repos_name, pool));
SVN_ERR(svn_ra_open3(session, url, NULL, cbtable, NULL, NULL, pool));
return SVN_NO_ERROR;
}
/* Commit some simple changes */
static svn_error_t *
commit_changes(svn_ra_session_t *session,
apr_pool_t *pool)
{
apr_hash_t *revprop_table = apr_hash_make(pool);
const svn_delta_editor_t *editor;
void *edit_baton;
const char *repos_root_url;
void *root_baton, *dir_baton;
SVN_ERR(svn_ra_get_commit_editor3(session, &editor, &edit_baton,
revprop_table,
NULL, NULL, NULL, TRUE, pool));
SVN_ERR(svn_ra_get_repos_root(session, &repos_root_url, pool));
SVN_ERR(editor->open_root(edit_baton, SVN_INVALID_REVNUM,
pool, &root_baton));
/* copy root-dir@0 to A@1 */
SVN_ERR(editor->add_directory("A", root_baton, repos_root_url, 0,
pool, &dir_baton));
SVN_ERR(editor->close_edit(edit_baton, pool));
return SVN_NO_ERROR;
}
/*-------------------------------------------------------------------*/
/** The tests **/
/* Baton for gls_receiver(). */
struct gls_receiver_baton_t
{
apr_array_header_t *segments;
apr_pool_t *pool;
};
/* Receive a location segment and append it to BATON.segments. */
static svn_error_t *
gls_receiver(svn_location_segment_t *segment,
void *baton,
apr_pool_t *pool)
{
struct gls_receiver_baton_t *b = baton;
APR_ARRAY_PUSH(b->segments, svn_location_segment_t *)
= svn_location_segment_dup(segment, b->pool);
return SVN_NO_ERROR;
}
/* Test svn_ra_get_location_segments(). */
static svn_error_t *
location_segments_test(const svn_test_opts_t *opts,
apr_pool_t *pool)
{
svn_ra_session_t *session;
apr_array_header_t *segments
= apr_array_make(pool, 1, sizeof(svn_location_segment_t *));
struct gls_receiver_baton_t b;
const char *path = "A";
svn_revnum_t peg_revision = 1;
svn_location_segment_t *seg;
b.segments = segments;
b.pool = pool;
SVN_ERR(make_and_open_local_repos(&session,
"test-repo-locsegs", opts,
pool));
/* ### This currently tests only a small subset of what's possible. */
SVN_ERR(commit_changes(session, pool));
SVN_ERR(svn_ra_get_location_segments(session, path, peg_revision,
SVN_INVALID_REVNUM, SVN_INVALID_REVNUM,
gls_receiver, &b, pool));
SVN_TEST_ASSERT(segments->nelts == 2);
seg = APR_ARRAY_IDX(segments, 0, svn_location_segment_t *);
SVN_TEST_STRING_ASSERT(seg->path, "A");
SVN_TEST_ASSERT(seg->range_start == 1);
SVN_TEST_ASSERT(seg->range_end == 1);
seg = APR_ARRAY_IDX(segments, 1, svn_location_segment_t *);
SVN_TEST_STRING_ASSERT(seg->path, "");
SVN_TEST_ASSERT(seg->range_start == 0);
SVN_TEST_ASSERT(seg->range_end == 0);
return SVN_NO_ERROR;
}
/* Implements svn_commit_callback2_t for commit_callback_failure() */
static svn_error_t *
commit_callback_with_failure(const svn_commit_info_t *info,
void *baton,
apr_pool_t *scratch_pool)
{
apr_time_t timetemp;
SVN_TEST_ASSERT(info != NULL);
SVN_TEST_STRING_ASSERT(info->author, ""); /* No auth baton supplied. */
SVN_TEST_STRING_ASSERT(info->post_commit_err, NULL);
SVN_ERR(svn_time_from_cstring(&timetemp, info->date, scratch_pool));
SVN_TEST_ASSERT(info->date != 0);
SVN_TEST_ASSERT(info->repos_root != NULL);
SVN_TEST_ASSERT(info->revision == 1);
return svn_error_create(SVN_ERR_CANCELLED, NULL, NULL);
}
static svn_error_t *
commit_callback_failure(const svn_test_opts_t *opts,
apr_pool_t *pool)
{
svn_ra_session_t *ra_session;
const svn_delta_editor_t *editor;
void *edit_baton;
void *root_baton;
SVN_ERR(make_and_open_local_repos(&ra_session, "commit_cb_failure", opts, pool));
SVN_ERR(svn_ra_get_commit_editor3(ra_session, &editor, &edit_baton,
apr_hash_make(pool), commit_callback_with_failure,
NULL, NULL, FALSE, pool));
SVN_ERR(editor->open_root(edit_baton, 1, pool, &root_baton));
SVN_ERR(editor->change_dir_prop(root_baton, "A",
svn_string_create("B", pool), pool));
SVN_ERR(editor->close_directory(root_baton, pool));
SVN_TEST_ASSERT_ERROR(editor->close_edit(edit_baton, pool),
SVN_ERR_CANCELLED);
/* This is what users should do if close_edit fails... Except that in this case
the commit actually succeeded*/
SVN_ERR(editor->abort_edit(edit_baton, pool));
return SVN_NO_ERROR;
}
/* The test table. */
struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(location_segments_test,
"test svn_ra_get_location_segments"),
SVN_TEST_OPTS_PASS(commit_callback_failure,
"commit callback failure"),
SVN_TEST_NULL
};
|
