This class requires resources which are private to another bundle. Move the class next to its resources, removing an odd cross bundle dependency. Change-Id: I30d5568b09ea5fb3bd3bb60b602f149c0867f49atags/v3.2.0.201312181205-r
import org.eclipse.jgit.internal.storage.pack.PackWriter; | import org.eclipse.jgit.internal.storage.pack.PackWriter; | ||||
import org.eclipse.jgit.internal.storage.pack.PackWriter.ObjectIdSet; | import org.eclipse.jgit.internal.storage.pack.PackWriter.ObjectIdSet; | ||||
import org.eclipse.jgit.junit.JGitTestUtil; | import org.eclipse.jgit.junit.JGitTestUtil; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.junit.TestRepository; | import org.eclipse.jgit.junit.TestRepository; | ||||
import org.eclipse.jgit.junit.TestRepository.BranchBuilder; | import org.eclipse.jgit.junit.TestRepository.BranchBuilder; | ||||
import org.eclipse.jgit.lib.AnyObjectId; | import org.eclipse.jgit.lib.AnyObjectId; | ||||
import org.eclipse.jgit.revwalk.RevObject; | import org.eclipse.jgit.revwalk.RevObject; | ||||
import org.eclipse.jgit.revwalk.RevWalk; | import org.eclipse.jgit.revwalk.RevWalk; | ||||
import org.eclipse.jgit.storage.pack.PackConfig; | import org.eclipse.jgit.storage.pack.PackConfig; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.transport.PackParser; | import org.eclipse.jgit.transport.PackParser; | ||||
import org.junit.After; | import org.junit.After; | ||||
import org.junit.Before; | import org.junit.Before; |
import java.util.Map; | import java.util.Map; | ||||
import java.util.Map.Entry; | import java.util.Map.Entry; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.lib.AnyObjectId; | import org.eclipse.jgit.lib.AnyObjectId; | ||||
import org.eclipse.jgit.lib.Constants; | import org.eclipse.jgit.lib.Constants; | ||||
import org.eclipse.jgit.lib.ObjectId; | import org.eclipse.jgit.lib.ObjectId; | ||||
import org.eclipse.jgit.lib.Repository; | import org.eclipse.jgit.lib.Repository; | ||||
import org.eclipse.jgit.revwalk.RevCommit; | import org.eclipse.jgit.revwalk.RevCommit; | ||||
import org.eclipse.jgit.revwalk.RevWalk; | import org.eclipse.jgit.revwalk.RevWalk; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.junit.Test; | import org.junit.Test; | ||||
public class RefUpdateTest extends SampleDataRepositoryTestCase { | public class RefUpdateTest extends SampleDataRepositoryTestCase { |
import java.text.SimpleDateFormat; | import java.text.SimpleDateFormat; | ||||
import java.util.List; | import java.util.List; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.lib.CheckoutEntry; | import org.eclipse.jgit.lib.CheckoutEntry; | ||||
import org.eclipse.jgit.lib.Constants; | import org.eclipse.jgit.lib.Constants; | ||||
import org.eclipse.jgit.lib.ObjectId; | import org.eclipse.jgit.lib.ObjectId; | ||||
import org.eclipse.jgit.lib.PersonIdent; | import org.eclipse.jgit.lib.PersonIdent; | ||||
import org.eclipse.jgit.lib.ReflogEntry; | import org.eclipse.jgit.lib.ReflogEntry; | ||||
import org.eclipse.jgit.lib.ReflogReader; | import org.eclipse.jgit.lib.ReflogReader; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.junit.Test; | import org.junit.Test; | ||||
public class ReflogReaderTest extends SampleDataRepositoryTestCase { | public class ReflogReaderTest extends SampleDataRepositoryTestCase { |
import org.eclipse.jgit.errors.IncorrectObjectTypeException; | import org.eclipse.jgit.errors.IncorrectObjectTypeException; | ||||
import org.eclipse.jgit.errors.MissingObjectException; | import org.eclipse.jgit.errors.MissingObjectException; | ||||
import org.eclipse.jgit.internal.JGitText; | import org.eclipse.jgit.internal.JGitText; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.lib.AnyObjectId; | import org.eclipse.jgit.lib.AnyObjectId; | ||||
import org.eclipse.jgit.lib.CommitBuilder; | import org.eclipse.jgit.lib.CommitBuilder; | ||||
import org.eclipse.jgit.lib.Constants; | import org.eclipse.jgit.lib.Constants; | ||||
import org.eclipse.jgit.revwalk.RevWalk; | import org.eclipse.jgit.revwalk.RevWalk; | ||||
import org.eclipse.jgit.storage.file.FileBasedConfig; | import org.eclipse.jgit.storage.file.FileBasedConfig; | ||||
import org.eclipse.jgit.storage.file.FileRepositoryBuilder; | import org.eclipse.jgit.storage.file.FileRepositoryBuilder; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.util.FileUtils; | import org.eclipse.jgit.util.FileUtils; | ||||
import org.junit.Test; | import org.junit.Test; | ||||
import org.eclipse.jgit.internal.storage.file.PackFile; | import org.eclipse.jgit.internal.storage.file.PackFile; | ||||
import org.eclipse.jgit.internal.storage.file.WindowCursor; | import org.eclipse.jgit.internal.storage.file.WindowCursor; | ||||
import org.eclipse.jgit.junit.JGitTestUtil; | import org.eclipse.jgit.junit.JGitTestUtil; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.lib.Constants; | import org.eclipse.jgit.lib.Constants; | ||||
import org.eclipse.jgit.lib.ObjectId; | import org.eclipse.jgit.lib.ObjectId; | ||||
import org.eclipse.jgit.lib.ObjectLoader; | import org.eclipse.jgit.lib.ObjectLoader; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.junit.Test; | import org.junit.Test; | ||||
public class T0004_PackReaderTest extends SampleDataRepositoryTestCase { | public class T0004_PackReaderTest extends SampleDataRepositoryTestCase { |
import org.eclipse.jgit.errors.CorruptObjectException; | import org.eclipse.jgit.errors.CorruptObjectException; | ||||
import org.eclipse.jgit.junit.JGitTestUtil; | import org.eclipse.jgit.junit.JGitTestUtil; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.lib.Constants; | import org.eclipse.jgit.lib.Constants; | ||||
import org.eclipse.jgit.lib.ObjectId; | import org.eclipse.jgit.lib.ObjectId; | ||||
import org.eclipse.jgit.lib.ObjectLoader; | import org.eclipse.jgit.lib.ObjectLoader; | ||||
import org.eclipse.jgit.storage.file.WindowCacheConfig; | import org.eclipse.jgit.storage.file.WindowCacheConfig; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.util.MutableInteger; | import org.eclipse.jgit.util.MutableInteger; | ||||
import org.junit.Before; | import org.junit.Before; | ||||
import org.junit.Test; | import org.junit.Test; |
import java.io.IOException; | import java.io.IOException; | ||||
import java.util.Map; | import java.util.Map; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.lib.Ref.Storage; | import org.eclipse.jgit.lib.Ref.Storage; | ||||
import org.eclipse.jgit.lib.RefUpdate.Result; | import org.eclipse.jgit.lib.RefUpdate.Result; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.junit.Test; | import org.junit.Test; | ||||
/** | /** |
import org.eclipse.jgit.errors.AmbiguousObjectException; | import org.eclipse.jgit.errors.AmbiguousObjectException; | ||||
import org.eclipse.jgit.errors.IncorrectObjectTypeException; | import org.eclipse.jgit.errors.IncorrectObjectTypeException; | ||||
import org.eclipse.jgit.errors.RevisionSyntaxException; | import org.eclipse.jgit.errors.RevisionSyntaxException; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.revwalk.RevCommit; | import org.eclipse.jgit.revwalk.RevCommit; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.junit.Test; | import org.junit.Test; | ||||
public class RepositoryResolveTest extends SampleDataRepositoryTestCase { | public class RepositoryResolveTest extends SampleDataRepositoryTestCase { |
import java.util.ArrayList; | import java.util.ArrayList; | ||||
import java.util.List; | import java.util.List; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.junit.Test; | import org.junit.Test; | ||||
@SuppressWarnings("deprecation") | @SuppressWarnings("deprecation") |
import java.io.IOException; | import java.io.IOException; | ||||
import java.util.Arrays; | import java.util.Arrays; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.lib.ObjectId; | import org.eclipse.jgit.lib.ObjectId; | ||||
import org.eclipse.jgit.lib.ObjectIdRef; | import org.eclipse.jgit.lib.ObjectIdRef; | ||||
import org.eclipse.jgit.lib.Ref; | import org.eclipse.jgit.lib.Ref; | ||||
import org.eclipse.jgit.lib.SymbolicRef; | import org.eclipse.jgit.lib.SymbolicRef; | ||||
import org.eclipse.jgit.lib.Ref.Storage; | import org.eclipse.jgit.lib.Ref.Storage; | ||||
import org.eclipse.jgit.lib.RefUpdate; | import org.eclipse.jgit.lib.RefUpdate; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.junit.Before; | import org.junit.Before; | ||||
import org.junit.Test; | import org.junit.Test; | ||||
import org.eclipse.jgit.dircache.DirCache; | import org.eclipse.jgit.dircache.DirCache; | ||||
import org.eclipse.jgit.dircache.DirCacheBuilder; | import org.eclipse.jgit.dircache.DirCacheBuilder; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.lib.CommitBuilder; | import org.eclipse.jgit.lib.CommitBuilder; | ||||
import org.eclipse.jgit.lib.FileMode; | import org.eclipse.jgit.lib.FileMode; | ||||
import org.eclipse.jgit.lib.ObjectId; | import org.eclipse.jgit.lib.ObjectId; | ||||
import org.eclipse.jgit.lib.ObjectInserter; | import org.eclipse.jgit.lib.ObjectInserter; | ||||
import org.eclipse.jgit.lib.PersonIdent; | import org.eclipse.jgit.lib.PersonIdent; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.treewalk.TreeWalk; | import org.eclipse.jgit.treewalk.TreeWalk; | ||||
import org.junit.Test; | import org.junit.Test; | ||||
import java.util.Arrays; | import java.util.Arrays; | ||||
import org.eclipse.jgit.api.Git; | import org.eclipse.jgit.api.Git; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.lib.Ref; | import org.eclipse.jgit.lib.Ref; | ||||
import org.eclipse.jgit.revwalk.RevCommit; | import org.eclipse.jgit.revwalk.RevCommit; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.util.GitDateFormatter; | import org.eclipse.jgit.util.GitDateFormatter; | ||||
import org.eclipse.jgit.util.GitDateFormatter.Format; | import org.eclipse.jgit.util.GitDateFormatter.Format; | ||||
import org.junit.Before; | import org.junit.Before; |
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||
*/ | */ | ||||
package org.eclipse.jgit.junit; | |||||
package org.eclipse.jgit.test.resources; | |||||
import java.io.File; | import java.io.File; | ||||
import org.eclipse.jgit.junit.JGitTestUtil; | |||||
import org.eclipse.jgit.junit.RepositoryTestCase; | |||||
/** Test case which includes C Git generated pack files for testing. */ | /** Test case which includes C Git generated pack files for testing. */ | ||||
public abstract class SampleDataRepositoryTestCase extends RepositoryTestCase { | public abstract class SampleDataRepositoryTestCase extends RepositoryTestCase { |
import org.eclipse.jgit.errors.MissingBundlePrerequisiteException; | import org.eclipse.jgit.errors.MissingBundlePrerequisiteException; | ||||
import org.eclipse.jgit.errors.NotSupportedException; | import org.eclipse.jgit.errors.NotSupportedException; | ||||
import org.eclipse.jgit.errors.TransportException; | import org.eclipse.jgit.errors.TransportException; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.lib.NullProgressMonitor; | import org.eclipse.jgit.lib.NullProgressMonitor; | ||||
import org.eclipse.jgit.lib.ObjectId; | import org.eclipse.jgit.lib.ObjectId; | ||||
import org.eclipse.jgit.lib.Ref; | import org.eclipse.jgit.lib.Ref; | ||||
import org.eclipse.jgit.lib.Repository; | import org.eclipse.jgit.lib.Repository; | ||||
import org.eclipse.jgit.revwalk.RevCommit; | import org.eclipse.jgit.revwalk.RevCommit; | ||||
import org.eclipse.jgit.revwalk.RevWalk; | import org.eclipse.jgit.revwalk.RevWalk; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.junit.Test; | import org.junit.Test; | ||||
public class BundleWriterTest extends SampleDataRepositoryTestCase { | public class BundleWriterTest extends SampleDataRepositoryTestCase { |
import org.eclipse.jgit.errors.NotSupportedException; | import org.eclipse.jgit.errors.NotSupportedException; | ||||
import org.eclipse.jgit.errors.TransportException; | import org.eclipse.jgit.errors.TransportException; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.lib.ObjectId; | import org.eclipse.jgit.lib.ObjectId; | ||||
import org.eclipse.jgit.lib.ObjectIdRef; | import org.eclipse.jgit.lib.ObjectIdRef; | ||||
import org.eclipse.jgit.lib.ProgressMonitor; | import org.eclipse.jgit.lib.ProgressMonitor; | ||||
import org.eclipse.jgit.lib.RefUpdate.Result; | import org.eclipse.jgit.lib.RefUpdate.Result; | ||||
import org.eclipse.jgit.lib.Repository; | import org.eclipse.jgit.lib.Repository; | ||||
import org.eclipse.jgit.lib.TextProgressMonitor; | import org.eclipse.jgit.lib.TextProgressMonitor; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.transport.RemoteRefUpdate.Status; | import org.eclipse.jgit.transport.RemoteRefUpdate.Status; | ||||
import org.junit.Before; | import org.junit.Before; | ||||
import org.junit.Test; | import org.junit.Test; |
import java.util.Collections; | import java.util.Collections; | ||||
import java.util.List; | import java.util.List; | ||||
import org.eclipse.jgit.junit.SampleDataRepositoryTestCase; | |||||
import org.eclipse.jgit.lib.Config; | import org.eclipse.jgit.lib.Config; | ||||
import org.eclipse.jgit.lib.Constants; | import org.eclipse.jgit.lib.Constants; | ||||
import org.eclipse.jgit.lib.ObjectId; | import org.eclipse.jgit.lib.ObjectId; | ||||
import org.eclipse.jgit.lib.Ref; | import org.eclipse.jgit.lib.Ref; | ||||
import org.eclipse.jgit.lib.Repository; | import org.eclipse.jgit.lib.Repository; | ||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||||
import org.junit.After; | import org.junit.After; | ||||
import org.junit.Before; | import org.junit.Before; | ||||
import org.junit.Test; | import org.junit.Test; |