Permalink
Browse files

bug20740: use java-catalog in tests and tutorials

With this change, java and clojure tests and tutorials now use
the java-catalog instead of the java-tutorial catalog.

This change requires the corresponding change to agraph-tests.cfg
in the agraph repo.  [Previously, agraph-tests.cfg used java-tutorial
catalog for java-prepush and java-bigger-test.  With this change, it
uses java-catalog in order to be in sync with the agraph.cfg file that
is generated during an agraph installation; this will also facilitate
running java tests against an installed agraph.]

java-prepush and java-bigger-test both pass.

Change-Id: I140255fd6a0238077a36ba5135f80c0d4c98a429
Reviewed-on: https://gerrit.franz.com:9080/1910
Reviewed-by: Ahmon Dancy <dancy@franz.com>
Tested-by: Kevin Layer <layer@franz.com>
  • Loading branch information...
1 parent 279b54e commit 12b87a012608dcf4c4c69f13bfdf5a834d86ef28 Bill Millar committed with dklayer Jan 20, 2012
Showing with 5 additions and 5 deletions.
  1. +1 −1 build.xml
  2. +2 −2 clojure/test/com/franz/agraph/agtest.clj
  3. +1 −1 src/test/AGAbstractTest.java
  4. +1 −1 src/tutorial/TutorialExamples.java
View
@@ -314,7 +314,7 @@
failonerror="true">
<arg value="./events.sh"/>
<arg value="--catalog"/>
- <arg value="java-tutorial"/>
+ <arg value="java-catalog"/>
<arg value="--load"/>
<arg value="2"/>
<arg value="--query"/>
@@ -71,7 +71,7 @@
(defn with-agraph-test
[f]
(with-agraph [server1 *conn-params*
- cat1 "java-tutorial"
+ cat1 "java-catalog"
repo1 {:name "cljtest" :access :renew}
rcon1]
(repo-size rcon1) ;; ensures the connection is really open
@@ -97,7 +97,7 @@
;;;; tests
(deftest catalog-scratch
- (is (some #{"java-tutorial"} (catalogs server))))
+ (is (some #{"java-catalog"} (catalogs server))))
(deftest catalog-scratch-repos
(is nil? (repositories cat)))
@@ -51,7 +51,7 @@
public class AGAbstractTest extends Closer {
- static public final String CATALOG_ID = "java-tutorial";
+ static public final String CATALOG_ID = "java-catalog";
public Logger log = LoggerFactory.getLogger(this.getClass());
@@ -57,7 +57,7 @@
public class TutorialExamples {
public static String SERVER_URL = "http://localhost:10035";
- public static String CATALOG_ID = "java-tutorial";
+ public static String CATALOG_ID = "java-catalog";
public static String REPOSITORY_ID = "javatutorial";
public static String USERNAME = "test";
public static String PASSWORD = "xyzzy";

0 comments on commit 12b87a0

Please sign in to comment.