- """
- object_id = urllib.parse.unquote(item).replace("$CANVAS_OBJECT_REFERENCE$/quizzes/", "/jump_to_id/")
- html = html.replace(item, object_id)
- return html
-
- def process_ims_cc_filebase(item, html):
- """
- Replace $IMS-CC-FILEBASE$ with /static
- """
- new_item = urllib.parse.unquote(item).replace("$IMS-CC-FILEBASE$", "/static")
- # skip query parameters for static files
- new_item = new_item.split("?")[0]
- # & is not valid in an URL. But some file seem to have it when it should be &
- new_item = new_item.replace("&", "&")
- html = html.replace(item, new_item)
- return html
-
- def process_external_tools_link(item, html):
- """
- Replace $CANVAS_OBJECT_REFERENCE$/external_tools/retrieve with appropriate external link
- """
- external_tool_query = urllib.parse.urlparse(item).query
- # unescape query that has been HTML encoded so it can be parsed correctly
- unescaped_external_tool_query = HTMLParser.unescape(external_tool_query)
- external_tool_url = urllib.parse.parse_qs(unescaped_external_tool_query).get("url", [""])[0]
- html = html.replace(item, external_tool_url)
- return html
-
- def process_relative_external_links(item, html):
- """
- Turn static file URLs outside OLX_STATIC_DIR into absolute URLs.
-
- Allow to avoid a situation when the original course page links have
- relative URLs, such URLs weren't included into the exported Common
- Cartridge course file that causes broken URLs in the imported OeX
- course. The function adds the origin source to URLs to make them
- absolute ones.
- """
- if self.relative_links_source is None or item in self.cartridge.olx_to_original_static_file_paths.all:
- return html
-
- url = urllib.parse.urljoin(self.relative_links_source, item)
- html = html.replace(item, url)
- return html
-
- for _, item in items:
- if "IMS-CC-FILEBASE" in item:
- html = process_ims_cc_filebase(item, html)
- elif "WIKI_REFERENCE" in item:
- html = process_wiki_reference(item, html)
- elif "external_tools" in item:
- html = process_external_tools_link(item, html)
- elif "CANVAS_OBJECT_REFERENCE" in item:
- html = process_canvas_reference(item, html)
- else:
- html = process_relative_external_links(item, html)
-
- return html
-
- def _process_static_links_from_details(self, details):
- """
- Take a variable and recursively find & escape all static links within strings
+ If the OLX nodes can't be gotten from Common Cartridge resource,
+ fallback nodes are returned. Otherwise, OLX nodes provided by the
+ first content processor that can handle the resource is returned.
Args:
- self: self
- details: A dictionary or list of dictionaries containing node data.
-
- Returns:
- details: Returns detail data with static link
- escaped to an OLX-friendly format.
- """
-
- if isinstance(details, str):
- return self._process_static_links(details)
-
- if isinstance(details, list):
- for index, value in enumerate(details):
- details[index] = self._process_static_links_from_details(value)
- elif isinstance(details, dict):
- for key, value in details.items():
- details[key] = self._process_static_links_from_details(value)
-
- return details
-
- def _create_olx_nodes(self, content_type, details):
- """
- This helps to create OLX node of different type. For eg HTML, VIDEO, QTI, LTI,
- Discussion.
-
- Args:
- content_type ([str]): The type of node that has to be created.
- details (Dict[str, str]): Dictionary of the element and content of the element.
-
- Raises:
- OlxExportException: Exception when nodes are not able to be created.
+ element_data (dict): a normalized CC element data.
Returns:
[List]: List of OLX nodes that needs to be written.
"""
+ idref = element_data.get("identifierref")
+ if not idref:
+ return self._fallback_olx_nodes
- nodes = []
- details = self._process_static_links_from_details(details)
-
- if content_type == self.HTML:
- nodes += self._process_html(details)
-
- elif content_type == self.VIDEO:
- nodes += self._create_video_node(details)
-
- elif content_type == self.LTI:
- # There is an LTI resource
- # Add lti_consumer in policy with lti_passports
- self.lti_consumer_present = True
- self.lti_consumer_ids.add(details["lti_id"])
- nodes.append(self._create_lti_node(details))
-
- elif content_type == self.QTI:
- qti_export = QtiExport(self.doc)
- nodes += qti_export.create_qti_node(details)
-
- elif content_type == self.DISCUSSION:
- nodes += self._create_discussion_node(details)
-
- else:
- raise OlxExportException(f'Content type "{content_type}" is not supported.')
-
- return nodes
-
- def _create_video_node(self, details):
- """
- This function creates Video OLX nodes.
-
- Args:
- details (Dict[str, str]): Dictionary that has Video tag value.
-
- Returns:
- [OLX Element]: Video OLX element.
- """
- xml_element = element_builder(self.doc)
- attributes = {"youtube": "1.00:" + details["youtube"], "youtube_id_1_0": details["youtube"]}
- child = xml_element("video", children=None, attributes=attributes)
- return [child]
+ resource = self.cartridge.define_resource(idref)
+ if resource is None:
+ logger.warning("Missing resource: %s", idref)
+ return self._fallback_olx_nodes
- def _process_html(self, details):
- """
- This function helps to process the html and gives out
- corresponding HTML or Video OLX nodes.
+ for content_processor in self._content_processors:
+ if olx_nodes := content_processor.process(resource, idref):
+ for olx_node in olx_nodes:
+ self._post_process(olx_node)
+ return olx_nodes
- Args:
- details (Dict[str, str]): Dictionary that has HTML tag value.
+ logger.warning('The resource with "%s" identifier value is not supported.', idref)
+ return self._fallback_olx_nodes
- Returns:
- List[OLX Element]: List of html/Video OLX element.
+ @cached_property
+ def _fallback_olx_nodes(self) -> List["xml.dom.minidom.Element"]:
"""
- video_olx = []
- nodes = []
- child = self.doc.createElement("html")
- html = self._process_static_links(details["html"])
- if self.link_file:
- html, video_olx = self._process_html_for_iframe(html)
- html = clean_from_cdata(html)
- txt = self.doc.createCDATASection(html)
- child.appendChild(txt)
- nodes.append(child)
- for olx in video_olx:
- nodes.append(olx)
- return nodes
-
- def _process_html_for_iframe(self, html_str):
+ Provide fallback OLX nodes.
"""
- This function helps to parse the iframe with
- embedded video, to be converted into video xblock.
-
- Args:
- html_str ([str]): Html file content.
-
- Returns:
- html_str [str]: The html content of the file, if iframe is present
- and converted into xblock then iframe is removed
- from the HTML.
- video_olx [List[xml]]: List of xml children, i.e video xblock.
- """
- video_olx = []
- parsed_html = html.fromstring(html_str)
- iframes = parsed_html.xpath("//iframe")
- if not iframes:
- return html_str, video_olx
- video_olx, converted_iframes = self.iframe_link_parser.get_video_olx(self.doc, iframes)
- if video_olx:
- # If video xblock is present then we modify the HTML to remove the iframe
- # hence we need to convert the modified HTML back to string. We also remove
- # the parent if there are no other children.
- for iframe in converted_iframes:
- parent = iframe.getparent()
- parent.remove(iframe)
- if not parent.getchildren():
- parent.getparent().remove(parent)
- return html.tostring(parsed_html).decode("utf-8"), video_olx
- return html_str, video_olx
-
- def _create_lti_node(self, details):
- node = self.doc.createElement("lti_consumer")
- custom_parameters = "[{params}]".format(
- params=", ".join(
- [
- '"{key}={value}"'.format(
- key=key,
- value=value,
- )
- for key, value in details["custom_parameters"].items()
- ]
- ),
- )
- node.setAttribute("custom_parameters", custom_parameters)
- node.setAttribute("description", details["description"])
- node.setAttribute("display_name", details["title"])
- node.setAttribute("inline_height", details["height"])
- node.setAttribute("inline_width", details["width"])
- node.setAttribute("launch_url", details["launch_url"])
- node.setAttribute("modal_height", details["height"])
- node.setAttribute("modal_width", details["width"])
- node.setAttribute("xblock-family", "xblock.v1")
- node.setAttribute("lti_id", details["lti_id"])
- return node
-
- def _create_discussion_node(self, details):
- node = self.doc.createElement("discussion")
- node.setAttribute("display_name", "")
- node.setAttribute("discussion_category", details["title"])
- node.setAttribute("discussion_target", details["title"])
+ txt = self.doc.createCDATASection(FALLBACK_OLX_CONTENT)
html_node = self.doc.createElement("html")
- txt = "MISSING CONTENT" if details["text"] is None else details["text"]
- txt = clean_from_cdata(txt)
- txt = self.doc.createCDATASection(txt)
html_node.appendChild(txt)
- return [html_node, node]
-
-
-def process_link(details):
- """
- Possibly convert a link to a video.
- """
-
- # YouTube links can be like this: https://www.youtube.com/watch?v=gQ-cZRmHfs4&list=PL5B350D511278A56B
- ytmatch = re.search(r"youtube.com/watch\?v=([-\w]+)", details["href"])
- if ytmatch:
- return "video", {"youtube": ytmatch.group(1)}
- details = {
- "html": "{}".format(details["href"], details.get("text", "")),
- }
+ return [html_node]
- return "html", details
+ def _post_process(self, olx_node: "xml.dom.minidom.Element") -> None:
+ """
+ Perform additional processing of the generated OLX node.
+ """
+ for post_processor in self._content_post_processors:
+ post_processor.process(olx_node)
diff --git a/src/cc2olx/parser.py b/src/cc2olx/parser.py
new file mode 100644
index 00000000..72834748
--- /dev/null
+++ b/src/cc2olx/parser.py
@@ -0,0 +1,46 @@
+from pathlib import Path
+
+COMMON_CARTRIDGE_FILE_EXTENSION = ".imscc"
+
+
+def _is_cartridge_file(path):
+ return path.is_file() and path.suffix == COMMON_CARTRIDGE_FILE_EXTENSION
+
+
+def _get_files(parsed_args):
+ """
+ Collects all Common Cartridge files from list of files and directories.
+ """
+
+ files = set()
+
+ for path in parsed_args.inputs:
+ if not path.exists():
+ raise FileNotFoundError
+
+ if _is_cartridge_file(path):
+ files.add(path)
+
+ if path.is_dir():
+ for input_file in path.iterdir():
+ if _is_cartridge_file(input_file):
+ files.add(input_file)
+
+ return files
+
+
+def parse_options(args):
+ """
+ Parses script options from argparse arguments.
+ """
+ input_files = _get_files(args)
+
+ return {
+ "input_files": input_files,
+ "output_format": args.result,
+ "log_level": args.loglevel,
+ "workspace": Path.cwd() / args.output,
+ "link_file": args.link_file,
+ "passport_file": args.passport_file,
+ "relative_links_source": args.relative_links_source,
+ }
diff --git a/src/cc2olx/qti.py b/src/cc2olx/qti.py
deleted file mode 100644
index 444ab7ab..00000000
--- a/src/cc2olx/qti.py
+++ /dev/null
@@ -1,624 +0,0 @@
-import logging
-import re
-import urllib.parse
-import xml.dom.minidom
-from collections import OrderedDict
-from html import unescape
-
-from lxml import etree, html
-
-from cc2olx import filesystem
-
-from .utils import element_builder
-
-logger = logging.getLogger()
-
-# problem types
-MULTIPLE_CHOICE = "cc.multiple_choice.v0p1"
-MULTIPLE_RESPONSE = "cc.multiple_response.v0p1"
-FILL_IN_THE_BLANK = "cc.fib.v0p1"
-ESSAY = "cc.essay.v0p1"
-BOOLEAN = "cc.true_false.v0p1"
-PATTERN_MATCH = "cc.pattern_match.v0p1"
-RESPROCESSING_TYPES = ["general_fb", "correct_fb", "general_incorrect_fb"]
-
-
-class QtiError(Exception):
- """
- Exception type for Qti parsing/conversion errors.
- """
-
-
-class QtiExport:
- """
- Contains methods for processing and conversion
- IMS Question & Test Interoperability (QTI) <= v1.2 into OLX markup
- """
-
- FIB_PROBLEM_TEXTLINE_SIZE_BUFFER = 10
-
- def __init__(self, root_xml_doc):
- self.doc = root_xml_doc
-
- def create_qti_node(self, details):
- """
- Creates OLX xml node, that represents content of unit with problems.
-
- Args:
- details: list of dictionaries, where each contains data to
- render problem.
- """
-
- problems = []
-
- for problem_data in details:
- cc_profile = problem_data["cc_profile"]
- create_problem = self._problem_creators_map.get(cc_profile)
-
- if create_problem is None:
- raise QtiError('Unknown cc_profile: "{}"'.format(problem_data["cc_profile"]))
-
- problem = create_problem(problem_data)
-
- # sometimes we might want to have additional items from one cc item
- if isinstance(problem, list) or isinstance(problem, tuple):
- problems += problem
- else:
- problems.append(problem)
-
- return problems
-
- @property
- def _problem_creators_map(self):
- """
- Returns: mapping between Common Cartridge profile value and function
- that creates actual problem node.
-
- Note: Since True/False problems in OLX are constructed identically to
- OLX Multiple Choice problems, we reuse `_create_multiple_choice_problem`
- for BOOLEAN type problems
- """
- return {
- MULTIPLE_CHOICE: self._create_multiple_choice_problem,
- MULTIPLE_RESPONSE: self._create_multiple_response_problem,
- FILL_IN_THE_BLANK: self._create_fib_problem,
- ESSAY: self._create_essay_problem,
- BOOLEAN: self._create_multiple_choice_problem,
- PATTERN_MATCH: self._create_pattern_match_problem,
- }
-
- def _create_problem_description(self, description_html_str):
- """
- Material texts can come in form of escaped HTML markup, which
- can't be considered as valid XML. ``xml.dom.minidom`` has no
- features to convert HTML to XML, so we use lxml parser here.
-
- Args:
- description_html_str: escaped HTML string
-
- Returns: instance of ``xml.dom.minidom.Node``
- """
- description_html_str = unescape(description_html_str)
-
- description_html_str = urllib.parse.unquote(description_html_str)
-
- element = html.fromstring(description_html_str)
- xml_string = etree.tostring(element)
- description = xml.dom.minidom.parseString(xml_string).firstChild
-
- return description
-
- def _add_choice(self, parent, is_correct, text):
- """
- Appends choices to given ``checkboxgroup`` or ``choicegroup`` parent.
- """
- choice = self.doc.createElement("choice")
- choice.setAttribute("correct", "true" if is_correct else "false")
- self._set_text(choice, text)
- parent.appendChild(choice)
-
- def _set_text(self, node, new_text):
- text_node = self.doc.createTextNode(new_text)
- node.appendChild(text_node)
-
- def _create_multiple_choice_problem(self, problem_data):
- """
- Creates XML node of problem.
- """
-
- problem = self.doc.createElement("problem")
- problem_content = self.doc.createElement("multiplechoiceresponse")
-
- problem_description = self._create_problem_description(problem_data["problem_description"])
-
- choice_group = self.doc.createElement("choicegroup")
- choice_group.setAttribute("type", "MultipleChoice")
-
- for choice_data in problem_data["choices"].values():
- self._add_choice(choice_group, choice_data["correct"], choice_data["text"])
-
- problem_content.appendChild(problem_description)
- problem_content.appendChild(choice_group)
- problem.appendChild(problem_content)
-
- return problem
-
- def _create_multiple_response_problem(self, problem_data):
- """
- Create XML node for multiple response problem. Sets partial_credit to EDC by default.
- """
-
- el = element_builder(self.doc)
-
- problem_description = self._create_problem_description(problem_data["problem_description"])
-
- # fmt: off
- problem = el('problem', [
- el('choiceresponse', [
-
- problem_description,
-
- el('checkboxgroup', [
- el('choice',
- choice['text'],
- {'correct': 'true' if choice['correct'] else 'false'}
- )
- for choice in problem_data['choices'].values()
- ], {'type': 'MultipleChoice'})
-
- ], {'partial_credit': 'EDC'})
- ])
- # fmt: on
- return problem
-
- def _create_fib_problem(self, problem_data):
- """
- Creates XML node of fill in the blank problems
- """
-
- # Track maximum answer length for textline at the bottom
- max_answer_length = 0
-
- problem = self.doc.createElement("problem")
-
- # Set the primary answer on the stringresponse
- # and set the type to case insensitive
- problem_content = self.doc.createElement("stringresponse")
- problem_content.setAttribute("answer", problem_data["answer"])
- problem_content.setAttribute("type", self._build_fib_problem_type(problem_data))
-
- if len(problem_data["answer"]) > max_answer_length:
- max_answer_length = len(problem_data["answer"])
-
- problem_description = self._create_problem_description(problem_data["problem_description"])
- problem_content.appendChild(problem_description)
-
- # For any (optional) additional accepted answers, add an
- # additional_answer element with that answer
- for answer in problem_data.get("additional_answers", []):
- additional_answer = self.doc.createElement("additional_answer")
- additional_answer.setAttribute("answer", answer)
- problem_content.appendChild(additional_answer)
-
- if len(answer) > max_answer_length:
- max_answer_length = len(answer)
-
- # Add a textline element with the max answer length plus a buffer
- textline = self.doc.createElement("textline")
- textline.setAttribute("size", str(max_answer_length + self.FIB_PROBLEM_TEXTLINE_SIZE_BUFFER))
- problem_content.appendChild(textline)
-
- problem.appendChild(problem_content)
-
- return problem
-
- @staticmethod
- def _build_fib_problem_type(problem_data):
- """
- Build `stringresponse` OLX type for a fill in the blank problem.
- """
- problem_types = ["ci"]
-
- if problem_data["is_regexp"]:
- problem_types.append("regexp")
-
- return " ".join(problem_types)
-
- def _create_essay_problem(self, problem_data):
- """
- Given parsed essay problem data, returns a openassessment component. If a sample
- solution provided, returns that as a HTML block before openassessment.
- """
-
- description = problem_data["problem_description"]
-
- el = element_builder(self.doc)
-
- if any(key in RESPROCESSING_TYPES for key in problem_data.keys()):
- resp_samples = [
- el("name", "Feedback"),
- el("label", "Feedback"),
- el("prompt", "Example Feedback"),
- ]
-
- for desc, key in zip(["General", "Correct", "Incorrect"], RESPROCESSING_TYPES):
- resp_samples.append(
- el(
- "option",
- [el("name", desc), el("label", desc), el("explanation", problem_data.get(key, desc))],
- {"points": "0"},
- )
- )
- criterion = el("criterion", resp_samples, {"feedback": "optional"})
- else:
- criterion = el(
- "criterion",
- [
- el("name", "Ideas"),
- el("label", "Ideas"),
- el("prompt", "Example criterion"),
- el(
- "option",
- [el("name", "Poor"), el("label", "Poor"), el("explanation", "Explanation")],
- {"points": "0"},
- ),
- el(
- "option",
- [el("name", "Good"), el("label", "Good"), el("explanation", "Explanation")],
- {"points": "1"},
- ),
- ],
- {"feedback": "optional"},
- )
-
- # fmt: off
- ora = el(
- 'openassessment',
- [
- el('title', 'Open Response Assessment'),
- el('assessments', [
- el(
- 'assessment',
- None,
- attributes={'name': 'staff-assessment', 'required': 'True'}
- )
- ]),
- el('prompts', [
- el('prompt', [
- el('description', description)
- ])
- ]),
- el('rubric', [
- criterion,
- el('feedbackprompt', 'Feedback prompt text'),
- el('feedback_default_text', 'Feedback prompt default text'),
- ])
- ],
- {
- 'url_name': problem_data['ident'],
- 'text_response': 'required',
- 'prompts_type': 'html'
- }
- )
- # fmt: on
-
- # if a sample solution exists add on top of ora, because
- # olx doesn't have a sample solution equivalent.
- if problem_data.get("sample_solution"):
- child = el("html", self.doc.createCDATASection(problem_data["sample_solution"]))
- return child, ora
-
- return ora
-
- def _create_pattern_match_problem(self, problem_data):
- raise NotImplementedError
-
-
-class QtiParser:
- """
- Used to parse Qti xml resource.
- """
-
- # Xml namespaces
- NS = {"qti": "http://www.imsglobal.org/xsd/ims_qtiasiv1p2"}
-
- def __init__(self, resource_filename):
- self.resource_filename = resource_filename
-
- def parse_qti(self):
- """
- Parses resource of ``imsqti_xmlv1p2/imscc_xmlv1p1/assessment`` type.
- """
-
- tree = filesystem.get_xml_tree(self.resource_filename)
- root = tree.getroot()
-
- # qti xml can contain multiple problems represented by
+ {resource_relative_path}
+
+
+
diff --git a/src/cc2olx/templates/image_webcontent.html b/src/cc2olx/templates/image_webcontent.html
new file mode 100644
index 00000000..c55beeb7
--- /dev/null
+++ b/src/cc2olx/templates/image_webcontent.html
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+ 
+
+
+
diff --git a/src/cc2olx/utils.py b/src/cc2olx/utils.py
index 520c66a7..0b502b37 100644
--- a/src/cc2olx/utils.py
+++ b/src/cc2olx/utils.py
@@ -4,8 +4,10 @@
import logging
import re
import string
+import xml.dom.minidom
+from typing import Generator
-from cc2olx.constants import CDATA_PATTERN
+CDATA_PATTERN = r".*?)\]\]>"
logger = logging.getLogger()
@@ -123,3 +125,15 @@ def clean_from_cdata(xml_string: str) -> str:
str: cleaned XML string.
"""
return re.sub(CDATA_PATTERN, r"\g", xml_string, flags=re.DOTALL)
+
+
+def get_xml_minidom_element_iterator(
+ element: xml.dom.minidom.Element,
+) -> Generator[xml.dom.minidom.Element, None, None]:
+ """
+ Provide an iterator over XML minidom Element hierarchy.
+ """
+ yield element
+
+ for child in element.childNodes:
+ yield from get_xml_minidom_element_iterator(child)
diff --git a/src/cc2olx/xml/__init__.py b/src/cc2olx/xml/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/cc2olx/xml/cc_xml.py b/src/cc2olx/xml/cc_xml.py
new file mode 100644
index 00000000..93efad62
--- /dev/null
+++ b/src/cc2olx/xml/cc_xml.py
@@ -0,0 +1,504 @@
+from collections import defaultdict
+from typing import Dict, List, Optional, Type, TypeVar
+
+from lxml import etree
+
+
+QTI_NAMESPACE = "http://www.imsglobal.org/xsd/ims_qtiasiv1p2"
+
+
+class CommonCartridgeElementBase(etree.ElementBase):
+ """
+ Base Common Cartridge XML element.
+ """
+
+ NODE_NAMESPACES: List[str]
+ NODE_NAME: str
+
+
+class CommonCartridgeElementClassLookup(etree.CustomElementClassLookup):
+ """
+ The lookup class for Common Cartridge XML elements.
+ """
+
+ _element_classes = defaultdict(dict)
+
+ def lookup(
+ self,
+ node_type: str,
+ document: etree._Document,
+ namespace: Optional[dict],
+ name: Optional[str],
+ ) -> Optional[Type[CommonCartridgeElementBase]]:
+ if node_type == "element":
+ return self._element_classes.get(namespace, {}).get(name.lower(), CommonCartridgeElementBase)
+ return None
+
+
+CommonCartridgeElementType = TypeVar("CommonCartridgeElementType", bound=CommonCartridgeElementBase)
+
+
+def common_cartridge_element(cls: CommonCartridgeElementType) -> CommonCartridgeElementType:
+ """
+ Add a type to the Common Cartridge XML lookup.
+ """
+ for namespace in cls.NODE_NAMESPACES:
+ CommonCartridgeElementClassLookup._element_classes[namespace][cls.NODE_NAME] = cls
+
+ return cls
+
+
+@common_cartridge_element
+class WebLink(CommonCartridgeElementBase):
+ """
+ Represent Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACE_OPTIONS = {
+ "imswl_xmlv1p1": "http://www.imsglobal.org/xsd/imsccv1p1/imswl_v1p1",
+ "imswl_xmlv1p2": "http://www.imsglobal.org/xsd/imsccv1p2/imswl_v1p2",
+ "imswl_xmlv1p3": "http://www.imsglobal.org/xsd/imsccv1p3/imswl_v1p3",
+ }
+ NODE_NAMESPACES = list(SEARCH_NAMESPACE_OPTIONS.values())
+ NODE_NAME = "weblink"
+
+ def get_title(self, resource_type: str) -> CommonCartridgeElementBase:
+ """
+ Provide child tag.
+ """
+ return self.find("wl:title", self._define_search_namespace(resource_type))
+
+ def get_url(self, resource_type: str) -> CommonCartridgeElementBase:
+ """
+ Provide <url> child tag.
+ """
+ return self.find("wl:url", self._define_search_namespace(resource_type))
+
+ def _define_search_namespace(self, resource_type: str) -> Dict[str, str]:
+ """
+ Define a search namespace based on resource type.
+ """
+ return {"wl": self.SEARCH_NAMESPACE_OPTIONS.get(resource_type)}
+
+
+@common_cartridge_element
+class BasicLtiLink(CommonCartridgeElementBase):
+ """
+ Represent <cartridge_basiclti_link> Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACES = {
+ "blti": "http://www.imsglobal.org/xsd/imsbasiclti_v1p0",
+ "lticp": "http://www.imsglobal.org/xsd/imslticp_v1p0",
+ "lticm": "http://www.imsglobal.org/xsd/imslticm_v1p0",
+ }
+ NODE_NAMESPACES = [
+ "http://www.imsglobal.org/xsd/imslticc_v1p0",
+ "http://www.imsglobal.org/xsd/imslticc_v1p3",
+ ]
+ NODE_NAME = "cartridge_basiclti_link"
+
+ @property
+ def title(self) -> CommonCartridgeElementBase:
+ """
+ Provide <title> child tag.
+ """
+ return self.find("blti:title", self.SEARCH_NAMESPACES)
+
+ @property
+ def description(self) -> CommonCartridgeElementBase:
+ """
+ Provide <description> child tag.
+ """
+ return self.find("blti:description", self.SEARCH_NAMESPACES)
+
+ @property
+ def secure_launch_url(self) -> Optional[CommonCartridgeElementBase]:
+ """
+ Provide <secure_launch_url> child tag.
+ """
+ return self.find("blti:secure_launch_url", self.SEARCH_NAMESPACES)
+
+ @property
+ def launch_url(self) -> Optional[CommonCartridgeElementBase]:
+ """
+ Provide <launch_url> child tag.
+ """
+ return self.find("blti:launch_url", self.SEARCH_NAMESPACES)
+
+ @property
+ def width(self) -> Optional[CommonCartridgeElementBase]:
+ """
+ Provide width property descendant tag.
+ """
+ return self.find("blti:extensions/lticm:property[@name='selection_width']", self.SEARCH_NAMESPACES)
+
+ @property
+ def height(self) -> Optional[CommonCartridgeElementBase]:
+ """
+ Provide height property descendant tag.
+ """
+ return self.find("blti:extensions/lticm:property[@name='selection_height']", self.SEARCH_NAMESPACES)
+
+ @property
+ def custom(self) -> Optional[CommonCartridgeElementBase]:
+ """
+ Provide <custom> child tag.
+ """
+ return self.find("blti:custom", self.SEARCH_NAMESPACES)
+
+ @property
+ def canvas_tool_id(self) -> Optional[CommonCartridgeElementBase]:
+ """
+ Provide Canvas tool identifier property descendant tag.
+ """
+ return self.find("blti:extensions/lticm:property[@name='tool_id']", self.SEARCH_NAMESPACES)
+
+
+@common_cartridge_element
+class DiscussionTopic(CommonCartridgeElementBase):
+ """
+ Represent discussion <topic> Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACE_OPTIONS = {
+ "imsdt_xmlv1p1": "http://www.imsglobal.org/xsd/imsccv1p1/imsdt_v1p1",
+ "imsdt_xmlv1p2": "http://www.imsglobal.org/xsd/imsccv1p2/imsdt_v1p2",
+ "imsdt_xmlv1p3": "http://www.imsglobal.org/xsd/imsccv1p3/imsdt_v1p3",
+ }
+ NODE_NAMESPACES = list(SEARCH_NAMESPACE_OPTIONS.values())
+ NODE_NAME = "topic"
+
+ def get_title(self, resource_type: str) -> CommonCartridgeElementBase:
+ """
+ Provide <title> child tag.
+ """
+ return self.find("dt:title", self._define_search_namespace(resource_type))
+
+ def get_text(self, resource_type: str) -> CommonCartridgeElementBase:
+ """
+ Provide <text> child tag.
+ """
+ return self.find("dt:text", self._define_search_namespace(resource_type))
+
+ def _define_search_namespace(self, resource_type: str) -> Dict[str, str]:
+ """
+ Define a search namespace based on resource type.
+ """
+ return {"dt": self.SEARCH_NAMESPACE_OPTIONS.get(resource_type)}
+
+
+@common_cartridge_element
+class QtiElement(CommonCartridgeElementBase):
+ """
+ Represent <questestinterop> Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACES = {"qti": QTI_NAMESPACE}
+ NODE_NAMESPACES = [QTI_NAMESPACE]
+ NODE_NAME = "questestinterop"
+
+ @property
+ def items(self) -> List["QtiItem"]:
+ """
+ Provide <item> child tags.
+ """
+ return self.findall(".//qti:section/qti:item", self.SEARCH_NAMESPACES)
+
+
+@common_cartridge_element
+class QtiItem(CommonCartridgeElementBase):
+ """
+ Represent QTI <item> Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACES = {"qti": QTI_NAMESPACE}
+ NODE_NAMESPACES = [QTI_NAMESPACE]
+ NODE_NAME = "item"
+
+ @property
+ def presentation(self) -> "QtiPresentation":
+ """
+ Provide <presentation> child tag.
+ """
+ return self.find("qti:presentation", self.SEARCH_NAMESPACES)
+
+ @property
+ def description(self) -> str:
+ """
+ Provide <mattext> descendant tag.
+ """
+ return self.presentation.mattext.text
+
+ @property
+ def resprocessing(self) -> "QtiResprocessing":
+ """
+ Provide <resprocessing> child tag.
+ """
+ return self.find("qti:resprocessing", self.SEARCH_NAMESPACES)
+
+ @property
+ def qtimetadatafields(self) -> List["QtiMetadataField"]:
+ """
+ Provide <qtimetadatafield> descendant tag.
+ """
+ return self.findall("qti:itemmetadata/qti:qtimetadata/qti:qtimetadatafield", self.SEARCH_NAMESPACES)
+
+ @property
+ def profile(self) -> str:
+ """
+ Provide ``cc_profile`` value from problem metadata.
+
+ This field is mandatory for problem, so the exception is thrown if
+ it's not present.
+
+ Example of metadata structure:
+ ```
+ <itemmetadata>
+ <qtimetadata>
+ <qtimetadatafield>
+ <fieldlabel>cc_profile</fieldlabel>
+ <fieldentry>cc.true_false.v0p1</fieldentry>
+ </qtimetadatafield>
+ </qtimetadata>
+ </itemmetadata>
+ ```
+ """
+ for field in self.qtimetadatafields:
+ label = field.fieldlabel.text
+ entry = field.fieldentry.text
+
+ if label == "cc_profile":
+ return entry
+
+ raise ValueError('QTI metadata must contain "cc_profile" field.')
+
+ @property
+ def solution(self) -> Optional["QtiSolution"]:
+ """
+ Provide <solution> descendant tag.
+ """
+ return self.find("qti:itemfeedback/qti:solution", self.SEARCH_NAMESPACES)
+
+ def get_itemfeedback(self, response_type: Optional[str] = None) -> Optional["QtiItemFeedback"]:
+ """
+ Provide <itemfeedback> child tag.
+ """
+ selector = "qti:itemfeedback"
+ if response_type:
+ selector = f"{selector}[@ident='{response_type}']"
+ return self.find(selector, self.SEARCH_NAMESPACES)
+
+
+@common_cartridge_element
+class QtiMetadataField(CommonCartridgeElementBase):
+ """
+ Represent QTI <qtimetadatafield> Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACES = {"qti": QTI_NAMESPACE}
+ NODE_NAMESPACES = [QTI_NAMESPACE]
+ NODE_NAME = "qtimetadatafield"
+
+ @property
+ def fieldlabel(self) -> CommonCartridgeElementBase:
+ """
+ Provide <fieldlabel> child tag.
+ """
+ return self.find("qti:fieldlabel", self.SEARCH_NAMESPACES)
+
+ @property
+ def fieldentry(self) -> CommonCartridgeElementBase:
+ """
+ Provide <fieldentry> child tag.
+ """
+ return self.find("qti:fieldentry", self.SEARCH_NAMESPACES)
+
+
+@common_cartridge_element
+class QtiPresentation(CommonCartridgeElementBase):
+ """
+ Represent QTI <presentation> Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACES = {"qti": QTI_NAMESPACE}
+ NODE_NAMESPACES = [QTI_NAMESPACE]
+ NODE_NAME = "presentation"
+
+ @property
+ def response_labels(self) -> List["QtiResponseLabel"]:
+ """
+ Provide <response_label> descendant tags.
+ """
+ return self.findall("qti:response_lid/qti:render_choice/qti:response_label", self.SEARCH_NAMESPACES)
+
+ @property
+ def mattext(self) -> CommonCartridgeElementBase:
+ """
+ Provide <mattext> descendant tag.
+ """
+ return self.find("qti:material/qti:mattext", self.SEARCH_NAMESPACES)
+
+
+@common_cartridge_element
+class QtiResponseLabel(CommonCartridgeElementBase):
+ """
+ Represent QTI <response_label> Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACES = {"qti": QTI_NAMESPACE}
+ NODE_NAMESPACES = [QTI_NAMESPACE]
+ NODE_NAME = "response_label"
+
+ @property
+ def mattext(self) -> CommonCartridgeElementBase:
+ """
+ Provide <mattext> descendant tag.
+ """
+ return self.find("qti:material/qti:mattext", self.SEARCH_NAMESPACES)
+
+
+@common_cartridge_element
+class QtiResprocessing(CommonCartridgeElementBase):
+ """
+ Represent QTI <resprocessing> Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACES = {"qti": QTI_NAMESPACE}
+ NODE_NAMESPACES = [QTI_NAMESPACE]
+ NODE_NAME = "resprocessing"
+
+ @property
+ def respconditions(self) -> List["QtiRespcondition"]:
+ """
+ Provide <respcondition> descendant tags.
+ """
+ return self.findall("qti:respcondition", self.SEARCH_NAMESPACES)
+
+
+@common_cartridge_element
+class QtiRespcondition(CommonCartridgeElementBase):
+ """
+ Represent QTI <respcondition> Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACES = {"qti": QTI_NAMESPACE}
+ NODE_NAMESPACES = [QTI_NAMESPACE]
+ NODE_NAME = "respcondition"
+
+ @property
+ def varequals(self) -> List[CommonCartridgeElementBase]:
+ """
+ Provide <varequal> descendant tags.
+ """
+ return self.findall("qti:conditionvar/qti:varequal", self.SEARCH_NAMESPACES)
+
+ @property
+ def and_varequals(self) -> List[CommonCartridgeElementBase]:
+ """
+ Provide <varequal> descendant tags wrapped by <and> tag.
+ """
+ return self.findall("qti:conditionvar/qti:and/qti:varequal", self.SEARCH_NAMESPACES)
+
+ @property
+ def or_varequals(self) -> List[CommonCartridgeElementBase]:
+ """
+ Provide <varequal> descendant tags wrapped by <or> tag.
+ """
+ return self.findall("qti:conditionvar/qti:or/qti:varequal", self.SEARCH_NAMESPACES)
+
+ @property
+ def varsubstrings(self) -> List[CommonCartridgeElementBase]:
+ """
+ Provide <varsubstring> descendant tags.
+ """
+ return self.findall("qti:conditionvar/qti:varsubstring", self.SEARCH_NAMESPACES)
+
+ def get_display_feedback(self, response_type: str) -> Optional[CommonCartridgeElementBase]:
+ """
+ Provide <displayfeedback> child tag.
+ """
+ return self.find(f"qti:displayfeedback[@linkrefid='{response_type}']", self.SEARCH_NAMESPACES)
+
+
+@common_cartridge_element
+class QtiSolution(CommonCartridgeElementBase):
+ """
+ Represent QTI <solution> Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACES = {"qti": QTI_NAMESPACE}
+ NODE_NAMESPACES = [QTI_NAMESPACE]
+ NODE_NAME = "solution"
+
+ @property
+ def mattext(self) -> CommonCartridgeElementBase:
+ """
+ Provide <mattext> descendant tag.
+ """
+ return self.find("qti:solutionmaterial//qti:material//qti:mattext", self.SEARCH_NAMESPACES)
+
+
+@common_cartridge_element
+class QtiItemFeedback(CommonCartridgeElementBase):
+ """
+ Represent QTI <itemfeedback> Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACES = {"qti": QTI_NAMESPACE}
+ NODE_NAMESPACES = [QTI_NAMESPACE]
+ NODE_NAME = "itemfeedback"
+
+ @property
+ def flow_mat(self) -> "QtiFlowMat":
+ """
+ Provide <flow_mat> child tag.
+ """
+ return self.find("qti:flow_mat", self.SEARCH_NAMESPACES)
+
+
+@common_cartridge_element
+class QtiFlowMat(CommonCartridgeElementBase):
+ """
+ Represent QTI <flow_mat> Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACES = {"qti": QTI_NAMESPACE}
+ NODE_NAMESPACES = [QTI_NAMESPACE]
+ NODE_NAME = "flow_mat"
+
+ @property
+ def material(self) -> "QtiMaterial":
+ """
+ Provide <material> child tag.
+ """
+ return self.find("qti:material", self.SEARCH_NAMESPACES)
+
+
+@common_cartridge_element
+class QtiMaterial(CommonCartridgeElementBase):
+ """
+ Represent QTI <material> Common Cartridge element.
+ """
+
+ SEARCH_NAMESPACES = {"qti": QTI_NAMESPACE}
+ NODE_NAMESPACES = [QTI_NAMESPACE]
+ NODE_NAME = "material"
+
+ @property
+ def mattext(self) -> CommonCartridgeElementBase:
+ """
+ Provide <mattext> child tag.
+ """
+ return self.find("qti:mattext", self.SEARCH_NAMESPACES)
+
+
+class CommonCartridgeXmlParser(etree.XMLParser):
+ """
+ An XML parser configured to return Common Cartridge element objects.
+ """
+
+ def __init__(self, **kwargs):
+ super().__init__(**kwargs)
+
+ self.set_element_class_lookup(CommonCartridgeElementClassLookup())
diff --git a/tests/conftest.py b/tests/conftest.py
index 31b10605..3668251c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2,9 +2,7 @@
import os
import shutil
-import zipfile
-import xml.dom.minidom
from pathlib import Path
from tempfile import NamedTemporaryFile
from xml.dom.minidom import parse
@@ -12,9 +10,10 @@
import pytest
from cc2olx.cli import parse_args
+from cc2olx.content_processors.dataclasses import ContentProcessorContext
from cc2olx.models import Cartridge
-from cc2olx.olx import OlxExport
-from cc2olx.settings import collect_settings
+from cc2olx.parser import parse_options
+from .utils import zip_imscc_dir
@pytest.fixture(scope="session")
@@ -31,6 +30,15 @@ def temp_workspace_dir(tmpdir_factory):
return tmpdir_factory.mktemp("workspace")
+@pytest.fixture(scope="session")
+def temp_workspace_path(temp_workspace_dir):
+ """
+ Temporary workspace directory path.
+ """
+
+ return Path(temp_workspace_dir.strpath)
+
+
@pytest.fixture(scope="session")
def chdir_to_workspace(temp_workspace_dir):
"""
@@ -46,20 +54,28 @@ def chdir_to_workspace(temp_workspace_dir):
@pytest.fixture(scope="session")
-def imscc_file(temp_workspace_dir, fixtures_data_dir):
+def imscc_file(temp_workspace_path, fixtures_data_dir):
"""
Creates zip file with ``.imscc`` extension and all files
- from fixture_data/imscc_file directory.
+ from fixture_data/imscc_files/main directory.
"""
+ fixture_data = fixtures_data_dir / "imscc_files" / "main"
+ result_path = temp_workspace_path / "course.imscc"
- fixture_data = fixtures_data_dir / "imscc_file"
+ zip_imscc_dir(fixture_data, result_path)
- result_path = Path(temp_workspace_dir.strpath) / "course.imscc"
+ return result_path
+
+
+@pytest.fixture(scope="session")
+def corner_cases_imscc(temp_workspace_path, fixtures_data_dir):
+ """
+ Creates ``.imscc`` zip from fixture_data/imscc_files/corner_cases directory.
+ """
+ fixture_data = fixtures_data_dir / "imscc_files" / "corner_cases"
+ result_path = temp_workspace_path / "corner_cases.imscc"
- with zipfile.ZipFile(str(result_path), "w") as zf:
- for cc_file in fixture_data.rglob("*"):
- if cc_file.is_file():
- zf.write(str(cc_file), str(cc_file.relative_to(fixture_data)))
+ zip_imscc_dir(fixture_data, result_path)
return result_path
@@ -78,30 +94,38 @@ def studio_course_xml(fixtures_data_dir):
return parse(course_xml_filename).toprettyxml()
+@pytest.fixture(scope="session")
+def relative_links_source() -> str:
+ """
+ Provide a relative links source.
+ """
+ return "https://relative.source.domain"
+
+
@pytest.fixture
-def settings(imscc_file, link_map_csv):
+def options(imscc_file, link_map_csv, relative_links_source):
"""
- Basic settings fixture.
+ Basic options fixture.
"""
- parsed_args = parse_args(["-i", str(imscc_file), "-f", str(link_map_csv)])
+ args = parse_args(["-i", str(imscc_file), "-f", str(link_map_csv), "-s", relative_links_source])
- _settings = collect_settings(parsed_args)
+ options = parse_options(args)
- yield _settings
+ yield options
- shutil.rmtree(_settings["workspace"], ignore_errors=True)
+ shutil.rmtree(options["workspace"], ignore_errors=True)
@pytest.fixture
-def cartridge(imscc_file, settings):
- cartridge = Cartridge(imscc_file, settings["workspace"])
+def cartridge(imscc_file, options):
+ cartridge = Cartridge(imscc_file, options["workspace"])
cartridge.load_manifest_extracted()
cartridge.normalize()
yield cartridge
- shutil.rmtree(str(settings["workspace"] / imscc_file.stem))
+ shutil.rmtree(str(options["workspace"] / imscc_file.stem))
@pytest.fixture(scope="session")
@@ -200,7 +224,7 @@ def iframe_content(fixtures_data_dir):
[str]: String content of html file
"""
- html_file_path = str(fixtures_data_dir / "imscc_file" / "iframe.html")
+ html_file_path = str(fixtures_data_dir / "imscc_files" / "main" / "iframe.html")
with open(html_file_path, "r", encoding="utf-8") as htmlcontent:
content = htmlcontent.read()
return content
@@ -291,17 +315,9 @@ def expected_cleaned_cdata_containing_html(fixtures_data_dir: Path) -> str:
return html_without_cdata_path.read_text()
-@pytest.fixture
-def bare_olx_exporter(cartridge: Cartridge) -> OlxExport:
+@pytest.fixture(scope="session")
+def empty_content_processor_context() -> ContentProcessorContext:
"""
- Provides bare OLX exporter.
-
- Args:
- cartridge (Cartridge): Cartridge class instance.
-
- Returns:
- OlxExport: OlxExport instance.
+ Provide an empty content processor context.
"""
- olx_exporter = OlxExport(cartridge)
- olx_exporter.doc = xml.dom.minidom.Document()
- return olx_exporter
+ return ContentProcessorContext(iframe_link_parser=None, lti_consumer_ids=set())
diff --git a/tests/fixtures_data/imscc_files/corner_cases/imsmanifest.xml b/tests/fixtures_data/imscc_files/corner_cases/imsmanifest.xml
new file mode 100644
index 00000000..68880ba1
--- /dev/null
+++ b/tests/fixtures_data/imscc_files/corner_cases/imsmanifest.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest identifier="i32969e15-efc0-4025-bab8-cabdde5faeb4" xmlns="http://www.imsglobal.org/xsd/imsccv1p3/imscp_v1p1"
+ xmlns:lomm="http://ltsc.ieee.org/xsd/imsccv1p3/LOM/manifest"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.imsglobal.org/xsd/imsccv1p3/imscp_v1p1 http://www.imsglobal.org/profile/cc/ccv1p3/ccv1p3_imscp_v1p2_v1p0.xsd http://ltsc.ieee.org/xsd/imsccv1p3/LOM/manifest http://www.imsglobal.org/profile/cc/ccv1p3/LOM/ccv1p3_lommanifest_v1p0.xsd">
+ <metadata>
+ <schema>IMS Common Cartridge</schema>
+ <schemaversion>1.3.0</schemaversion>
+ <lomm:lom>
+ <lomm:general>
+ <lomm:title>
+ <lomm:string language="en-US">Corner cases Common Cartridge</lomm:string>
+ </lomm:title>
+ </lomm:general>
+ </lomm:lom>
+ </metadata>
+ <organizations>
+ <organization identifier="i626d4fc3-ce52-4834-a361-a7a4088c1b3e" structure="rooted-hierarchy">
+ <item identifier="ib9a63e2e-9692-49a3-9a6f-256168348df3">
+ <item identifier="i86204944-b9e4-4d98-a386-9affbe9efe49">
+ <title>Wild animals world
+ -
+ Migration Patterns: Why Animals Travel Long Distances
+
+ -
+ Unknown content
+
+ -
+ Unknown content with link
+
+ -
+ Survival Strategies: How Wild Animals Avoid Predators
+
+ -
+ Strange QTI
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/fixtures_data/imscc_files/corner_cases/strange_qti.xml b/tests/fixtures_data/imscc_files/corner_cases/strange_qti.xml
new file mode 100644
index 00000000..8c3cf21a
--- /dev/null
+++ b/tests/fixtures_data/imscc_files/corner_cases/strange_qti.xml
@@ -0,0 +1,41 @@
+
+
+
+
+ cc_profile
+ cc.exam.v0p1
+
+
+ qmd_assessmenttype
+ Examination
+
+
+ cc_maxattempts
+ unlimited
+
+
+ qmd_timelimit
+ 5
+
+
+
+ -
+
+
+
+ cc_profile
+ cc.strange.v0p1
+
+
+ cc_weighting
+ 1
+
+
+
+
+
+
+
diff --git a/tests/fixtures_data/imscc_files/corner_cases/web_resources/survival_strategies.txt b/tests/fixtures_data/imscc_files/corner_cases/web_resources/survival_strategies.txt
new file mode 100644
index 00000000..b9a9ad53
--- /dev/null
+++ b/tests/fixtures_data/imscc_files/corner_cases/web_resources/survival_strategies.txt
@@ -0,0 +1,7 @@
+Wild animals have developed various survival strategies to avoid predators, enhancing their chances of survival.
+Camouflage is one of the most effective methods, where animals blend into their surroundings to remain unseen.
+Some species rely on speed and agility to escape danger, such as gazelles outrunning lions.
+Others use defensive behaviors, like the porcupine’s sharp quills or the skunk’s foul spray, to deter predators.
+Mimicry is also common, with animals like stick insects resembling branches to deceive attackers.
+Additionally, some creatures form large groups or herds, confusing predators through sheer numbers or collective defense tactics.
+These survival techniques are essential for maintaining balance in the wild ecosystem.
diff --git a/tests/fixtures_data/imscc_file/canvas_content/canvas_content.html b/tests/fixtures_data/imscc_files/main/canvas_content/canvas_content.html
similarity index 100%
rename from tests/fixtures_data/imscc_file/canvas_content/canvas_content.html
rename to tests/fixtures_data/imscc_files/main/canvas_content/canvas_content.html
diff --git a/tests/fixtures_data/imscc_file/course_settings/assignment_groups.xml b/tests/fixtures_data/imscc_files/main/course_settings/assignment_groups.xml
similarity index 100%
rename from tests/fixtures_data/imscc_file/course_settings/assignment_groups.xml
rename to tests/fixtures_data/imscc_files/main/course_settings/assignment_groups.xml
diff --git a/tests/fixtures_data/imscc_file/course_settings/canvas_export.txt b/tests/fixtures_data/imscc_files/main/course_settings/canvas_export.txt
similarity index 100%
rename from tests/fixtures_data/imscc_file/course_settings/canvas_export.txt
rename to tests/fixtures_data/imscc_files/main/course_settings/canvas_export.txt
diff --git a/tests/fixtures_data/imscc_file/course_settings/course_settings.xml b/tests/fixtures_data/imscc_files/main/course_settings/course_settings.xml
similarity index 100%
rename from tests/fixtures_data/imscc_file/course_settings/course_settings.xml
rename to tests/fixtures_data/imscc_files/main/course_settings/course_settings.xml
diff --git a/tests/fixtures_data/imscc_file/course_settings/files_meta.xml b/tests/fixtures_data/imscc_files/main/course_settings/files_meta.xml
similarity index 100%
rename from tests/fixtures_data/imscc_file/course_settings/files_meta.xml
rename to tests/fixtures_data/imscc_files/main/course_settings/files_meta.xml
diff --git a/tests/fixtures_data/imscc_file/course_settings/media_tracks.xml b/tests/fixtures_data/imscc_files/main/course_settings/media_tracks.xml
similarity index 100%
rename from tests/fixtures_data/imscc_file/course_settings/media_tracks.xml
rename to tests/fixtures_data/imscc_files/main/course_settings/media_tracks.xml
diff --git a/tests/fixtures_data/imscc_file/course_settings/module_meta.xml b/tests/fixtures_data/imscc_files/main/course_settings/module_meta.xml
similarity index 100%
rename from tests/fixtures_data/imscc_file/course_settings/module_meta.xml
rename to tests/fixtures_data/imscc_files/main/course_settings/module_meta.xml
diff --git a/tests/fixtures_data/imscc_file/discussion_topic.xml b/tests/fixtures_data/imscc_files/main/discussion_topic.xml
similarity index 100%
rename from tests/fixtures_data/imscc_file/discussion_topic.xml
rename to tests/fixtures_data/imscc_files/main/discussion_topic.xml
diff --git a/tests/fixtures_data/imscc_file/discussion_topic_dependency.xml b/tests/fixtures_data/imscc_files/main/discussion_topic_dependency.xml
similarity index 100%
rename from tests/fixtures_data/imscc_file/discussion_topic_dependency.xml
rename to tests/fixtures_data/imscc_files/main/discussion_topic_dependency.xml
diff --git a/tests/fixtures_data/imscc_file/extra_files/example.pdf b/tests/fixtures_data/imscc_files/main/extra_files/example.pdf
similarity index 100%
rename from tests/fixtures_data/imscc_file/extra_files/example.pdf
rename to tests/fixtures_data/imscc_files/main/extra_files/example.pdf
diff --git a/tests/fixtures_data/imscc_file/iframe.html b/tests/fixtures_data/imscc_files/main/iframe.html
similarity index 100%
rename from tests/fixtures_data/imscc_file/iframe.html
rename to tests/fixtures_data/imscc_files/main/iframe.html
diff --git a/tests/fixtures_data/imscc_file/iframe2.html b/tests/fixtures_data/imscc_files/main/iframe2.html
similarity index 100%
rename from tests/fixtures_data/imscc_file/iframe2.html
rename to tests/fixtures_data/imscc_files/main/iframe2.html
diff --git a/tests/fixtures_data/imscc_file/imsmanifest.xml b/tests/fixtures_data/imscc_files/main/imsmanifest.xml
similarity index 92%
rename from tests/fixtures_data/imscc_file/imsmanifest.xml
rename to tests/fixtures_data/imscc_files/main/imsmanifest.xml
index 4a03a111..6d3a76be 100644
--- a/tests/fixtures_data/imscc_file/imsmanifest.xml
+++ b/tests/fixtures_data/imscc_files/main/imsmanifest.xml
@@ -42,6 +42,9 @@
-
LTI
+ -
+ LTI no secure launch URL
+
-
QTI
@@ -72,6 +75,9 @@
-
Web Link Content
+ -
+ Django for beginners
+
-
Sequence2
@@ -114,6 +120,9 @@
+
+
+
@@ -159,7 +168,10 @@
-
+
+
+
+
diff --git a/tests/fixtures_data/imscc_file/non_cc_assessments/resource_4_qti.xml.qti b/tests/fixtures_data/imscc_files/main/non_cc_assessments/resource_4_qti.xml.qti
similarity index 100%
rename from tests/fixtures_data/imscc_file/non_cc_assessments/resource_4_qti.xml.qti
rename to tests/fixtures_data/imscc_files/main/non_cc_assessments/resource_4_qti.xml.qti
diff --git a/tests/fixtures_data/imscc_file/resource_2_lti.xml b/tests/fixtures_data/imscc_files/main/resource_2_lti.xml
similarity index 100%
rename from tests/fixtures_data/imscc_file/resource_2_lti.xml
rename to tests/fixtures_data/imscc_files/main/resource_2_lti.xml
diff --git a/tests/fixtures_data/imscc_files/main/resource_2_lti_no_secure_launch_url.xml b/tests/fixtures_data/imscc_files/main/resource_2_lti_no_secure_launch_url.xml
new file mode 100644
index 00000000..5e6560cc
--- /dev/null
+++ b/tests/fixtures_data/imscc_files/main/resource_2_lti_no_secure_launch_url.xml
@@ -0,0 +1,15 @@
+
+
+ Smart Quiz
+ https://www.imsglobal.org/activity/smart-quiz-lti
+ https://lti.local/start
+
+ CLMS
+ Custom LMS
+
+
diff --git a/tests/fixtures_data/imscc_file/resource_4_qti/assessment_meta.xml b/tests/fixtures_data/imscc_files/main/resource_4_qti/assessment_meta.xml
similarity index 100%
rename from tests/fixtures_data/imscc_file/resource_4_qti/assessment_meta.xml
rename to tests/fixtures_data/imscc_files/main/resource_4_qti/assessment_meta.xml
diff --git a/tests/fixtures_data/imscc_file/resource_4_qti/assessment_qti.xml b/tests/fixtures_data/imscc_files/main/resource_4_qti/assessment_qti.xml
similarity index 100%
rename from tests/fixtures_data/imscc_file/resource_4_qti/assessment_qti.xml
rename to tests/fixtures_data/imscc_files/main/resource_4_qti/assessment_qti.xml
diff --git a/tests/fixtures_data/imscc_file/resource_4_qti_no_items/assessment_meta.xml b/tests/fixtures_data/imscc_files/main/resource_4_qti_no_items/assessment_meta.xml
similarity index 100%
rename from tests/fixtures_data/imscc_file/resource_4_qti_no_items/assessment_meta.xml
rename to tests/fixtures_data/imscc_files/main/resource_4_qti_no_items/assessment_meta.xml
diff --git a/tests/fixtures_data/imscc_file/resource_4_qti_no_items/assessment_qti.xml b/tests/fixtures_data/imscc_files/main/resource_4_qti_no_items/assessment_qti.xml
similarity index 100%
rename from tests/fixtures_data/imscc_file/resource_4_qti_no_items/assessment_qti.xml
rename to tests/fixtures_data/imscc_files/main/resource_4_qti_no_items/assessment_qti.xml
diff --git a/tests/fixtures_data/imscc_file/resource_external_lti_tool.xml b/tests/fixtures_data/imscc_files/main/resource_external_lti_tool.xml
similarity index 100%
rename from tests/fixtures_data/imscc_file/resource_external_lti_tool.xml
rename to tests/fixtures_data/imscc_files/main/resource_external_lti_tool.xml
diff --git a/tests/fixtures_data/imscc_file/vertical.html b/tests/fixtures_data/imscc_files/main/vertical.html
similarity index 100%
rename from tests/fixtures_data/imscc_file/vertical.html
rename to tests/fixtures_data/imscc_files/main/vertical.html
diff --git a/tests/fixtures_data/imscc_file/web_link_content.xml b/tests/fixtures_data/imscc_files/main/web_link_content.xml
similarity index 91%
rename from tests/fixtures_data/imscc_file/web_link_content.xml
rename to tests/fixtures_data/imscc_files/main/web_link_content.xml
index 7d6b1880..d7a1ef83 100644
--- a/tests/fixtures_data/imscc_file/web_link_content.xml
+++ b/tests/fixtures_data/imscc_files/main/web_link_content.xml
@@ -1,5 +1,5 @@
Web Link Content
-
+
diff --git a/tests/fixtures_data/imscc_file/web_resources/QuizImages/fractal.jpg b/tests/fixtures_data/imscc_files/main/web_resources/QuizImages/fractal.jpg
similarity index 100%
rename from tests/fixtures_data/imscc_file/web_resources/QuizImages/fractal.jpg
rename to tests/fixtures_data/imscc_files/main/web_resources/QuizImages/fractal.jpg
diff --git a/tests/fixtures_data/imscc_file/web_resources/elearning.png b/tests/fixtures_data/imscc_files/main/web_resources/elearning.png
similarity index 100%
rename from tests/fixtures_data/imscc_file/web_resources/elearning.png
rename to tests/fixtures_data/imscc_files/main/web_resources/elearning.png
diff --git a/tests/fixtures_data/imscc_files/main/weblinks/web_link_content.xml b/tests/fixtures_data/imscc_files/main/weblinks/web_link_content.xml
new file mode 100644
index 00000000..d7a1ef83
--- /dev/null
+++ b/tests/fixtures_data/imscc_files/main/weblinks/web_link_content.xml
@@ -0,0 +1,5 @@
+
+
+ Web Link Content
+
+
diff --git a/tests/fixtures_data/imscc_files/main/weblinks/youtube_web_link.xml b/tests/fixtures_data/imscc_files/main/weblinks/youtube_web_link.xml
new file mode 100644
index 00000000..dd3f101d
--- /dev/null
+++ b/tests/fixtures_data/imscc_files/main/weblinks/youtube_web_link.xml
@@ -0,0 +1,5 @@
+
+
+ Django crash course for beginners
+
+
diff --git a/tests/fixtures_data/imscc_file/wiki_content/external_tool_retrieve.html b/tests/fixtures_data/imscc_files/main/wiki_content/external_tool_retrieve.html
similarity index 100%
rename from tests/fixtures_data/imscc_file/wiki_content/external_tool_retrieve.html
rename to tests/fixtures_data/imscc_files/main/wiki_content/external_tool_retrieve.html
diff --git a/tests/fixtures_data/imscc_file/wiki_content/module-_-introduction.html b/tests/fixtures_data/imscc_files/main/wiki_content/module-_-introduction.html
similarity index 100%
rename from tests/fixtures_data/imscc_file/wiki_content/module-_-introduction.html
rename to tests/fixtures_data/imscc_files/main/wiki_content/module-_-introduction.html
diff --git a/tests/fixtures_data/imscc_file/wiki_content/wiki_content.html b/tests/fixtures_data/imscc_files/main/wiki_content/wiki_content.html
similarity index 100%
rename from tests/fixtures_data/imscc_file/wiki_content/wiki_content.html
rename to tests/fixtures_data/imscc_files/main/wiki_content/wiki_content.html
diff --git a/tests/fixtures_data/passports.csv b/tests/fixtures_data/passports.csv
index 2bb33dc9..53e92e06 100644
--- a/tests/fixtures_data/passports.csv
+++ b/tests/fixtures_data/passports.csv
@@ -1,4 +1,5 @@
consumer_id,consumer_key,consumer_secret
codio,my_codio_key,my_codio_secret
lti_tool,my_consumer_key,my_consumer_secret_key
-external_tool_lti,external_tool_lti_key,external_tool_lti_secret
\ No newline at end of file
+external_tool_lti,external_tool_lti_key,external_tool_lti_secret
+smart_quiz,smart_quiz_key,smart_quiz_secret
diff --git a/tests/fixtures_data/studio_course_xml/course.xml b/tests/fixtures_data/studio_course_xml/course.xml
index f494f616..de88fa37 100644
--- a/tests/fixtures_data/studio_course_xml/course.xml
+++ b/tests/fixtures_data/studio_course_xml/course.xml
@@ -22,6 +22,9 @@
+
+
+
@@ -152,7 +155,17 @@
-
]]>
+
+
+
+
+
+
+
+
+
+
+]]>
@@ -227,10 +240,23 @@
- extra_files/example.pdf
]]>
+
+
+
+
+
+
+ extra_files/example.pdf
+
+
+
+]]>