hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use assertSame

Browse Source
This commit is contained in:
SiboVG 2024-08-09 05:48:06 +02:00
parent b5d9343ff0
commit d311ee6cc0
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
core/src/test/java/info/openrocket/core/file/rocksim/importt/RockSimLoaderTest.java
View File

@ -99,8 +99,8 @@ public class RockSimLoaderTest extends BaseTestCase {
RocketComponent transition1 = stage1.getChild(0);
RocketComponent transition2 = stage1.getChild(1);
assertEquals(Transition.class, transition1.getClass(), " Component should have been transition");
assertEquals(Transition.class, transition2.getClass(), " Component should have been transition");
assertSame(Transition.class, transition1.getClass(), " Component should have been transition");
assertSame(Transition.class, transition2.getClass(), " Component should have been transition");
assertEquals(transition1.getName(), "Transition 1");
assertEquals(transition2.getName(), "Transition 2");
assertEquals(1, transition1.getChildCount());
@ -124,8 +124,8 @@ public class RockSimLoaderTest extends BaseTestCase {
RocketComponent finSet1 = transition1.getChild(0);
RocketComponent finSet2 = transition2.getChild(0);
assertEquals(FreeformFinSet.class, finSet1.getClass(), " Component should have been free form fin set");
assertEquals(FreeformFinSet.class, finSet2.getClass(), " Component should have been free form fin set");
assertSame(FreeformFinSet.class, finSet1.getClass(), " Component should have been free form fin set");
assertSame(FreeformFinSet.class, finSet2.getClass(), " Component should have been free form fin set");
assertEquals(finSet1.getName(), "Fin set 1");
assertEquals(finSet2.getName(), "Fin set 2");
@ -247,18 +247,18 @@ public class RockSimLoaderTest extends BaseTestCase {
assertEquals(2, nc.getChildCount());
assertEquals(nc.getChild(0).getName(), "Clay");
RocketComponent it = nc.getChild(1);
assertEquals(InnerTube.class, it.getClass());
assertSame(InnerTube.class, it.getClass());
assertEquals(it.getName(), "Attachment Rod");
assertEquals(3, it.getChildCount());
RocketComponent c = it.getChild(0);
assertEquals(CenteringRing.class, c.getClass());
assertSame(CenteringRing.class, c.getClass());
assertEquals(c.getName(), "Plate");
c = it.getChild(1);
assertEquals(CenteringRing.class, c.getClass());
assertSame(CenteringRing.class, c.getClass());
assertEquals(c.getName(), "Sleeve ");
c = it.getChild(2);
assertEquals(Parachute.class, c.getClass());
assertSame(Parachute.class, c.getClass());
assertEquals(c.getName(), "Nose Cone Parachute");
BodyTube bt1 = (BodyTube) stage1.getChild(1);
@ -266,7 +266,7 @@ public class RockSimLoaderTest extends BaseTestCase {
assertEquals(bt1.getChild(0).getName(), "Centering ring");
assertEquals(bt1.getChild(1).getName(), "Centering ring");
c = bt1.getChild(2);
assertEquals(InnerTube.class, c.getClass());
assertSame(InnerTube.class, c.getClass());
assertEquals(c.getName(), "Body tube");
assertEquals(bt1.getChild(3).getName(), "Launch lug");
assertEquals(bt1.getChild(4).getName(), "Pod");
@ -274,7 +274,7 @@ public class RockSimLoaderTest extends BaseTestCase {
ParallelStage pod = (ParallelStage) bt1.getChild(4);
assertEquals(1, pod.getChildCount());
c = pod.getChild(0);
assertEquals(BodyTube.class, c.getClass());
assertSame(BodyTube.class, c.getClass());
assertEquals(pod.getChild(0).getName(), "Body tube");
assertEquals(1, stage2.getChildCount());
@ -436,56 +436,56 @@ public class RockSimLoaderTest extends BaseTestCase {
RocketComponent noseCone1 = stage1.getChild(0);
RocketComponent bodyTube1 = stage1.getChild(1);
RocketComponent transition1 = stage1.getChild(2);
assertEquals(NoseCone.class, noseCone1.getClass());
assertEquals(BodyTube.class, bodyTube1.getClass());
assertEquals(Transition.class, transition1.getClass());
assertSame(NoseCone.class, noseCone1.getClass());
assertSame(BodyTube.class, bodyTube1.getClass());
assertSame(Transition.class, transition1.getClass());
assertEquals("Nose cone 1", noseCone1.getName());
assertEquals("Body tube 1", bodyTube1.getName());
assertEquals("Transition 1", transition1.getName());
assertEquals(1, noseCone1.getChildCount());
RocketComponent component = noseCone1.getChild(0);
assertEquals(MassComponent.class, component.getClass());
assertSame(MassComponent.class, component.getClass());
assertEquals("Mass object 1", component.getName());
assertEquals(2, bodyTube1.getChildCount());
RocketComponent pod2 = bodyTube1.getChild(0);
assertEquals(ParallelStage.class, pod2.getClass());
assertSame(ParallelStage.class, pod2.getClass());
assertEquals("Pod 2", pod2.getName());
component = bodyTube1.getChild(1);
assertEquals(Bulkhead.class, component.getClass());
assertSame(Bulkhead.class, component.getClass());
assertEquals("Bulkhead 1", component.getName());
assertEquals(3, pod2.getChildCount());
RocketComponent noseCone2 = pod2.getChild(0);
assertEquals(NoseCone.class, noseCone2.getClass());
assertSame(NoseCone.class, noseCone2.getClass());
assertEquals("Nose cone 2", noseCone2.getName());
RocketComponent bodyTube2 = pod2.getChild(1);
assertEquals(BodyTube.class, bodyTube2.getClass());
assertSame(BodyTube.class, bodyTube2.getClass());
assertEquals("Body tube 2", bodyTube2.getName());
component = pod2.getChild(2);
assertEquals(Transition.class, component.getClass());
assertSame(Transition.class, component.getClass());
assertEquals("Transition 2", component.getName());
assertEquals(1, noseCone2.getChildCount());
component = noseCone2.getChild(0);
assertEquals(MassComponent.class, component.getClass());
assertSame(MassComponent.class, component.getClass());
assertEquals("Mass object 2", component.getName());
assertEquals(3, bodyTube2.getChildCount());
component = bodyTube2.getChild(0);
assertEquals(TrapezoidFinSet.class, component.getClass());
assertSame(TrapezoidFinSet.class, component.getClass());
assertEquals("Fin set 2", component.getName());
RocketComponent pod3 = bodyTube2.getChild(1);
assertEquals(ParallelStage.class, pod3.getClass());
assertSame(ParallelStage.class, pod3.getClass());
assertEquals("Pod 3", pod3.getName());
component = bodyTube2.getChild(2);
assertEquals(LaunchLug.class, component.getClass());
assertSame(LaunchLug.class, component.getClass());
assertEquals("Launch lug 1", component.getName());
assertEquals(1, pod3.getChildCount());
component = pod3.getChild(0);
assertEquals(BodyTube.class, component.getClass());
assertSame(BodyTube.class, component.getClass());
assertEquals("Body tube 3", component.getName());
assertEquals(0.04, pod3.getAxialOffset(), MathUtil.EPSILON);
assertEquals(1.76043, pod3.getAngleOffset(), 0.0001);
@ -493,7 +493,7 @@ public class RockSimLoaderTest extends BaseTestCase {
assertEquals(1, transition1.getChildCount());
component = transition1.getChild(0);
assertEquals(MassComponent.class, component.getClass());
assertSame(MassComponent.class, component.getClass());
assertEquals("Mass object 3", component.getName());
}

22
core/src/test/java/info/openrocket/core/rocketcomponent/FlightConfigurationTest.java
View File

@ -379,7 +379,7 @@ public class FlightConfigurationTest extends BaseTestCase {
{ // Core Stage
final List<InstanceContext> coreStageContextList = instances.getInstanceContexts(coreStage);
final InstanceContext coreStageContext = coreStageContextList.get(0);
assertEquals(coreStageContext.component.getClass(), AxialStage.class);
assertSame(coreStageContext.component.getClass(), AxialStage.class);
assertEquals(coreStageContext.component.getID(), rocket.getChild(1).getID());
assertEquals(coreStageContext.component.getInstanceCount(), 1);
@ -396,7 +396,7 @@ public class FlightConfigurationTest extends BaseTestCase {
final ParallelStage boosterStage = (ParallelStage) coreStage.getChild(0).getChild(0);
final List<InstanceContext> boosterStageContextList = instances.getInstanceContexts(boosterStage);
final InstanceContext boosterStage0Context = boosterStageContextList.get(0);
assertEquals(boosterStage0Context.component.getClass(), ParallelStage.class);
assertSame(boosterStage0Context.component.getClass(), ParallelStage.class);
assertEquals(boosterStage0Context.component.getID(), boosterStage.getID());
assertEquals(boosterStage0Context.instanceNumber, 0);
{
@ -407,7 +407,7 @@ public class FlightConfigurationTest extends BaseTestCase {
}
final InstanceContext boosterStage1Context = boosterStageContextList.get(1);
assertEquals(boosterStage1Context.component.getClass(), ParallelStage.class);
assertSame(boosterStage1Context.component.getClass(), ParallelStage.class);
assertEquals(boosterStage1Context.component.getID(), boosterStage.getID());
assertEquals(boosterStage1Context.instanceNumber, 1);
{
@ -427,7 +427,7 @@ public class FlightConfigurationTest extends BaseTestCase {
// this is the instance number per-parent
assertEquals(boosterBodyContext.instanceNumber, 0);
assertEquals(boosterBodyContext.component.getClass(), BodyTube.class);
assertSame(boosterBodyContext.component.getClass(), BodyTube.class);
final Coordinate bodyTubeLocation = boosterBodyContext.getLocation();
assertEquals(bodyTubeLocation.x, 0.564, EPSILON);
@ -440,7 +440,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(8, mmtContextList.size());
final InstanceContext motorTubeContext0 = mmtContextList.get(4);
assertEquals(motorTubeContext0.component.getClass(), InnerTube.class);
assertSame(motorTubeContext0.component.getClass(), InnerTube.class);
assertEquals(motorTubeContext0.instanceNumber, 0);
final Coordinate motorTube0Location = motorTubeContext0.getLocation();
assertEquals(motorTube0Location.x, 1.214, EPSILON);
@ -448,7 +448,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(motorTube0Location.z, -0.015, EPSILON);
final InstanceContext motorTubeContext1 = mmtContextList.get(5);
assertEquals(motorTubeContext1.component.getClass(), InnerTube.class);
assertSame(motorTubeContext1.component.getClass(), InnerTube.class);
assertEquals(motorTubeContext1.instanceNumber, 1);
final Coordinate motorTube1Location = motorTubeContext1.getLocation();
assertEquals(motorTube1Location.x, 1.214, EPSILON);
@ -456,7 +456,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(motorTube1Location.z, -0.015, EPSILON);
final InstanceContext motorTubeContext2 = mmtContextList.get(6);
assertEquals(motorTubeContext2.component.getClass(), InnerTube.class);
assertSame(motorTubeContext2.component.getClass(), InnerTube.class);
assertEquals(motorTubeContext2.instanceNumber, 2);
final Coordinate motorTube2Location = motorTubeContext2.getLocation();
assertEquals(motorTube2Location.x, 1.214, EPSILON);
@ -464,7 +464,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(motorTube2Location.z, 0.015, EPSILON);
final InstanceContext motorTubeContext3 = mmtContextList.get(7);
assertEquals(motorTubeContext3.component.getClass(), InnerTube.class);
assertSame(motorTubeContext3.component.getClass(), InnerTube.class);
assertEquals(motorTubeContext3.instanceNumber, 3);
final Coordinate motorTube3Location = motorTubeContext3.getLocation();
assertEquals(motorTube3Location.x, 1.214, EPSILON);
@ -478,7 +478,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(6, finContextList.size());
final InstanceContext boosterFinContext0 = finContextList.get(3);
assertEquals(boosterFinContext0.component.getClass(), TrapezoidFinSet.class);
assertSame(boosterFinContext0.component.getClass(), TrapezoidFinSet.class);
assertEquals(boosterFinContext0.instanceNumber, 0);
final Coordinate boosterFin0Location = boosterFinContext0.getLocation();
assertEquals(1.044, boosterFin0Location.x, EPSILON);
@ -486,7 +486,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(0.0, boosterFin0Location.z, EPSILON);
final InstanceContext boosterFinContext1 = finContextList.get(4);
assertEquals(boosterFinContext1.component.getClass(), TrapezoidFinSet.class);
assertSame(boosterFinContext1.component.getClass(), TrapezoidFinSet.class);
assertEquals(boosterFinContext1.instanceNumber, 1);
final Coordinate boosterFin1Location = boosterFinContext1.getLocation();
assertEquals(1.044, boosterFin1Location.x, EPSILON);
@ -494,7 +494,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(-0.033341978, boosterFin1Location.z, EPSILON);
final InstanceContext boosterFinContext2 = finContextList.get(5);
assertEquals(boosterFinContext2.component.getClass(), TrapezoidFinSet.class);
assertSame(boosterFinContext2.component.getClass(), TrapezoidFinSet.class);
assertEquals(boosterFinContext2.instanceNumber, 2);
final Coordinate boosterFin2Location = boosterFinContext2.getLocation();
assertEquals(1.044, boosterFin2Location.x, EPSILON);