| Chunk |
|---|
| Conflicting content |
|---|
import me.qmx.jitescript.CodeBlock; import org.dynjs.api.Function; import org.dynjs.api.Scope; <<<<<<< HEAD import org.dynjs.runtime.*; ======= import org.dynjs.runtime.Argument; import org.dynjs.runtime.DynAtom; import org.dynjs.runtime.DynFunction; import org.dynjs.runtime.DynObject; import org.dynjs.runtime.DynString; import org.dynjs.runtime.DynThreadContext; import org.dynjs.runtime.RT; >>>>>>> e1df1a742dd6e14170851822e85d5b5364524182 import org.junit.Before; import org.junit.Ignore; import org.junit.Test; |
| Solution content |
|---|
import me.qmx.jitescript.CodeBlock; import org.dynjs.api.Function; import org.dynjs.api.Scope; import org.dynjs.runtime.Argument; import org.dynjs.runtime.DynAtom; import org.dynjs.runtime.DynFunction; import org.dynjs.runtime.DynObject; import org.dynjs.runtime.DynString; import org.dynjs.runtime.DynThreadContext; import org.dynjs.runtime.RT; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; |
| File |
|---|
| DynJSCompilerTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
dynJS.eval("print('hello world');");
}
<<<<<<< HEAD
@Ignore("pb - 2011-09-02") @Test(expected = ReferenceError.class)
public void throwsReferenceErrorWhenCallAnInexistentToken() {
=======
@Test
public void assignsGlobalVariables(){
dynJS.eval(context, scope, "var x = 'test';");
assertThat(scope.resolve("x"))
.isNotNull()
.isInstanceOf(DynString.class);
}
@Test(expected = ReferenceError.class)
public void throwsReferenceErrorWhenCallAnonExistingReference() {
>>>>>>> e1df1a742dd6e14170851822e85d5b5364524182
dynJS.eval(context, scope, "print(x);");
}
} |
| Solution content |
|---|
dynJS.eval("print('hello world');");
}
@Test
public void assignsGlobalVariables(){
dynJS.eval(context, scope, "var x = 'test';");
assertThat(scope.resolve("x"))
.isNotNull()
.isInstanceOf(DynString.class);
}
@Test(expected = ReferenceError.class)
public void throwsReferenceErrorWhenCallAnonExistingReference() {
dynJS.eval(context, scope, "print(x);");
}
} |
| File |
|---|
| DynJSTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| Method declaration |
| Method signature |