Skip to content

Commit

Permalink
Merge pull request #32 from Worldsverre/master
Browse files Browse the repository at this point in the history
Fix bad usage on assertEquals and translate
  • Loading branch information
FerdinandSu authored Oct 26, 2024
2 parents 9d34aa1 + e723ba8 commit 16502d8
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 20 deletions.
10 changes: 2 additions & 8 deletions src/test/java/ReFreSH/JMobileSuit/BuildInCommandServerTest.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// src/test/java/ReFreSH/JMobileSuit/BuildInCommandServerTest.java
package ReFreSH.JMobileSuit;

import ReFreSH.JMobileSuit.ObjectModel.SuitObject;
Expand All @@ -6,10 +7,8 @@
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;


public class BuildInCommandServerTest {


@Test
public void testList() {
SuitHost mockSuitHost = mock(SuitHost.class);
Expand All @@ -30,8 +29,6 @@ public void testList() {

@Test
public void testRunScript() {


SuitHost suitHost;
Object object = new Object();
try {
Expand All @@ -44,10 +41,9 @@ public void testRunScript() {
String[] args = {};
assertEquals(TraceBack.InvalidCommand, instance.RunScript(args));
String[] args1 = {"1"};
assertEquals(TraceBack.InvalidCommand, instance.RunScript(args1));//文件地址输入错误
assertEquals(TraceBack.InvalidCommand, instance.RunScript(args1)); // Incorrect file path
args1[0] = "src/test/resources/SuitHostTests.mss";
assertEquals(TraceBack.AllOk, instance.RunScript(args1));

}

@Test
Expand Down Expand Up @@ -82,7 +78,5 @@ public void testListMembers() {
BuildInCommandServer instance = new BuildInCommandServer(suitHost);
SuitObject obj = new SuitObject(object);
instance.ListMembers(obj);


}
}
2 changes: 1 addition & 1 deletion src/test/java/ReFreSH/JMobileSuit/IO/IOServerTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -424,4 +424,4 @@ public void testSetPrefix() {
}


}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// src/test/java/ReFreSH/JMobileSuit/ObjectModel/Menbers/SuitObjectMemberTest.java
package ReFreSH.JMobileSuit.ObjectModel.Menbers;

import ReFreSH.JMobileSuit.ObjectModel.Members.MemberAccess;
Expand All @@ -16,16 +17,15 @@ public class SuitObjectMemberTest {

@Test
public void testSuitObjectMemberCreation() {
Object instance = new String("TEST"); // replace with actual instance
Object instance = new String("TEST"); // replace with actual instance
Method method = instance.getClass().getMethods()[0];

SuitObjectMember suitObjectMember = new SuitObjectMember(instance, method);

assertNotNull(suitObjectMember);
assertEquals(suitObjectMember.Access(), MemberAccess.VisibleToUser);
assertEquals(suitObjectMember.AbsoluteName(), method.getName());
assertEquals(suitObjectMember.Instance(), instance);

assertEquals(MemberAccess.VisibleToUser, suitObjectMember.Access());
assertEquals(method.getName(), suitObjectMember.AbsoluteName());
assertEquals(instance, suitObjectMember.Instance());
}

@Test
Expand All @@ -36,7 +36,7 @@ public void testSuitObjectMember() {
assertNotNull(suitObjectMember.Access());
assertNotNull(suitObjectMember.Type());
assertNotNull(suitObjectMember.Information());
assertEquals(suitObjectMember.FriendlyNames().get(0), suitObjectMember.AbsoluteName());
assertEquals(suitObjectMember.AbsoluteName(), suitObjectMember.FriendlyNames().get(0));
assertNotNull(suitObjectMember.Instance());
}

Expand Down Expand Up @@ -72,10 +72,9 @@ public void testFriendlyNames() {
Object instance = new Object();
Method method = instance.getClass().getMethods()[0];
SuitObjectMember suitObjectMember = new SuitObjectMember(instance, method);
assertEquals(suitObjectMember.FriendlyNames().get(0), suitObjectMember.AbsoluteName());
assertEquals(suitObjectMember.AbsoluteName(), suitObjectMember.FriendlyNames().get(0));
}


@Test
public void testSuitAliases() {
Object instance = new Object();
Expand All @@ -90,7 +89,7 @@ public void testSuitAbsoluteName() {
Method method = instance.getClass().getMethods()[0];
SuitObjectMember suitObjectMember = new SuitObjectMember(instance, method);
assertNotNull(suitObjectMember.AbsoluteName());
assertEquals(suitObjectMember.AbsoluteName(), method.getName());
assertEquals(method.getName(), suitObjectMember.AbsoluteName());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// src/test/java/ReFreSH/JMobileSuit/ObjectModel/Parsing/AutoDynamicParameterTest.java
package ReFreSH.JMobileSuit.ObjectModel.Parsing;

import ReFreSH.JMobileSuit.ObjectModel.Parsing.AsCollection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// src/test/java/ReFreSH/JMobileSuit/ObjectModel/SuitConfiguratorTest.java
package ReFreSH.JMobileSuit.ObjectModel;

import ReFreSH.JMobileSuit.IO.ColorSetting;
Expand Down Expand Up @@ -63,4 +64,4 @@ public void testGetConfiguration() {
SuitConfiguration suitConfiguration = suitConfigurator.getConfiguration();
assertNotNull(suitConfiguration);
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// src/test/java/ReFreSH/JMobileSuit/ObjectModel/SuitObjectTest.java
package ReFreSH.JMobileSuit.ObjectModel;

import ReFreSH.JMobileSuit.Demo.DiagnosticsDemo;
Expand Down Expand Up @@ -59,4 +60,4 @@ public void testIterator() {
assertFalse(new SuitObject(new Object()).iterator().hasNext());
assertTrue(new SuitObject(new DiagnosticsDemo()).iterator().hasNext());
}
}
}

0 comments on commit 16502d8

Please sign in to comment.