tests: Exported has_label checking to XrdPattern

Author: Somerandomguy10111

tests/t_crystal/t_properties.py

@@ -56,4 +56,4 @@ def test_standardize(self):
 
 
 if __name__ == "__main__":
-    TestCifParsing.execute_all()2
+    TestCifParsing.execute_all()

tests/t_labels.py

@@ -6,25 +6,6 @@
 from xrdpattern.xrd.experiment import ExperimentTensor, LabelType
 from xrdpattern.crystal.examples import CrystalExamples
 
-class TestPowderExperiment(Unittest):
-    def setUp(self):
-        cif_content = CrystalExamples.get_cif_content(num=1)
-        self.empty_experiment : PowderExperiment = PowderExperiment.make_empty()
-        self.full_experiment : PowderExperiment = PowderExperiment.from_cif(cif_content=cif_content)
-        self.full_experiment.phases[0].calculate_properties()
-
-    def test_is_empty(self):
-        empty_experiment = PowderExperiment.make_empty()
-        self.assertTrue(not empty_experiment.is_labeled)
-        self.assertTrue(self.full_experiment.is_labeled)
-
-    def test_has_label(self):
-        self.assertTrue(not self.empty_experiment.has_label(label_type=LabelType.lattice))
-
-        self.assertTrue(self.full_experiment.has_label(label_type=LabelType.lattice))
-        self.assertTrue(self.full_experiment.has_label(label_type=LabelType.basis))
-        self.assertTrue(self.full_experiment.has_label(label_type=LabelType.spg))
-
 
 class TestTensorization(Unittest):
     def setUp(self):

tests/t_pattern/t_pattern.py

@@ -8,24 +8,27 @@
 from xrdpattern.parsing import Formats
 from xrdpattern.parsing.examples import DataExamples
 from xrdpattern.pattern import XrdPattern
-from xrdpattern.xrd import PowderExperiment
+from xrdpattern.xrd import PowderExperiment, LabelType
 
 
 # ---------------------------------------------------------
 
 class TestXrdPattern(ParserBaseTest):
+    def setUp(self):
+        self.unlabeled_pattern = XrdPattern.load(fpath=DataExamples.get_bruker_fpath())
+        self.labeled_pattern = XrdPattern.load(fpath=DataExamples.get_bruker_fpath())
+        self.labeled_pattern.powder_experiment = PowderExperiment.from_cif(cif_content=CrystalExamples.get_cif_content())
+
     def test_save_load_roundtrip(self):
-        unlabeled_pattern = XrdPattern.load(fpath=DataExamples.get_bruker_fpath())
-        labeled_pattern = XrdPattern.load(fpath=DataExamples.get_bruker_fpath())
-        labeled_pattern.powder_experiment = PowderExperiment.from_cif(cif_content=CrystalExamples.get_cif_content())
 
-        reloaded_unlabeled = self.save_and_load(unlabeled_pattern)
-        reloaded_labeled = self.save_and_load(labeled_pattern)
 
-        self.assertEqual(unlabeled_pattern, reloaded_unlabeled)
-        self.assertEqual(labeled_pattern, reloaded_labeled)
-        print(f'labeled after roundtrip \n:{labeled_pattern.get_info_as_str()[:500]} + '
-              f'{labeled_pattern.get_info_as_str()[-500:]}')
+        reloaded_unlabeled = self.save_and_load(self.unlabeled_pattern)
+        reloaded_labeled = self.save_and_load(self.labeled_pattern)
+
+        self.assertEqual(self.unlabeled_pattern, reloaded_unlabeled)
+        self.assertEqual(self.labeled_pattern, reloaded_labeled)
+        print(f'labeled after roundtrip \n:{self.labeled_pattern.get_info_as_str()[:500]} + '
+              f'{self.labeled_pattern.get_info_as_str()[-500:]}')
 
     def test_plot(self):
         if self.is_manual_mode:
@@ -73,6 +76,13 @@ def test_get_pattern_data(self):
         plt.tight_layout()
         plt.show()
 
+    def test_has_label(self):
+        self.assertTrue(not self.unlabeled_pattern.has_label(label_type=LabelType.lattice))
+
+        self.assertTrue(self.labeled_pattern.has_label(label_type=LabelType.lattice))
+        self.assertTrue(self.labeled_pattern.has_label(label_type=LabelType.basis))
+        self.assertTrue(self.labeled_pattern.has_label(label_type=LabelType.spg))
+
     @staticmethod
     def save_and_load(pattern : XrdPattern) -> XrdPattern:
         save_path = os.path.join(tempfile.mkdtemp(), f'pattern.{Formats.aimat_suffix()}')