Test net convert con JavaToCSharp

javiertuya · Oct 19, 2024 · 1fbf429 · 1fbf429
1 parent 66c5a8c
commit 1fbf429
Show file tree

Hide file tree

Showing 26 changed files with 1,329 additions and 1,239 deletions.
diff --git a/java/src/main/java/giis/visualassert/AbstractVisualAssert.java b/java/src/main/java/giis/visualassert/AbstractVisualAssert.java
@@ -163,7 +163,7 @@ public T clearCurrentSequence() {
 	 * @param actual   the value to compare against expected
 	 */
 	public void assertEquals(String expected, String actual) {
-		assertEquals(expected, actual, "", "");
+		this.assertEquals(expected, actual, "", "");
 	}
 
 	/**
@@ -172,9 +172,10 @@ public void assertEquals(String expected, String actual) {
 	 * file in the assert message.
 	 * @param expected the expected string
 	 * @param actual   the value to compare against expected
+	 * @param message  additional message to be included
 	 */
 	public void assertEquals(String expected, String actual, String message) {
-		assertEquals(expected, actual, message, "");
+		this.assertEquals(expected, actual, message, "");
 	}
 
 	/**

diff --git a/java/src/main/java/giis/visualassert/SoftVisualAssert.java b/java/src/main/java/giis/visualassert/SoftVisualAssert.java
@@ -60,16 +60,13 @@ private String getStackTraceMessage(CallStack stack) {
 		for (int i=0; i<stack.size(); i++) {
 			//Skip traces corresponding to the classes of this package that are at the top of stack
 			//case insensitive for net compatibility
+			String stackClass = stack.getClassName(i).toLowerCase();
 			if (skip 
-					&& !stack.getClassName(i).startsWith("giis.visualassert.portable.CallStack")
-					&& !stack.getClassName(i).startsWith("giis.visualassert.AbstractVisualAssert") 
-					&& !stack.getClassName(i).startsWith("giis.visualassert.SoftVisualAssert") 
-					&& !stack.getClassName(i).startsWith("giis.visualassert.VisualAssert")
-					&& !stack.getClassName(i).startsWith("Giis.Visualassert.portable.CallStack")
-					&& !stack.getClassName(i).startsWith("Giis.Visualassert.AbstractVisualassert") 
-					&& !stack.getClassName(i).startsWith("Giis.Visualassert.SoftVisualAssert") 
-					&& !stack.getClassName(i).startsWith("Giis.Visualassert.VisualAssert")
-					&& !stack.getClassName(i).startsWith("System.Environment") //only net
+					&& !stackClass.startsWith("giis.visualassert.portable.callstack")
+					&& !stackClass.startsWith("giis.visualassert.abstractvisualassert") 
+					&& !stackClass.startsWith("giis.visualassert.softvisualassert") 
+					&& !stackClass.startsWith("giis.visualassert.visualassert")
+					&& !stackClass.startsWith("system.environment") //only net
 					) {
 				skip=false;
 			}
@@ -161,7 +158,7 @@ public int getFailureCount() {
 	 * Fails a test with no message
 	 */
 	public void fail() {
-		fail("");
+		this.fail("");
 	}
 	/**
 	 * Fails a test with the given message

diff --git a/java/src/main/java/giis/visualassert/portable/JavaCs.java b/java/src/main/java/giis/visualassert/portable/JavaCs.java
@@ -14,6 +14,9 @@ public class JavaCs {
 	private JavaCs() {
 	    throw new IllegalAccessError("Utility class");
 	}
+	public static boolean isJava() {
+		return true;
+	}
 	public static boolean isEmpty(String str) {
 		return str==null || "".equals(str.trim());
 	}

diff --git a/java/src/test/java/giis/visualassert/TestDiffLocation.java b/java/src/test/java/giis/visualassert/TestDiffLocation.java
@@ -1,6 +1,6 @@
 package giis.visualassert;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 

diff --git a/java/src/test/java/giis/visualassert/TestSoftVisualAssert.java b/java/src/test/java/giis/visualassert/TestSoftVisualAssert.java
@@ -59,7 +59,7 @@ public static void doFailSoftAssert(SoftVisualAssert va, String expected, String
 			expected=expected.replace("fan.html", FileUtil.getPath(reportPath, "fan.html"));
 			expected=expected.replace("diff-0.html", FileUtil.getPath(reportPath, "diff-0.html"));
 			expected=expected.replace("Aggregate.html", FileUtil.getPath(reportPath, "Aggregate.html"));
-			assertEquals(CallStack.normalize(expected), CallStack.normalize(e.getMessage()));
+			assertEquals(CallStack.normalize(expected).toLowerCase(), CallStack.normalize(e.getMessage()).toLowerCase());
 			success = true;
 		}
 		assertTrue(success);

diff --git a/java/src/test/java/giis/visualassert/TestSoftVisualAssertCallStack.java b/java/src/test/java/giis/visualassert/TestSoftVisualAssertCallStack.java
@@ -6,6 +6,7 @@
 import org.junit.Test;
 
 import giis.visualassert.portable.CallStack;
+import giis.visualassert.portable.JavaCs;
 
 /**
  * Checks the stack trace items shown in messages.
@@ -14,6 +15,8 @@
  * Adjust the numbers if new lines are added to the code
  */
 public class TestSoftVisualAssertCallStack {
+
+	private String innerClassSeparator = JavaCs.isJava() ? "$" : ".";
 
 	//Deep stack assert invocations
 	public class OtherClass {
@@ -42,7 +45,7 @@ public void testSingleStackItem() {
 		try {
 			va.assertAll();
 		} catch (AssertionError e) {
-			assertEquals(CallStack.normalize(getExpectedSingleStackItem()), CallStack.normalize(e.getMessage()));
+			assertEquals(CallStack.normalize(getExpectedSingleStackItem()).toLowerCase(), CallStack.normalize(e.getMessage()).toLowerCase());
 			success=true;
 		}
 		assertTrue(success);
@@ -55,7 +58,7 @@ public void testMultipleStackItem() {
 		try {
 			va.assertAll();
 		} catch (AssertionError e) {
-			assertEquals(CallStack.normalize(getExpectedMultipleStackItem()), CallStack.normalize(e.getMessage()));
+			assertEquals(CallStack.normalize(getExpectedMultipleStackItem()).toLowerCase(), CallStack.normalize(e.getMessage()).toLowerCase());
 			success=true;
 		}
 		assertTrue(success);
@@ -84,15 +87,15 @@ private String getExpectedSingleStackItem() {
 				+ "Failure 2: Strings are different. First diff at line 1 column 4.\n"
 				+ "- Visual diffs at: target/fstack12.html\n"
 				+ "- Call Stack:\n"
-				+ "    at giis.visualassert.TestSoftVisualAssertCallStack$OtherClass.doAssert(TestSoftVisualAssertCallStack.java:19)";
+				+ "    at giis.visualassert.TestSoftVisualAssertCallStack" + innerClassSeparator + "OtherClass.doAssert(TestSoftVisualAssertCallStack.java:19)";
 	}
 
 	private String getExpectedMultipleStackItem() {
 		return "There are 1 failed assertion(s)\n"
 				+ "Failure 1: Strings are different. First diff at line 1 column 4.\n"
 				+ "- Visual diffs at: target/fstack12.html\n"
 				+ "- Call Stack:\n"
-				+ "    at giis.visualassert.TestSoftVisualAssertCallStack$OtherClass.doAssert(TestSoftVisualAssertCallStack.java:19)\n"
+				+ "    at giis.visualassert.TestSoftVisualAssertCallStack" + innerClassSeparator + "OtherClass.doAssert(TestSoftVisualAssertCallStack.java:19)\n"
 				+ "    at giis.visualassert.TestSoftVisualAssertCallStack.callDoAssert(TestSoftVisualAssertCallStack.java:25)\n"
 				+ "    at giis.visualassert.TestSoftVisualAssertCallStack.testMultipleStackItem(TestSoftVisualAssertCallStack.java:49)";
 	}

diff --git a/net/.gitignore b/net/.gitignore
@@ -4,4 +4,5 @@ nupkg
 reports
 TestResults
 .vs
-sharpen-temp
+sharpen-temp
+JavaToCsharp-temp
diff --git a/net/JavaToCSharp-temp b/net/JavaToCSharp-temp
diff --git a/net/TestVisualAssert/Giis.Visualassert/TestDiffLocation.cs b/net/TestVisualAssert/Giis.Visualassert/TestDiffLocation.cs