Browse Source

test moved to avoid visibility changes

pull/142/head
Alexey Makeyev 9 years ago
parent
commit
bcd00f7b7b
  1. 4
      json-path/src/main/java/com/jayway/jsonpath/internal/token/PathToken.java
  2. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/token/PropertyPathToken.java
  3. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/token/ScanPathToken.java
  4. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/token/WildcardPathToken.java
  5. 3
      json-path/src/test/java/com/jayway/jsonpath/internal/token/PathTokenTest.java

4
json-path/src/main/java/com/jayway/jsonpath/internal/token/PathToken.java

@ -36,7 +36,7 @@ public abstract class PathToken {
private Boolean definite = null; private Boolean definite = null;
private Boolean upstreamDefinite = null; private Boolean upstreamDefinite = null;
public PathToken appendTailToken(PathToken next) { PathToken appendTailToken(PathToken next) {
this.next = next; this.next = next;
this.next.prev = this; this.next.prev = this;
return next; return next;
@ -161,7 +161,7 @@ public abstract class PathToken {
return prev == null; return prev == null;
} }
public boolean isUpstreamDefinite() { boolean isUpstreamDefinite() {
if (upstreamDefinite == null) { if (upstreamDefinite == null) {
upstreamDefinite = isRoot() || prev.isTokenDefinite() && prev.isUpstreamDefinite(); upstreamDefinite = isRoot() || prev.isTokenDefinite() && prev.isUpstreamDefinite();
} }

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/PropertyPathToken.java

@ -27,7 +27,7 @@ import static com.jayway.jsonpath.internal.Utils.onlyOneIsTrueNonThrow;
/** /**
* *
*/ */
public class PropertyPathToken extends PathToken { class PropertyPathToken extends PathToken {
private final List<String> properties; private final List<String> properties;

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/ScanPathToken.java

@ -25,7 +25,7 @@ import java.util.Collection;
*/ */
public class ScanPathToken extends PathToken { public class ScanPathToken extends PathToken {
public ScanPathToken() { ScanPathToken() {
} }
@Override @Override

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/WildcardPathToken.java

@ -25,7 +25,7 @@ import static java.util.Arrays.asList;
*/ */
public class WildcardPathToken extends PathToken { public class WildcardPathToken extends PathToken {
public WildcardPathToken() { WildcardPathToken() {
} }
@Override @Override

3
json-path/src/test/java/com/jayway/jsonpath/PathTokenTest.java → json-path/src/test/java/com/jayway/jsonpath/internal/token/PathTokenTest.java

@ -1,5 +1,6 @@
package com.jayway.jsonpath; package com.jayway.jsonpath.internal.token;
import com.jayway.jsonpath.BaseTest;
import com.jayway.jsonpath.internal.token.PathToken; import com.jayway.jsonpath.internal.token.PathToken;
import com.jayway.jsonpath.internal.token.PropertyPathToken; import com.jayway.jsonpath.internal.token.PropertyPathToken;
import com.jayway.jsonpath.internal.token.ScanPathToken; import com.jayway.jsonpath.internal.token.ScanPathToken;
Loading…
Cancel
Save