Skip to content

Commit

Permalink
complete merge
Browse files Browse the repository at this point in the history
  • Loading branch information
janni.roebbecke committed Nov 11, 2024
1 parent fdf3a92 commit 8b7ed1e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import pytest

from protzilla.data_analysis.ptm_analysis import filter_peptides_of_protein
from protzilla.data_analysis.ptm_analysis import select_peptides_of_protein


def test_filter_peptides_of_protein(peptides_df):
filtered_peptides_df = filter_peptides_of_protein(peptides_df, ["Protein2"])["peptide_df"]
filtered_peptides_df = select_peptides_of_protein(peptides_df, ["Protein2"])["peptide_df"]

assert len(filtered_peptides_df) == 6
assert filtered_peptides_df["Sequence"].tolist() == [
Expand Down
6 changes: 3 additions & 3 deletions tests/protzilla/data_analysis/test_peptide_analysis.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import pytest

from protzilla.data_analysis.ptm_analysis import filter_peptides_of_protein, ptms_per_sample, \
from protzilla.data_analysis.ptm_analysis import select_peptides_of_protein, ptms_per_sample, \
ptms_per_protein_and_sample


@pytest.mark.parametrize("df_num", [0, 1])
def test_filter_peptides_of_protein(peptides_df, evidence_peptide_df, df_num):
def test_select_peptides_of_protein(peptides_df, evidence_peptide_df, df_num):
peptide_df = [peptides_df, evidence_peptide_df][df_num]

filtered_peptides_df = filter_peptides_of_protein(peptide_df, ["Protein2"])["peptide_df"]
filtered_peptides_df = select_peptides_of_protein(peptide_df, ["Protein2"])["peptide_df"]

assert len(filtered_peptides_df) == 6
assert filtered_peptides_df["Sequence"].tolist() == [
Expand Down

0 comments on commit 8b7ed1e

Please sign in to comment.