Skip to content

Commit

Permalink
Try to fix tests - but too many changes, would need to write from scr…
Browse files Browse the repository at this point in the history 
…atch

Tried copying more up to date tests from clojurewerkz/ogre but still in java
a number of new tests would need to be ignored or implemented + clj test code
refers to a number of ogre.core fns we do not have.
  • Loading branch information
@holyjak
holyjak committed Jan 13, 2023
1 parent 20286d1 commit 713527a
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 102 deletions.
197 changes: 100 additions & 97 deletions test/java/org/clojurewerkz/ogre/gremlin/process/OgreTinkerPopCheck.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1452,49 +1452,51 @@ public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_VX1X_outE_

}

public static class MapKeysTestTraversals extends MapKeysTest {
private static final String NS = "clojurewerkz.ogre.suite.map-keys-test";
static {
require.invoke(Clojure.read(NS));
}
@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_mapKeys() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_mapKeys").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys").invoke(g);
}

}

public static class MapValuesTestTraversals extends MapValuesTest {
private static final String NS = "clojurewerkz.ogre.suite.map-values-test";
static {
require.invoke(Clojure.read(NS));
}
@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_mapValues() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_mapValues").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues").invoke(g);
}

}
// // MapKeysTest removed between tinkerpop 3.2 and 3.5.4
// public static class MapKeysTestTraversals extends MapKeysTest {
// private static final String NS = "clojurewerkz.ogre.suite.map-keys-test";
// static {
// require.invoke(Clojure.read(NS));
// }
// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_mapKeys() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_mapKeys").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys").invoke(g);
// }

// }

// // MapValuesTest removed between tinkerpop 3.2 and 3.5.4
// public static class MapValuesTestTraversals extends MapValuesTest {
// private static final String NS = "clojurewerkz.ogre.suite.map-values-test";
// static {
// require.invoke(Clojure.read(NS));
// }
// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_mapValues() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_mapValues").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues").invoke(g);
// }

// }

public static class MaxTestTraversals extends MaxTest {
private static final String NS = "clojurewerkz.ogre.suite.max-test";
Expand Down Expand Up @@ -2495,60 +2497,61 @@ public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_group_by

}

public static class GroupTestV3d0Traversals extends GroupTestV3d0 {
private static final String NS = "clojurewerkz.ogre.suite.group-test-v3d0";
static {
require.invoke(Clojure.read(NS));
}
@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byX1X_byXcountXlocalXX_capXaX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byX1X_byXcountXlocalXX_capXaX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byX1X_byXcountXlocalXX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byX1X_byXcountXlocalXX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_group_byXnameX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_group_byXnameX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_groupXaX_byXnameX_capXaX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_groupXaX_byXnameX_capXaX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_group_byXoutE_countX_byXnameX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_group_byXoutE_countX_byXnameX").invoke(g);
}

}
// // GroupTestV3d0 removed between tinkerpop 3.2 and 3.5.4
// public static class GroupTestV3d0Traversals extends GroupTestV3d0 {
// private static final String NS = "clojurewerkz.ogre.suite.group-test-v3d0";
// static {
// require.invoke(Clojure.read(NS));
// }
// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byX1X_byXcountXlocalXX_capXaX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byX1X_byXcountXlocalXX_capXaX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byX1X_byXcountXlocalXX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byX1X_byXcountXlocalXX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_group_byXnameX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_group_byXnameX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_groupXaX_byXnameX_capXaX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_groupXaX_byXnameX_capXaX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_group_byXoutE_countX_byXnameX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_group_byXoutE_countX_byXnameX").invoke(g);
// }

// }

public static class GroupCountTestTraversals extends GroupCountTest {
private static final String NS = "clojurewerkz.ogre.suite.group-count-test";
Expand Down
10 changes: 5 additions & 5 deletions test/java/org/clojurewerkz/ogre/gremlin/process/TinkerGraphProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerProperty;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertexProperty;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration2.Configuration;
import org.junit.Ignore;

import java.io.File;
Expand Down Expand Up @@ -51,11 +51,11 @@ public Map<String, Object> getBaseConfiguration(final String graphName, final Cl
final String idMaker = (idManager.equals(TinkerGraph.DefaultIdManager.ANY) ? selectIdMakerFromTest(test, testMethodName) : idManager).name();
return new HashMap<String, Object>() {{
put(Graph.GRAPH, TinkerGraph.class.getName());
put(TinkerGraph.CONFIG_VERTEX_ID, idMaker);
put(TinkerGraph.CONFIG_EDGE_ID, idMaker);
put(TinkerGraph.CONFIG_VERTEX_PROPERTY_ID, idMaker);
put(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER, idMaker);
put(TinkerGraph.GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER, idMaker);
put(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER, idMaker);
if (requiresListCardinalityAsDefault(loadGraphWith, test, testMethodName))
put(TinkerGraph.CONFIG_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name());
put(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name());
}};
}

Expand Down

0 comments on commit 713527a

Please sign in to comment.