diff --git a/test/edu/nps/moves/dis7/AllPduRoundTripTest.java b/test/edu/nps/moves/dis7/test/AllPduRoundTripTest.java similarity index 99% rename from test/edu/nps/moves/dis7/AllPduRoundTripTest.java rename to test/edu/nps/moves/dis7/test/AllPduRoundTripTest.java index f28f9b93414763ceedae683ad06617b4abe0b353..1b624035375783a99903fb12af5ac6b2a4ce2fdb 100644 --- a/test/edu/nps/moves/dis7/AllPduRoundTripTest.java +++ b/test/edu/nps/moves/dis7/test/AllPduRoundTripTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; /** * This is a test class (which can also be run through its main() method) which tests round-tripping of pdus, i.e., diff --git a/test/edu/nps/moves/dis7/BitFieldRoundTripTest.java b/test/edu/nps/moves/dis7/test/BitFieldRoundTripTest.java similarity index 99% rename from test/edu/nps/moves/dis7/BitFieldRoundTripTest.java rename to test/edu/nps/moves/dis7/test/BitFieldRoundTripTest.java index 9555eede8524544b393069941ff5383e5037b4c1..d7dd79acb573f5ae5ab343cbde415c48c88d00c5 100644 --- a/test/edu/nps/moves/dis7/BitFieldRoundTripTest.java +++ b/test/edu/nps/moves/dis7/test/BitFieldRoundTripTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.enumerations.AppearanceCamouflageType; import edu.nps.moves.dis7.enumerations.ForceID; diff --git a/test/edu/nps/moves/dis7/CommentPdusTest.java b/test/edu/nps/moves/dis7/test/CommentPdusTest.java similarity index 99% rename from test/edu/nps/moves/dis7/CommentPdusTest.java rename to test/edu/nps/moves/dis7/test/CommentPdusTest.java index a60cab955bba22dd71cf590fb1e567e15797e220..d464684e9c63c943653473b1829cdf420fb3299a 100644 --- a/test/edu/nps/moves/dis7/CommentPdusTest.java +++ b/test/edu/nps/moves/dis7/test/CommentPdusTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.enumerations.VariableRecordType; import edu.nps.moves.dis7.pdus.Pdu; diff --git a/test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java b/test/edu/nps/moves/dis7/test/CreateAllObjectTypesTest.java similarity index 99% rename from test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java rename to test/edu/nps/moves/dis7/test/CreateAllObjectTypesTest.java index f1250be81eb2d2259e1003e015f858065e6f5337..4e508e526ed6a7edb73b076f95635172f94a3765 100644 --- a/test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java +++ b/test/edu/nps/moves/dis7/test/CreateAllObjectTypesTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.pdus.ObjectType; import org.junit.jupiter.api.*; diff --git a/test/edu/nps/moves/dis7/CreateAllPduTypesTest.java b/test/edu/nps/moves/dis7/test/CreateAllPduTypesTest.java similarity index 99% rename from test/edu/nps/moves/dis7/CreateAllPduTypesTest.java rename to test/edu/nps/moves/dis7/test/CreateAllPduTypesTest.java index ace27058296521d1d3b9d00d9635e05ad4a1450f..4141da8e8be491c81d1b107173faddf0e3cb032a 100644 --- a/test/edu/nps/moves/dis7/CreateAllPduTypesTest.java +++ b/test/edu/nps/moves/dis7/test/CreateAllPduTypesTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.pdus.AcknowledgePdu; import edu.nps.moves.dis7.pdus.AcknowledgeReliablePdu; diff --git a/test/edu/nps/moves/dis7/DataQueryPduRoundTripTest.java b/test/edu/nps/moves/dis7/test/DataQueryPduRoundTripTest.java similarity index 99% rename from test/edu/nps/moves/dis7/DataQueryPduRoundTripTest.java rename to test/edu/nps/moves/dis7/test/DataQueryPduRoundTripTest.java index eaec4deaf228297d70c9fc278c1a35b5333914f1..44970d6e9944ddeffbee63f4b9918d4035e2e4ea 100644 --- a/test/edu/nps/moves/dis7/DataQueryPduRoundTripTest.java +++ b/test/edu/nps/moves/dis7/test/DataQueryPduRoundTripTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.enumerations.VariableRecordType; import edu.nps.moves.dis7.pdus.DataQueryPdu; diff --git a/test/edu/nps/moves/dis7/DetonationPduTest.java b/test/edu/nps/moves/dis7/test/DetonationPduTest.java similarity index 99% rename from test/edu/nps/moves/dis7/DetonationPduTest.java rename to test/edu/nps/moves/dis7/test/DetonationPduTest.java index 0e0a8207ece2802908fcfa777649e8480c6d3da9..4f779c338150e1400397ce353abf6440023d3aca 100644 --- a/test/edu/nps/moves/dis7/DetonationPduTest.java +++ b/test/edu/nps/moves/dis7/test/DetonationPduTest.java @@ -31,7 +31,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.pdus.DetonationPdu; import edu.nps.moves.dis7.pdus.Pdu; diff --git a/test/edu/nps/moves/dis7/EntityStatePduTest.java b/test/edu/nps/moves/dis7/test/EntityStatePduTest.java similarity index 99% rename from test/edu/nps/moves/dis7/EntityStatePduTest.java rename to test/edu/nps/moves/dis7/test/EntityStatePduTest.java index 49e6b0cd8624d639de7ee92a960fd5d7505a0801..dfa61f78c4c9270e15e6962fd289976d3cf13571 100644 --- a/test/edu/nps/moves/dis7/EntityStatePduTest.java +++ b/test/edu/nps/moves/dis7/test/EntityStatePduTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.enumerations.Country; import edu.nps.moves.dis7.enumerations.EntityKind; diff --git a/test/edu/nps/moves/dis7/FirePduTest.java b/test/edu/nps/moves/dis7/test/FirePduTest.java similarity index 99% rename from test/edu/nps/moves/dis7/FirePduTest.java rename to test/edu/nps/moves/dis7/test/FirePduTest.java index 2092356c6fe49b3d4dd1818946e495131998ea1d..7899ca06eaf28bfc27355ee230e8d727a3a926ca 100644 --- a/test/edu/nps/moves/dis7/FirePduTest.java +++ b/test/edu/nps/moves/dis7/test/FirePduTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.utilities.PduFactory; import edu.nps.moves.dis7.pdus.FirePdu; diff --git a/test/edu/nps/moves/dis7/FixedAndVariableDatumRoundTripTest.java b/test/edu/nps/moves/dis7/test/FixedAndVariableDatumRoundTripTest.java similarity index 99% rename from test/edu/nps/moves/dis7/FixedAndVariableDatumRoundTripTest.java rename to test/edu/nps/moves/dis7/test/FixedAndVariableDatumRoundTripTest.java index 4f99a9be8b1145132e6ce5665bc603c063e4b894..e3cfd3afc050efc1687664066849e2597c9525c3 100644 --- a/test/edu/nps/moves/dis7/FixedAndVariableDatumRoundTripTest.java +++ b/test/edu/nps/moves/dis7/test/FixedAndVariableDatumRoundTripTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.enumerations.VariableRecordType; import edu.nps.moves.dis7.pdus.ActionResponsePdu; diff --git a/test/edu/nps/moves/dis7/MarshalEnumsTest.java b/test/edu/nps/moves/dis7/test/MarshalEnumsTest.java similarity index 99% rename from test/edu/nps/moves/dis7/MarshalEnumsTest.java rename to test/edu/nps/moves/dis7/test/MarshalEnumsTest.java index 49a072a9a2dbd0f2920cfd1d22a7ab6b198c1405..676f61aa2c440b1cf76bd4c8d505008932842eba 100644 --- a/test/edu/nps/moves/dis7/MarshalEnumsTest.java +++ b/test/edu/nps/moves/dis7/test/MarshalEnumsTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.enumerations.*; import edu.nps.moves.dis7.pdus.DisBitSet; diff --git a/test/edu/nps/moves/dis7/NullFieldsEntityMarshallTest.java b/test/edu/nps/moves/dis7/test/NullFieldsEntityMarshallTest.java similarity index 99% rename from test/edu/nps/moves/dis7/NullFieldsEntityMarshallTest.java rename to test/edu/nps/moves/dis7/test/NullFieldsEntityMarshallTest.java index 2554fc076dab8ba10e81d70284f619d25d301212..9f1c92c0250b13e2f73e5a9e8cf3999a4d4b6c38 100644 --- a/test/edu/nps/moves/dis7/NullFieldsEntityMarshallTest.java +++ b/test/edu/nps/moves/dis7/test/NullFieldsEntityMarshallTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.entities.usa.platform.land.LAV105; import edu.nps.moves.dis7.pdus.EntityType; diff --git a/test/edu/nps/moves/dis7/ObjectTypeMarshallTest.java b/test/edu/nps/moves/dis7/test/ObjectTypeMarshallTest.java similarity index 98% rename from test/edu/nps/moves/dis7/ObjectTypeMarshallTest.java rename to test/edu/nps/moves/dis7/test/ObjectTypeMarshallTest.java index 18c14e556996f8f42b2b29a85d402111d3ccf16d..50b1c7b5a47b320a3614ee22010a0ee955522ba8 100644 --- a/test/edu/nps/moves/dis7/ObjectTypeMarshallTest.java +++ b/test/edu/nps/moves/dis7/test/ObjectTypeMarshallTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.objectTypes.LinearObject.Culturalfeature.TracksTire.TracksTire; import edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.ConcertinaWire._2Roll; diff --git a/test/edu/nps/moves/dis7/PduFactoryTest.java b/test/edu/nps/moves/dis7/test/PduFactoryTest.java similarity index 99% rename from test/edu/nps/moves/dis7/PduFactoryTest.java rename to test/edu/nps/moves/dis7/test/PduFactoryTest.java index ae1fb6493bf0ebe50f4720bf82f5ff9f11a57b85..25bde1cbce919bd774fcb602f3a8df722f8212d9 100644 --- a/test/edu/nps/moves/dis7/PduFactoryTest.java +++ b/test/edu/nps/moves/dis7/test/PduFactoryTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.enumerations.Country; import edu.nps.moves.dis7.utilities.PduFactory; diff --git a/test/edu/nps/moves/dis7/PduTest.java b/test/edu/nps/moves/dis7/test/PduTest.java similarity index 99% rename from test/edu/nps/moves/dis7/PduTest.java rename to test/edu/nps/moves/dis7/test/PduTest.java index ff6a16e5b055edd576871c90acf39825f7d23ac1..7ec0ddc4e6db68bd8745d4a41cefaa8e493fb45e 100644 --- a/test/edu/nps/moves/dis7/PduTest.java +++ b/test/edu/nps/moves/dis7/test/PduTest.java @@ -31,7 +31,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.pdus.Pdu; import edu.nps.moves.dis7.pdus.PduBase; diff --git a/test/edu/nps/moves/dis7/SignalPdusTest.java b/test/edu/nps/moves/dis7/test/SignalPdusTest.java similarity index 99% rename from test/edu/nps/moves/dis7/SignalPdusTest.java rename to test/edu/nps/moves/dis7/test/SignalPdusTest.java index adf06dbbadbe0b06e9864ca19f99da0823c34386..ca080e500be4856e9273d62f0f5df42e104259be 100644 --- a/test/edu/nps/moves/dis7/SignalPdusTest.java +++ b/test/edu/nps/moves/dis7/test/SignalPdusTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.pdus.IntercomSignalPdu; import edu.nps.moves.dis7.pdus.Pdu; diff --git a/test/edu/nps/moves/dis7/X3dInterpolatorsTest.java b/test/edu/nps/moves/dis7/test/X3dInterpolatorsTest.java similarity index 98% rename from test/edu/nps/moves/dis7/X3dInterpolatorsTest.java rename to test/edu/nps/moves/dis7/test/X3dInterpolatorsTest.java index 0ae573f648c640f363ccd78ad2bcf9c9a520b04c..4bc745edfd9565f1e6b059127e7ab5bfe6d401f8 100644 --- a/test/edu/nps/moves/dis7/X3dInterpolatorsTest.java +++ b/test/edu/nps/moves/dis7/test/X3dInterpolatorsTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved. * This work is provided under a BSD open-source license, see project license.html and license.txt */ -package edu.nps.moves.dis7; +package edu.nps.moves.dis7.test; import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface; import edu.nps.moves.dis7.utilities.PduFactory; diff --git a/test/edu/nps/moves/dis7/test/package-info.java b/test/edu/nps/moves/dis7/test/package-info.java new file mode 100644 index 0000000000000000000000000000000000000000..a68c7dee3446909d0287283ca813ed5e55af1ee7 --- /dev/null +++ b/test/edu/nps/moves/dis7/test/package-info.java @@ -0,0 +1,40 @@ +/* +Copyright (c) 1995-2021 held by the author(s). All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + * Neither the names of the Naval Postgraduate School (NPS) + Modeling Virtual Environments and Simulation (MOVES) Institute + https://www.nps.edu and https://www.nps.edu/web/moves + nor the names of its contributors may be used to endorse or + promote products derived from this software without specific + prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +*/ + +/** + * This package includes a variety of PDU unit tests to confirm code correctness. + * The test tree is maintained separately from other source in order to support special annotations and assertions. + */ + +package edu.nps.moves.dis7.test;