Renamed Tag to Tags.

This commit is contained in:
Achim D. Brucker 2018-10-25 21:54:28 +01:00
parent 4f7c07ac40
commit 624decf575
6 changed files with 4 additions and 7 deletions

View File

@ -13,7 +13,6 @@ package com.logicalhacking.dasca.crosslanguage.test
import java.io.File
import com.logicalhacking.dasca.crosslanguage.util.SourceLocation
import com.logicalhacking.dasca.crosslanguage.test.AppTest
import com.logicalhacking.dasca.crosslanguage.builder.CrossBuilderOption
trait AppInfo {

View File

@ -23,6 +23,7 @@ import com.logicalhacking.dasca.crosslanguage.builder.CrossBuilderOption
import com.logicalhacking.dasca.crosslanguage.builder.MergedCallGraph
import com.logicalhacking.dasca.crosslanguage.builder._
import com.ibm.wala.cast.ir.ssa.AstIRFactory
import com.ibm.wala.cast.ir.ssa.AstIRFactory.AstIR
import com.ibm.wala.classLoader.IMethod
class AppTest {
@ -127,12 +128,12 @@ class AppTest {
) yield {
if (Util.isJavaNode(origin._1)) {
target.getIR match {
case ir: AstIRFactory[IMethod]#AstIR => (JavaSourceLocation(origin._1, origin._2), JavaScriptSourceLocation(ir))
case ir: AstIR => (JavaSourceLocation(origin._1, origin._2), JavaScriptSourceLocation(ir))
case _ => (JavaSourceLocation(origin._1, origin._2), new JavaScriptSourceLocation(-1, -1, "unknown"))
}
} else {
origin._1.getIR match {
case ir: AstIRFactory[IMethod]#AstIR => (JavaScriptSourceLocation(ir, origin._2), JavaSourceLocation(target))
case ir: AstIR => (JavaScriptSourceLocation(ir, origin._2), JavaSourceLocation(target))
case _ => (new JavaScriptSourceLocation(-1, -1, "unknown"), JavaSourceLocation(target))
}
}

View File

@ -20,7 +20,6 @@ import com.logicalhacking.dasca.crosslanguage.builder.FilterJavaCallSites
import com.logicalhacking.dasca.crosslanguage.builder.MockCordovaExec
import com.logicalhacking.dasca.crosslanguage.builder.ReplacePluginDefinesAndRequires
import com.logicalhacking.dasca.crosslanguage.builder.FilterJSFrameworks
import com.logicalhacking.dasca.crosslanguage.test.Tag._
@RunWith(classOf[JUnitRunner])

View File

@ -20,7 +20,6 @@ import com.logicalhacking.dasca.crosslanguage.builder.FilterJavaCallSites
import com.logicalhacking.dasca.crosslanguage.builder.MockCordovaExec
import com.logicalhacking.dasca.crosslanguage.builder.ReplacePluginDefinesAndRequires
import com.logicalhacking.dasca.crosslanguage.builder.FilterJSFrameworks
import com.logicalhacking.dasca.crosslanguage.test.Tag._

View File

@ -20,7 +20,6 @@ import com.logicalhacking.dasca.crosslanguage.builder.FilterJavaCallSites
import com.logicalhacking.dasca.crosslanguage.builder.MockCordovaExec
import com.logicalhacking.dasca.crosslanguage.builder.ReplacePluginDefinesAndRequires
import com.logicalhacking.dasca.crosslanguage.builder.FilterJSFrameworks
import com.logicalhacking.dasca.crosslanguage.test.Tag._
@RunWith(classOf[JUnitRunner])

View File

@ -8,7 +8,7 @@
*
*/
package com.logicalhacking.dasca.crosslanguage.test.Tag
package com.logicalhacking.dasca.crosslanguage.test
import org.scalatest.Tag