ExecutionFlow v6.0.0

williamniemiec · Dec 27, 2020 · 82775ae · 82775ae
1 parent 42ba3bb
commit 82775ae
Show file tree

Hide file tree

Showing 15 changed files with 196 additions and 370 deletions.
diff --git a/dist/6.x/ExecutionFlow_ConsoleExporter_v6.0.0.jar b/dist/6.x/ExecutionFlow_ConsoleExporter_v6.0.0.jar
diff --git a/dist/6.x/ExecutionFlow_FileExporter_v6.0.0.jar b/dist/6.x/ExecutionFlow_FileExporter_v6.0.0.jar
diff --git a/src/executionflow/ExecutionFlow.java b/src/executionflow/ExecutionFlow.java
@@ -73,7 +73,7 @@ public abstract class ExecutionFlow {
 	 * {@link executionflow.io.compiler.aspectj.StandardAspectJCompiler#compile()}.
 	 */
 	static {
-		DEVELOPMENT = false;
+		DEVELOPMENT = true;
 	}
 
 

diff --git a/src/executionflow/exporter/ExportManager.java b/src/executionflow/exporter/ExportManager.java
@@ -44,8 +44,8 @@ public class ExportManager {
 	 * Sets test path export type.
 	 */
 	static {
-//		TEST_PATH_EXPORTER = TestPathExportType.CONSOLE;
-		TEST_PATH_EXPORTER = TestPathExportType.FILE;
+		TEST_PATH_EXPORTER = TestPathExportType.CONSOLE;
+//		TEST_PATH_EXPORTER = TestPathExportType.FILE;
 	}
 
 

diff --git a/test/executionflow/io/processor/InvokedFileProcessorTest.java b/test/executionflow/io/processor/InvokedFileProcessorTest.java
@@ -25,6 +25,16 @@ public void testAuxClass() throws IOException {
 
 		processFile();
 	}
+
+	@Test
+	public void innerTry() throws IOException {
+		withDirectory(Path.of("test", "executionflow", "io", "processor", 
+	  			  			  "files", "InvokedFileProcessorTest"));
+		withFilename("InnerTry");
+		initializeTest();
+
+		processFile();
+	}
 
 	@Test
 	public void forEachToFor() throws IOException {

diff --git a/test/executionflow/io/processor/PreTestMethodFileProcessorTest.java b/test/executionflow/io/processor/PreTestMethodFileProcessorTest.java
@@ -30,6 +30,19 @@ public void testClassTest_firstMethod() throws IOException {
 		processFile();
 	}
 
+	@Test
+	public void innerTry() throws IOException {
+		withDirectory(Path.of("test", "executionflow", "io", "processor", 
+			  			  	  "files", "PreTestMethodFileProcessorTest"));
+		withFilename("InnerTry");
+		withTestMethodSignature("org.apache.commons.io.serialization" + 
+								".ValidatingObjectInputStreamTest" + 
+								".exceptionIncludesClassName()");
+		initializeTest();
+
+		processFile();
+	}
+
 	@Test
 	public void testMethodWithInnerClass() throws IOException {
 		withDirectory(Path.of("test", "executionflow", "io", "processor", 

diff --git a/test/executionflow/io/processor/TestMethodFileProcessorTest.java b/test/executionflow/io/processor/TestMethodFileProcessorTest.java
@@ -28,6 +28,16 @@ public void testClassTest() throws IOException {
 		processFile();
 	}
 
+	@Test
+	public void innerTry() throws IOException {
+		withDirectory(Path.of("test", "executionflow", "io", "processor", 
+	  			  			  "files", "TestMethodFileProcessorTest"));
+		withFilename("InnerTry");
+		initializeTest();
+
+		processFile();
+	}
+
 	@Test
 	public void testMethodInvokedSameLine() throws IOException {
 		withDirectory(Path.of("test", "executionflow", "io", "processor", 

diff --git a/test/executionflow/io/processor/files/InvokedFileProcessorTest/AuxClass_parsed.txt b/test/executionflow/io/processor/files/InvokedFileProcessorTest/AuxClass_parsed.txt
diff --git a/test/executionflow/io/processor/files/InvokedFileProcessorTest/InnerTry.java.txt b/test/executionflow/io/processor/files/InvokedFileProcessorTest/InnerTry.java.txt
@@ -0,0 +1,22 @@
+package executionflow.core.file.parser.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import examples.testClasses.TestClass;
+
+@executionflow.runtime.SkipCollection public class TestClass 
+{
+@executionflow.runtime.CollectMethodsCalled 	 @org.junit.Test 
+    public void exceptionIncludesClassName() throws Exception {
+        try {
+            assertSerialization(
+                    willClose(new ValidatingObjectInputStream(testStream)));
+            fail("Expected an InvalidClassException");
+        } catch(final InvalidClassException ice) {
+            final String name = MockSerializedClass.class.getName();
+try {            assertTrue("Expecting message to contain " + name, ice.getMessage().contains(name));} catch(Throwable _d89a6bdcdcc126445913aee13333f14f){}
+        }
+    }
+}
diff --git a/test/executionflow/io/processor/files/InvokedFileProcessorTest/InnerTry_parsed.txt b/test/executionflow/io/processor/files/InvokedFileProcessorTest/InnerTry_parsed.txt
@@ -0,0 +1,16 @@
+package executionflow.core.file.parser.tests;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import examples.testClasses.TestClass;
+@executionflow.runtime.SkipCollection public class TestClass{
+@executionflow.runtime.CollectMethodsCalled 	 @org.junit.Test public void exceptionIncludesClassName() throws Exception {
+try {int _82212329cfb379c33ee897a0bcd1f449=0;
+assertSerialization( willClose(new ValidatingObjectInputStream(testStream)));
+fail("Expected an InvalidClassException");
+}
+catch(final InvalidClassException ice) {
+final String name = MockSerializedClass.class.getName();
+try {            assertTrue("Expecting message to contain " + name, ice.getMessage().contains(name));} catch(Throwable _d89a6bdcdcc126445913aee13333f14f){}
+}
+}
+}
diff --git a/test/executionflow/io/processor/files/PreTestMethodFileProcessorTest/InnerTry.java.txt b/test/executionflow/io/processor/files/PreTestMethodFileProcessorTest/InnerTry.java.txt
@@ -0,0 +1,22 @@
+package executionflow.core.file.parser.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import examples.testClasses.TestClass;
+
+public class TestClass 
+{
+	 @Test
+    public void exceptionIncludesClassName() throws Exception {
+        try {
+            assertSerialization(
+                    willClose(new ValidatingObjectInputStream(testStream)));
+            fail("Expected an InvalidClassException");
+        } catch(final InvalidClassException ice) {
+            final String name = MockSerializedClass.class.getName();
+            assertTrue("Expecting message to contain " + name, ice.getMessage().contains(name));
+        }
+    }
+}
diff --git a/test/executionflow/io/processor/files/PreTestMethodFileProcessorTest/InnerTry_parsed.txt b/test/executionflow/io/processor/files/PreTestMethodFileProcessorTest/InnerTry_parsed.txt
@@ -0,0 +1,22 @@
+package executionflow.core.file.parser.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import examples.testClasses.TestClass;
+
+public class TestClass 
+{
+	 @org.junit.Test
+    public void exceptionIncludesClassName() throws Exception {
+        try {
+            assertSerialization(
+                    willClose(new ValidatingObjectInputStream(testStream)));
+            fail("Expected an InvalidClassException");
+        } catch(final InvalidClassException ice) {
+            final String name = MockSerializedClass.class.getName();
+try {            assertTrue("Expecting message to contain " + name, ice.getMessage().contains(name));} catch(Throwable _d89a6bdcdcc126445913aee13333f14f){}
+        }
+    }
+}
diff --git a/test/executionflow/io/processor/files/PreTestMethodFileProcessorTest/TestClass_parsed.txt b/test/executionflow/io/processor/files/PreTestMethodFileProcessorTest/TestClass_parsed.txt
@@ -8,57 +8,15 @@ import examples.testClasses.TestClass;
 
 public class TestClass 
 {
-	@org.junit.Test
-	public void testLastCurlyBracketInSameLine() {
-		System.out.println("#####################################################################");
-		System.out.println("                    testLastCurlyBracketInSameLine                   ");
-		System.out.println("#####################################################################");
-
-		AgainstRequirementsTestClass artc = new AgainstRequirementsTestClass();
-
-try {		assertEquals(24, artc.factorial(4)); } catch(Throwable _b10f2020164c4a28b16e4c9a0451f26d){}}
-
-//	@Test
-//	public void testFoo()
-//	{
-//		assertEquals("1", "1");
-//		assertEquals("1", "2");	// It will fail
-//	}
-
-//	@Test
-//	public void assertFailInTheMiddleTest() 
-//	{
-//		TestClass tc = new TestClass(99);
-//		assertEquals("one", tc.threePaths(1));
-//		assertEquals("nine", 
-//				tc.threePaths(3));		// It will fail
-//		assertEquals("two", tc.threePaths(2));
-//	}
-
-//	@Test
-//	public void multilineAssert1()
-//	{
-//		assertEquals(param1, 			// Comment 1
-//				param2,					// Comment 2
-//				param3);				// Comment 3
-//	}
-
-//	@Test
-//	public void multilineAssert2()
-//	{
-//		assertEquals (
-//				param1, 				// Comment 1
-//				param2,					// Comment 2
-//				param3);				// Comment 3
-//	}
-
-//	@Test
-//	public void multilineAssert3()
-//	{
-//		assertEquals (
-//				param1, 				// Comment 1
-//				param2,					// Comment 2
-//				param3					// Comment 3
-//		);								// Comment 4
-//	}
+	 @org.junit.Test
+    public void exceptionIncludesClassName() throws Exception {
+        try {
+            assertSerialization(
+                    willClose(new ValidatingObjectInputStream(testStream)));
+            fail("Expected an InvalidClassException");
+        } catch(final InvalidClassException ice) {
+            final String name = MockSerializedClass.class.getName();
+try {            assertTrue("Expecting message to contain " + name, ice.getMessage().contains(name));} catch(Throwable _8034966fb7921102c05b203f2ed1982f){}
+        }
+    }
 }
diff --git a/test/executionflow/io/processor/files/TestMethodFileProcessorTest/InnerTry.java.txt b/test/executionflow/io/processor/files/TestMethodFileProcessorTest/InnerTry.java.txt
@@ -0,0 +1,22 @@
+package executionflow.core.file.parser.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import examples.testClasses.TestClass;
+
+public class TestClass 
+{
+	 @org.junit.Test
+    public void exceptionIncludesClassName() throws Exception {
+        try {
+            assertSerialization(
+                    willClose(new ValidatingObjectInputStream(testStream)));
+            fail("Expected an InvalidClassException");
+        } catch(final InvalidClassException ice) {
+            final String name = MockSerializedClass.class.getName();
+try {            assertTrue("Expecting message to contain " + name, ice.getMessage().contains(name));} catch(Throwable _d89a6bdcdcc126445913aee13333f14f){}
+        }
+    }
+}
diff --git a/test/executionflow/io/processor/files/TestMethodFileProcessorTest/InnerTry_parsed.txt b/test/executionflow/io/processor/files/TestMethodFileProcessorTest/InnerTry_parsed.txt
@@ -0,0 +1,22 @@
+package executionflow.core.file.parser.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import examples.testClasses.TestClass;
+
+@executionflow.runtime.SkipCollection public class TestClass 
+{
+@executionflow.runtime.CollectMethodsCalled 	 @org.junit.Test 
+    public void exceptionIncludesClassName() throws Exception {
+        try {
+            assertSerialization(
+                    willClose(new ValidatingObjectInputStream(testStream)));
+            fail("Expected an InvalidClassException");
+        } catch(final InvalidClassException ice) {
+            final String name = MockSerializedClass.class.getName();
+try {            assertTrue("Expecting message to contain " + name, ice.getMessage().contains(name));} catch(Throwable _d89a6bdcdcc126445913aee13333f14f){}
+        }
+    }
+}