Merge pull request kamranzafar#6 from geronimo-iia/master

test case on change

Author: kamranzafar

.gitignore

@@ -161,3 +161,7 @@ pip-log.txt
 
 # Mac crap
 .DS_Store
+
+JCL/.classpath
+
+JCL/.project

JCL/.classpath

@@ -64,7 +64,6 @@
 									<version>${pom.version}</version>
 								</artifactItem>
 							</artifactItems>
-
 							<outputDirectory>./target</outputDirectory>
 							<stripVersion>true</stripVersion>
 							<overWriteReleases>false</overWriteReleases>
@@ -97,12 +96,6 @@
 					<skip>${skipTest}</skip>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-site-plugin</artifactId>
-				<configuration>
-					<generateReports>false</generateReports>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>

JCL/.project

@@ -450,7 +450,7 @@ public ProxyClassLoader getCurrentLoader() {
 	}
 
 	public ProxyClassLoader getThreadLoader() {
-		return currentLoader;
+		return threadLoader;
 	}
 
 	public ProxyClassLoader getOsgiBootLoader() {

JCL2/core/pom.xml

@@ -0,0 +1,47 @@
+package org.xeustechnologies.jcl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+/**
+ * AbstractClassLoaderTest test case on AbstractClassLoader class.
+ * 
+ * @author <a href="mailto:[email protected]" >Jerome Guibert</a>
+ * 
+ */
+public class AbstractClassLoaderTest {
+
+	@Test
+	public void checkInitializationOfDefaultProxyClassLoader() {
+		AbstractClassLoader classLoader = new AbstractClassLoader() {
+		};
+
+		assertNotNull("SystemLoader should not be null", classLoader.getSystemLoader());
+		assertNotNull("ThreadLoader should not be null", classLoader.getThreadLoader());
+		assertNotNull("ParentLoader should not be null", classLoader.getParentLoader());
+		assertNotNull("CurrentLoader should not be null", classLoader.getCurrentLoader());
+		assertNotNull("OsgiBootLoader should not be null", classLoader.getOsgiBootLoader());
+
+		assertEquals("SystemLoader order should be 50", 50, classLoader.getSystemLoader().getOrder());
+		assertEquals("ThreadLoader order should be 40", 40, classLoader.getThreadLoader().getOrder());
+		assertEquals("ParentLoader order should be 30", 30, classLoader.getParentLoader().getOrder());
+		assertEquals("CurrentLoader order should be 20", 20, classLoader.getCurrentLoader().getOrder());
+		assertEquals("OsgiBootLoader order should be 0", 0, classLoader.getOsgiBootLoader().getOrder());
+
+	}
+
+	@Test
+	public void checkDefaultEnabledProxy() {
+		AbstractClassLoader classLoader = new AbstractClassLoader() {
+		};
+
+		assertEquals(Configuration.isCurrentLoaderEnabled(), classLoader.getCurrentLoader().isEnabled());
+		assertEquals(Configuration.isParentLoaderEnabled(), classLoader.getParentLoader().isEnabled());
+		assertEquals(Configuration.isThreadContextLoaderEnabled(), classLoader.getThreadLoader().isEnabled());
+		assertEquals(Configuration.isSystemLoaderEnabled(), classLoader.getSystemLoader().isEnabled());
+		assertEquals(Configuration.isOsgiBootDelegationEnabled(), classLoader.getOsgiBootLoader().isEnabled());
+
+	}
+}

JCL2/core/src/main/java/org/xeustechnologies/jcl/AbstractClassLoader.java

@@ -0,0 +1,57 @@
+package org.xeustechnologies.jcl;
+
+import org.junit.Test;
+import org.xeustechnologies.jcl.sample.Test1;
+
+import static org.junit.Assert.*;
+
+/**
+ * 
+ * DelegateProxyClassLoaderTest test with DelegateProxyClassLoader.
+ * 
+ * @author <a href="mailto:[email protected]" >Jerome Guibert</a>
+ * 
+ */
+public class DelegateProxyClassLoaderTest {
+
+	@Test
+	public void checkDelegateProxyClassLoader() throws ClassNotFoundException {
+		/**
+		 * First classLoader without Test1
+		 */
+		JarClassLoader classLoader = new JarClassLoader();
+		doIsolated(classLoader);
+		assertTrue(classLoader.getLocalLoader().isEnabled());
+		try {
+			classLoader.loadClass(Test1.class.getName());
+			fail("Should obtain java.lang.ClassNotFoundException: org.xeustechnologies.jcl.sample.Test1");
+		} catch (ClassNotFoundException e) {
+		}
+		/**
+		 * target  classLoader with Test1
+		 */
+		JarClassLoader target = new JarClassLoader();
+		doIsolated(classLoader);
+		assertTrue(classLoader.getLocalLoader().isEnabled());
+		target.add(Test1.class.getName());
+		target.loadClass(Test1.class.getName());
+		/**
+		 * Add delegate
+		 */
+		classLoader.addLoader(new DelegateProxyClassLoader(target));
+		classLoader.loadClass(Test1.class.getName());
+	}
+
+	/**
+	 * Only local loader.
+	 * 
+	 * @param classLoader
+	 */
+	protected void doIsolated(JarClassLoader classLoader) {
+		classLoader.getCurrentLoader().setEnabled(false);
+		classLoader.getParentLoader().setEnabled(false);
+		classLoader.getThreadLoader().setEnabled(false);
+		classLoader.getSystemLoader().setEnabled(false);
+		classLoader.getOsgiBootLoader().setEnabled(false);
+	}
+}

JCL2/core/src/test/java/org/xeustechnologies/jcl/AbstractClassLoaderTest.java

@@ -0,0 +1,5 @@
+package org.xeustechnologies.jcl.sample;
+
+public class Test1 {
+
+}

JCL2/core/src/test/java/org/xeustechnologies/jcl/DelegateProxyClassLoaderTest.java

@@ -129,6 +129,7 @@
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
+					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -139,8 +140,7 @@
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<configuration>
 					<aggregate>true</aggregate>
-					<excludePackageNames>org.xeustechnologies.jcl.test
-					</excludePackageNames>
+					<excludePackageNames>org.xeustechnologies.jcl.test</excludePackageNames>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -196,6 +196,12 @@
 					<issueLinkTemplate>http://sourceforge.net/support/tracker.php?aid=%ISSUE% </issueLinkTemplate>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<generateReports>false</generateReports>
+				</configuration>
+			</plugin>
 		</plugins>
 	</reporting>
 	<dependencies>

JCL2/core/src/test/java/org/xeustechnologies/jcl/sample/Test1.java

@@ -10,7 +10,7 @@
 
 	<artifactId>jcl-spring</artifactId>
 	<name>JCL - Spring</name>
-	<build> 
+	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -42,8 +42,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<addDefaultImplementationEntries>true
-							</addDefaultImplementationEntries>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 						</manifest>
 					</archive>
 				</configuration>
@@ -66,7 +65,6 @@
 									<version>${pom.version}</version>
 								</artifactItem>
 							</artifactItems>
-
 							<outputDirectory>./target</outputDirectory>
 							<stripVersion>true</stripVersion>
 							<overWriteReleases>false</overWriteReleases>
@@ -94,17 +92,12 @@
 				<configuration>
 					<includes>
 						<include>org/xeustechnologies/jcl/spring/SpringTest.java
-                        </include>
+						</include>
 					</includes>
 					<skip>${skipTest}</skip>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-site-plugin</artifactId>
-				<configuration>
-					<generateReports>false</generateReports>
-				</configuration>
-			</plugin>
+
 		</plugins>
 	</build>
 	<dependencies>