Checkout Tools
  • last updated 4 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 991263 is being indexed.

JavaHL: Fix a test assumption for SINGLE_DB

[ in subversion/bindings/javahl/ ]

* tests/org/apache/subversion/javahl/BasicTests.java:

* tests/org/tigris/subversion/javahl/BasicTests.java:

(testBasicDelete): Do not expect a deleted folder to be on disk

  1. … 1 more file in changeset.
JavaHL: Fix a reference to a value to refer to the right class.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java

(askTrustSSLServer): Use the enum in PromptUserPassword3.

JavaHL: Followup to previous commit. Restoring the set of the username as

it appears to be needed for local tests to use that username. The prompt

is only called when server challenges.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/SVNTests.java

(initClient): Set username to jrandom.

JavaHL: Update the legacy tests to use more of the callback functions to

demonstrate that these are currently broken in trunk.

NOTE: these callbacks would even be broken if the code was using the new

package names.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/SVNTests.java

(initClient): Setup the JavaHL password and progress callbacks.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

(testObstructionTolerance):

Following up on r963726, also comment this test in the compat test runner.

Follow-up to r965520. Fix a failure in the javahl-compat tests in the same way

as was done for the org.apache tests.

Update a javahl test to always display a diff header, even if we just have

property changes.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

(testDiff): Add diff headers to the expected diff output.

Trailing whitespace scrub.

* subversion/libsvn_subr/prompt.c,

subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java,

subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java,

subversion/bindings/javahl/native/CreateJ.cpp,

subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java,

subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java,

subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java,

subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java,

subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java,

subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c,

subversion/bindings/swig/ruby/test/test_wc.rb,

subversion/bindings/swig/ruby/svn/wc.rb,

subversion/tests/libsvn_subr/mergeinfo-test.c,

subversion/tests/cmdline/mergeinfo_tests.py,

subversion/tests/cmdline/log_tests.py,

subversion/tests/cmdline/upgrade_tests.py,

subversion/tests/cmdline/lock_tests.py,

subversion/tests/cmdline/switch_tests.py,

subversion/tests/cmdline/merge_authz_tests.py,

subversion/tests/cmdline/update_tests.py,

subversion/tests/cmdline/svntest/actions.py,

subversion/tests/cmdline/patch_tests.py,

subversion/tests/cmdline/merge_tests.py,

subversion/tests/cmdline/checkout_tests.py,

subversion/tests/libsvn_fs_fs/fs-pack-test.c,

subversion/libsvn_ra_svn/client.c,

subversion/svn/cl.h,

subversion/svn/notify.c,

subversion/include/svn_io.h,

subversion/include/svn_wc.h,

subversion/include/private/svn_wc_private.h,

subversion/libsvn_wc/util.c,

subversion/libsvn_wc/adm_ops.c,

subversion/libsvn_wc/status.c,

subversion/libsvn_wc/update_editor.c,

subversion/libsvn_wc/wc_db.c,

subversion/libsvn_wc/wc_db.h,

subversion/libsvn_wc/upgrade.c,

subversion/libsvn_wc/workqueue.c,

subversion/libsvn_client/switch.c,

subversion/libsvn_client/externals.c,

subversion/libsvn_client/merge.c,

subversion/libsvn_client/patch.c,

subversion/libsvn_client/revert.c,

subversion/libsvn_client/copy.c,

subversion/libsvn_client/mergeinfo.c,

subversion/libsvn_client/update.c,

subversion/libsvn_client/commit_util.c,

subversion/libsvn_client/cleanup.c,

subversion/libsvn_ra_neon/ra_neon.h,

subversion/libsvn_repos/load.c,

subversion/libsvn_fs_fs/fs_fs.c,

subversion/libsvn_fs_fs/fs.h,

build/generator/gen_vcnet_vcproj.py,

build/generator/gen_win.py:

Scrub trailing whitespace.

  1. … 54 more files in changeset.
* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java:

Remove unneeded imports.

JavaHL: Improve test by throwing an exception when API call fails rather than

catching the exception and reporting the test as a failure. This properly

reports the test as an error and the exception provides more information

about what is failing so that hopefully we can fix the root problem.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/BasicTests.java

(getMergeinfoRevisions): Throw SubversionException rather than catching it.

Make the javahl tests work when builddir!=srcdir.

* Makefile.in:

Add javahl_test_srcdir and pass when invoking the tests.

[in subversion/bindings/javahl]

* tests/org/tigris/subversion/javahl/SVNAdminTests.java

(testLoadRepo): Use srcdir to load issue 2979 dump file.

  1. … 1 more file in changeset.
Test out my new and fancy ASF commit priviledges by changing the copyright

wording in our license headers to reflect ownership by the ASF.

* NOTICE:

Change terminology to ASF, and update a link.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Note that the product as a whole is

copyrighted by the ASF, and update the project website.

* everywhere:

Change license text to reflect ASF ownership.

  1. … 887 more files in changeset.
JavaHL code cleanup. Remove unused Java imports.
  1. … 1 more file in changeset.
Scrub trailing whitespace throughout (see r35894).

  1. … 145 more files in changeset.
Fix failing JavaHL test by using the conflict resolution option of

theirs-conflict instead of theirs-full. The purpose of the test is

just to test the callback mechanism. JavaHL expects the SVN API

to work properly, which it currently does not. There should be a

failing test added to the main test suite to cover the failure so

that it gets the right developer attention.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/BasicTests.java

(testMergeConflictResolution): Use chooseTheirsConflict instead

of the no longer working chooseTheirsFull option.

JavaHL: The cleanup test relied on an understanding of the internals

of the working copy, which would now require manipulating the DB to

simulate a lock. So now the method just verifies that cleanup can

be called successfully and we trust that the implementation works.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/BasicTests.java

