EXTSCRIPT-154: Code Rewrite/Refactoring, WeavingContext refactoring
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1300083 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/context/InitialFullScanTest.java b/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/context/InitialFullScanTest.java
index 01a5100..f74bc00 100644
--- a/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/context/InitialFullScanTest.java
+++ b/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/context/InitialFullScanTest.java
@@ -22,7 +22,7 @@
import org.junit.Before;
import org.junit.Test;
import rewrite.org.apache.myfaces.extensions.scripting.core.api.ScriptingConst;
-import rewrite.org.apache.myfaces.extensions.scripting.core.context.WeavingContext;
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.FactoryEngines;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.ScriptingEngine;
diff --git a/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationExceptionTest.java b/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationExceptionTest.java
new file mode 100644
index 0000000..593b843
--- /dev/null
+++ b/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationExceptionTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package rewrite.org.apache.myfaces.extensions.scripting.scanningcore.engine.compiler;
+
+import org.apache.myfaces.extensions.scripting.api.CompilationException;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * dummy test for the class to have class level coverage
+ *
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+
+public class CompilationExceptionTest {
+ private static final String ERR_MSG = "BlaMessage";
+
+ @Test
+ public void testCompilationException() {
+ CompilationException ex = new CompilationException(ERR_MSG);
+
+ assertTrue(ex.getMessage().equals(ERR_MSG));
+
+ ex = new CompilationException(ERR_MSG, new NullPointerException(ERR_MSG));
+ assertTrue(ex.getMessage().equals(ERR_MSG));
+ assertTrue(ex.getCause() instanceof NullPointerException);
+
+ ex = new CompilationException(new NullPointerException(ERR_MSG));
+ assertTrue(ex.getCause() instanceof NullPointerException);
+ }
+
+}
diff --git a/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationResultTest.java b/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationResultTest.java
new file mode 100644
index 0000000..44a8576
--- /dev/null
+++ b/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationResultTest.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package rewrite.org.apache.myfaces.extensions.scripting.scanningcore.engine.compiler;
+
+import org.apache.myfaces.extensions.scripting.api.CompilationResult;
+import org.junit.Before;
+import org.junit.Test;
+
+import static junit.framework.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+
+public class CompilationResultTest {
+ CompilationResult result = null;
+ private static final String BOOGA = "booga";
+
+ @Before
+ public void init() {
+ result = new CompilationResult(BOOGA);
+ }
+
+ @Test
+ public void testGetCompilerOutput() throws Exception {
+ assertTrue(result.getCompilerOutput().equals(BOOGA));
+ }
+
+ @Test
+ public void testHasErrors() throws Exception {
+ assertFalse(result.hasErrors());
+ result.getErrors().add(new CompilationResult.CompilationMessage(1, BOOGA));
+ assertTrue(result.hasErrors());
+ }
+
+ @Test
+ public void testRegisterError() throws Exception {
+ assertFalse(result.hasErrors());
+ result.registerError(new CompilationResult.CompilationMessage(1, BOOGA));
+ assertTrue(result.hasErrors());
+ }
+
+ @Test
+ public void testGetErrors() throws Exception {
+ assertTrue(result.getErrors().isEmpty());
+ result.registerError(new CompilationResult.CompilationMessage(1, BOOGA));
+ result.registerError(null);
+ assertFalse(result.getErrors().isEmpty());
+ assertTrue(result.getErrors().size() == 1);
+ result.registerError(new CompilationResult.CompilationMessage(1, BOOGA));
+ result.registerError(null);
+ assertTrue(result.getErrors().size() == 2);
+
+ }
+
+ @Test
+ public void testRegisterWarning() throws Exception {
+ assertTrue(result.getWarnings().isEmpty());
+ result.registerWarning(new CompilationResult.CompilationMessage(1, BOOGA));
+ result.registerWarning(null);
+ assertFalse(result.getWarnings().isEmpty());
+ assertTrue(result.getWarnings().size() == 1);
+ result.registerWarning(new CompilationResult.CompilationMessage(1, BOOGA));
+
+ assertFalse(result.getWarnings().isEmpty());
+ assertTrue(result.getWarnings().size() == 2);
+ assertTrue(result.getErrors().isEmpty());
+ }
+
+}
diff --git a/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/GroovyCompilerTest.java b/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/GroovyCompilerTest.java
index fbb884e..a24d050 100644
--- a/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/GroovyCompilerTest.java
+++ b/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/GroovyCompilerTest.java
@@ -21,9 +21,9 @@
import org.apache.commons.io.FilenameUtils;
import org.junit.Test;
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.Configuration;
import rewrite.org.apache.myfaces.extensions.scripting.core.api.ScriptingConst;
-import rewrite.org.apache.myfaces.extensions.scripting.core.context.Configuration;
-import rewrite.org.apache.myfaces.extensions.scripting.core.context.WeavingContext;
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.FactoryEngines;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationResult;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.compiler.GroovyCompiler;
diff --git a/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/JavaCompilerTest.java b/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/JavaCompilerTest.java
index 90d6d31..404d408 100644
--- a/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/JavaCompilerTest.java
+++ b/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/JavaCompilerTest.java
@@ -21,10 +21,10 @@
import org.apache.commons.io.FilenameUtils;
import org.junit.Test;
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.Configuration;
import rewrite.org.apache.myfaces.extensions.scripting.core.api.ScriptingConst;
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.FileUtils;
-import rewrite.org.apache.myfaces.extensions.scripting.core.context.Configuration;
-import rewrite.org.apache.myfaces.extensions.scripting.core.context.WeavingContext;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.FactoryEngines;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationException;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationResult;
