]> source.dussan.org Git - jgit.git/commitdiff
Add basic "jgit add" tests 28/8928/3
authorJonathan Nieder <jrn@google.com>
Thu, 29 Nov 2012 02:39:57 +0000 (18:39 -0800)
committerChris Aniszczyk <zx@twitter.com>
Fri, 30 Nov 2012 00:38:07 +0000 (16:38 -0800)
Change-Id: I056c2556c7db98bf57e2527dec11af7c3daf472a
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/AddTest.java [new file with mode: 0644]

index a53167a2c9b9c87059a998e4fc6b879daaa17892..af28b7c8f6a3b801c5a9e306758f14b39e5c251d 100644 (file)
@@ -8,6 +8,7 @@ Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.eclipse.jgit.api;version="[2.2.0,2.3.0)",
+ org.eclipse.jgit.dircache;version="[2.2.0,2.3.0)",
  org.eclipse.jgit.junit;version="[2.2.0,2.3.0)",
  org.eclipse.jgit.lib;version="[2.2.0,2.3.0)",
  org.eclipse.jgit.merge;version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/AddTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/AddTest.java
new file mode 100644 (file)
index 0000000..4253080
--- /dev/null
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2012 Google Inc.
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following
+ *   disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ *   names of its contributors may be used to endorse or promote
+ *   products derived from this software without specific prior
+ *   written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.eclipse.jgit.pgm;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.lang.Exception;
+import java.lang.String;
+
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.dircache.DirCache;
+import org.eclipse.jgit.lib.CLIRepositoryTestCase;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class AddTest extends CLIRepositoryTestCase {
+       private Git git;
+
+       @Override
+       @Before
+       public void setUp() throws Exception {
+               super.setUp();
+               git = new Git(db);
+       }
+
+       @Ignore("args4j exit()s on error instead of throwing, JVM goes down")
+       @Test
+       public void testAddNothing() throws Exception {
+               assertEquals("fatal: Argument \"filepattern\" is required", //
+                               execute("git add")[0]);
+       }
+
+       @Ignore("args4j exit()s for --help, too")
+       @Test
+       public void testAddUsage() throws Exception {
+               execute("git add --help");
+       }
+
+       @Test
+       public void testAddAFile() throws Exception {
+               writeTrashFile("greeting", "Hello, world!");
+               assertArrayEquals(new String[] { "" }, //
+                               execute("git add greeting"));
+
+               DirCache cache = db.readDirCache();
+               assertNotNull(cache.getEntry("greeting"));
+               assertEquals(1, cache.getEntryCount());
+       }
+
+       @Test
+       public void testAddFileTwice() throws Exception {
+               writeTrashFile("greeting", "Hello, world!");
+               assertArrayEquals(new String[] { "" }, //
+                               execute("git add greeting greeting"));
+
+               DirCache cache = db.readDirCache();
+               assertNotNull(cache.getEntry("greeting"));
+               assertEquals(1, cache.getEntryCount());
+       }
+
+       @Test
+       public void testAddAlreadyAdded() throws Exception {
+               writeTrashFile("greeting", "Hello, world!");
+               git.add().addFilepattern("greeting").call();
+               assertArrayEquals(new String[] { "" }, //
+                               execute("git add greeting"));
+
+               DirCache cache = db.readDirCache();
+               assertNotNull(cache.getEntry("greeting"));
+               assertEquals(1, cache.getEntryCount());
+       }
+}