(testBasicCleanup): Removed dependency on WC internals.

Fix broken JavaHL test on Windows.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/

BasicTests.java

(testBasicChangelist): On Windows, SVNTests.java:getWCPath() returns paths

with '\' path separators. Previous to this change we joined this with

'/iota' resulting in a mixed separator path that caused spurious failures

on Windows. With this change fileToSVNPath() is used to canonicalize the

path so it contains all '/' path separators.

JavaHL: Treat an empty test.rooturl system property as if it were null.

This fixes the test suite.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/SVNTests.java

(init): Treat an empty string test.rooturl the same as null.

JavaHL: Adjust expectations for test of property diff output.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/BasicTests.java:

(testDiff): property diffs now show in unidiff output format.

JavaHL: Fix issue #2979: javahl's SVNAdmin::load() sometimes passes a null

data buffer to the read() method of the caller's InputInterface.

JNIUtil::makeByteArray was returning NULL when the requested byte[] length

was 0. This in turn was provoked by a read(length=0) on the svn_stream_t

loading a repository dump. read(0) is perfectly valid (albeit superfluous),

such as when parsing a property value with length zero.

The fix just returns a byte[] with length 0 as requested from JNIUtil.cpp.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/SVNAdminTests.java:

(testLoadRepo): Added test for issue 2979

* tests/org/tigris/subversion/javahl/SVNTests.java

(OneTest): Tweaked inner class optionally not to load sample files

into the test repository. Keep behavior expected by existing tests.

* tests/data/issue2979.dump

Data for reproducible test case of issue #2979.

* native/JNIUtil.cpp

(makeJByteArray) Do not treat byte[0] and NULL as equivalent.

Patch by: Dave Brown <dave.brown@wandisco.com>

Reviewed by: hwright

  1. … 3 more files in changeset.
JavaHL: Improve the existing revprop test to actually check that

the property is set.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/SVNAdminTests.java:

(testSetRevProp): Improved test, made it actually verify the result.

Patch by: Dave Brown <dave.brown@wandisco.com>

Relicense Subversion under the Apache License, Version 2.0.

* NOTICE: New.

* LICENSE: New.

* COPYING,

subversion/LICENSE: Remove.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Note that the product as a whole is

copyrighted by the SVN Corp, and that it contains contributions from

many people, as referenced in NOTICE.

* subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS:

Relicense the SVN parts under Apache 2.0.

* everywhere:

Change copyright notices in file headers to reflect the Apache 2.0 license.

  1. … 878 more files in changeset.
JavaHL: Tighten up test for depth of working copy in info2 tests.

Test the depth of each item in WC using existing loop that already

checks other aspects of each item in WC. Also change the test to

look for a value of infinity instead of unknown.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/BasicTests.java:

(testBasicInfo2): modified the test to check depth of each item.

Cleanup trailing whitespace:

for extsn in c h cpp java py pl rb; do

sed -i -e 's/[ \t]*$//' `find . -name "*.$extsn" | xargs grep '[ \t]$' -l`

done

This should have been done before the 1.6.x branch, so I'm going to merge

it over there, to avoid merge conflicts in the future.

  1. … 83 more files in changeset.
JavaHL: Added a new simple TreeConflict test. This gets us some test

coverage of the ConflictDescriptor and ConflictVersion classes as well

as the update and info methods.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/BasicTests.java:

(testTreeConflict): added new test.

(MyInfoCallback): added callback class.

JavaHL: Modify the assertExpectedSuggestion test to actually verify

the suggestions returned from the suggestMergeSources API. This

reveals a regression in the API since 1.5.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/BasicTests.java

(assertExpectedSuggestion): Verify the suggestion is the correct path.

(testCopy, testMove): Specify the correct expected path when calling

assertExpectedSuggestion.

JavaHL: Extend the copy tests to include a WC to URL copy that also

has to create parent folders. In this case the test exposes a bug

that currently exists in the notifications sent during this action.

This commit makes the JavaHL tests fail.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/BasicTests.java

(testCopy): Add test for WC to URL copy with parent creation.

JavaHL: A follow-up to r34184, adjust the JavaHL tests to no

longer expect property modifications when an item is moved.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/BasicTests.java

(testMove): Remove expectations of mergeinfo creation.

JavaHL: Another follow-up to r31993, changing Path.isURL() to raise

IllegalArgumentException rather than NullPointerException for a null

path input.

[ in subversion/bindings/javahl/ ]

* src/org/tigris/subversion/javahl/Path.java

(isURL): Tweak implementation.

* tests/org/tigris/subversion/javahl/BasicTests.java

(testPathIsURL): Tweak check of null input.

Suggested by: blair

  1. … 1 more file in changeset.
JavaHL: A follow-up to r31993, substituting a trivial scheme check for

usage of java.net.URL, which requires that protocols be registered

with it before being recognized as valid schemes.

[ in subversion/bindings/javahl/ ]

* src/org/tigris/subversion/javahl/Path.java

(isURL): Tweak implementation.

* tests/org/tigris/subversion/javahl/BasicTests.java

(testPathIsURL): Expand variety of protocol schemes tested to

include some Subversion-specific schemes.

Reported by: markphip

Talden <talden@gmail.com>

  1. … 1 more file in changeset.
JavaHL: Add a new API which uses java.net.URL to determine whether the

specified Subversion path is considered to be a URL. This may be

slightly different than what svn_path_is_url() considers to be a URL,

as the latter employs a simplistic implementation.

[ in subversion/bindings/javahl/ ]

* src/org/tigris/subversion/javahl/Path.java

(isURL): Add new API.

* tests/org/tigris/subversion/javahl/BasicTests.java

(testPathIsURL): Add test for the new Path.isURL() method.

  1. … 1 more file in changeset.