https://issues.apache.org/jira/browse/EXTSCRIPT-154 adding old testcase fixing smaller issue with the source file handling
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1300700 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
index f0eba64..95a6e7c 100644
--- a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
+++ b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
@@ -110,7 +110,11 @@
public String getSourceFile()
{
- return _sourceFile.getAbsolutePath().substring(getSourceDir().length());
+ String sourceDir = getSourceDir();
+ if(sourceDir == null) {
+ sourceDir = _sourceFile.getPath();
+ }
+ return _sourceFile.getAbsolutePath().substring(sourceDir.length());
}
public String getSourceDir()
diff --git a/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/scanningcore/context/TaintHistoryTest.java b/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/scanningcore/context/TaintHistoryTest.java
index 1f0e6d3..02f356c 100644
--- a/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/scanningcore/context/TaintHistoryTest.java
+++ b/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/scanningcore/context/TaintHistoryTest.java
@@ -60,7 +60,7 @@
private static final String ATTR_NO_ENTRIES = "noEntries";
private static final String ATTR_FILTER = "filter";
- public TaintHistoryTest(String name)
+ public TaintHistoryTest()
{
super(TaintHistoryTest.class.getName());
}
@@ -68,7 +68,7 @@
public void setUp() throws Exception
{
super.setUp();
- context = ContextUtils.startupSystem();
+ context = ContextUtils.startupSystem();
_writer = new MockResponseWriter(new StringWriter(), null, null);
facesContext.setResponseWriter(_writer);
@@ -87,6 +87,10 @@
new HtmlFormRenderer());
}
+ public void testBooga() {
+ assertTrue(true);
+ }
+
public void testTaintHistory() throws Exception {
ClassResource historyEntry = new ClassResource();
historyEntry.setAClass(this.getClass());
@@ -95,6 +99,7 @@
historyEntry.setScriptingEngine(ScriptingConst.ENGINE_TYPE_JSF_JAVA);
historyEntry.setFile(new File(BOOGA_JAVA));
// historyEntry.getRefreshAttribute().requestRefresh();
+ //todo set source file
historyEntry.setTainted(true);
//WeavingContext.getInstance().addTaintLogEntry(historyEntry);
