Author: tolusha
Date: 2010-06-15 10:35:13 -0400 (Tue, 15 Jun 2010)
New Revision: 2608
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/TesterSecurityManager.java
Log:
EXOJCR-756: fix TesterSecurityManager for TCK
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/TesterSecurityManager.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/TesterSecurityManager.java 2010-06-15
14:26:50 UTC (rev 2607)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/TesterSecurityManager.java 2010-06-15
14:35:13 UTC (rev 2608)
@@ -50,26 +50,25 @@
StackTraceElement[] traceElements = e.getStackTrace();
for (int i = 0; i < traceElements.length; i++)
{
- StackTraceElement el = traceElements[i];
- String cl = el.getClassName();
- String fn = el.getFileName();
+ String className = traceElements[i].getClassName();
+ String fileName = traceElements[i].getFileName();
- if (cl.startsWith("org.exoplatform"))
+ if (className.startsWith("org.exoplatform"))
{
// TesterSecurityManager is not a part of source code
- if (fn.equals("TesterSecurityManager.java"))
+ if (fileName.equals("TesterSecurityManager.java"))
{
continue;
}
// hide Exception
- if (fn.equals("BaseStandaloneTest.java") ||
fn.equals("SLF4JExoLogFactory.java"))
+ if (fileName.equals("BaseStandaloneTest.java") ||
fileName.equals("SLF4JExoLogFactory.java"))
{
return;
}
- if (fn.startsWith("Test") ||
fn.endsWith("Test.java") || fn.endsWith("TestBase.java")
- || fn.equals("Probe.java"))
+ if (fileName.startsWith("Test") ||
fileName.endsWith("Test.java")
+ || fileName.endsWith("TestBase.java") ||
fileName.equals("Probe.java"))
{
testCode = true;
}
@@ -78,15 +77,25 @@
srcCode = true;
}
}
- else if (cl.startsWith("org.apache.jackrabbit.test"))
+ else if (className.startsWith("org.apache.jackrabbit.test"))
{
// hide Exception
- if (fn.equals("JCRTestResult.java"))
+ if (fileName.equals("JCRTestResult.java") ||
fileName.equals("RepositoryHelper.java"))
{
return;
}
+
+ if (fileName.endsWith("Test.java"))
+ {
+ testCode = true;
+ }
+ else
+ {
+ srcCode = true;
+ }
+
}
- else if
(cl.startsWith("org.exoplatform.services.log.impl.SLF4JExoLogFactory"))
+ else if
(className.startsWith("org.slf4j.impl.Log4jLoggerFactory"))
{
return;
}
Show replies by date