You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/03/14 20:55:21 UTC
svn commit: r1300700 - in
/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src:
main/java/org/apache/myfaces/extensions/scripting/core/monitor/
test/java/org/apache/myfaces/extensions/scripting/scanningcore/context/
Author: werpu
Date: Wed Mar 14 19:55:21 2012
New Revision: 1300700
URL: http://svn.apache.org/viewvc?rev=1300700&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-154 adding old testcase fixing smaller issue with the source file handling
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/scanningcore/context/TaintHistoryTest.java
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java?rev=1300700&r1=1300699&r2=1300700&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java Wed Mar 14 19:55:21 2012
@@ -110,7 +110,11 @@ public class ClassResource extends Watch
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()
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/scanningcore/context/TaintHistoryTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/scanningcore/context/TaintHistoryTest.java?rev=1300700&r1=1300699&r2=1300700&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/scanningcore/context/TaintHistoryTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/scanningcore/context/TaintHistoryTest.java Wed Mar 14 19:55:21 2012
@@ -60,7 +60,7 @@ public class TaintHistoryTest extends Ab
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 class TaintHistoryTest extends Ab
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 @@ public class TaintHistoryTest extends Ab
new HtmlFormRenderer());
}
+ public void testBooga() {
+ assertTrue(true);
+ }
+
public void testTaintHistory() throws Exception {
ClassResource historyEntry = new ClassResource();
historyEntry.setAClass(this.getClass());
@@ -95,6 +99,7 @@ public class TaintHistoryTest extends Ab
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);